From 230488f09d456ff908d55c9b8db730908c36cd5c Mon Sep 17 00:00:00 2001 From: Davlet Panech Date: Tue, 21 May 2024 14:00:52 -0400 Subject: [PATCH] Add 32bit ncurses libs needed by some packages We already download the 64-bit versions, this patch adds the matching 32-bit versions, and their dependencies, making the entire set consistent. These packages are referenced by some packages that we already build (eg kernel, grub), and not having them here results in slightly different versions of them being installed in the build chroots in some cases. We also need this to build Intel FlexRAN docker image (not part of StarlingX). TESTS ======== * Clean the build environment * Re-run downloader * Re-build all packages from scratch * Build base image (stx-debian) * Install lib32ncurses-dev in the base image Story: 2009897 Task: 50060 Change-Id: I1c8080e854f7fdc8b01e7cb0e49a474a0437ffdd Signed-off-by: Davlet Panech --- .../config/debian/common/base-bullseye.lst | 11 ++++++++--- .../config/debian/containers/os-std.lst | 4 ++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/debian-mirror-tools/config/debian/common/base-bullseye.lst b/debian-mirror-tools/config/debian/common/base-bullseye.lst index 01c4075c5..9f5beebcc 100644 --- a/debian-mirror-tools/config/debian/common/base-bullseye.lst +++ b/debian-mirror-tools/config/debian/common/base-bullseye.lst @@ -275,7 +275,12 @@ libbsd0 0.11.3-1 libbson-1.0-0 1.17.6-1 libbz2-1.0 1.0.8-4 libc6 2.31-13+deb11u10 https://snapshot.debian.org/archive/debian-security/20240503T195245Z/pool/updates/main/g/glibc/libc6_2.31-13%2Bdeb11u10_amd64.deb +libc6-i386 2.31-13+deb11u10 https://snapshot.debian.org/archive/debian-security/20240503T195245Z/pool/updates/main/g/glibc/libc6-i386_2.31-13%2Bdeb11u10_amd64.deb +libc6-dbg 2.31-13+deb11u10 https://snapshot.debian.org/archive/debian-security/20240503T195245Z/pool/updates/main/g/glibc/libc6-dbg_2.31-13%2Bdeb11u10_amd64.deb libc6-dev 2.31-13+deb11u10 https://snapshot.debian.org/archive/debian-security/20240503T195245Z/pool/updates/main/g/glibc/libc6-dev_2.31-13%2Bdeb11u10_amd64.deb +libc6-dev-i386 2.31-13+deb11u10 https://snapshot.debian.org/archive/debian-security/20240503T195245Z/pool/updates/main/g/glibc/libc6-dev-i386_2.31-13%2Bdeb11u10_amd64.deb +libc6-dev-x32 2.31-13+deb11u10 https://snapshot.debian.org/archive/debian-security/20240503T195245Z/pool/updates/main/g/glibc/libc6-dev-x32_2.31-13%2Bdeb11u10_amd64.deb +libc6-x32 2.31-13+deb11u10 https://snapshot.debian.org/archive/debian-security/20240503T195245Z/pool/updates/main/g/glibc/libc6-x32_2.31-13%2Bdeb11u10_amd64.deb libc6.1-dev-alpha-cross 2.31-9cross4 libcairo2 1.16.0-5 libcap2 1:2.44-1 @@ -309,9 +314,6 @@ libcurl3-gnutls 7.74.0-1.3+deb11u11 https://snapshot.debian.org/archive/debian-s libcurl4 7.74.0-1.3+deb11u11 https://snapshot.debian.org/archive/debian-security/20231224T011632Z/pool/updates/main/c/curl/libcurl4_7.74.0-1.3%2Bdeb11u11_amd64.deb libcurl4-gnutls-dev 7.74.0-1.3+deb11u11 https://snapshot.debian.org/archive/debian-security/20231224T011632Z/pool/updates/main/c/curl/libcurl4-gnutls-dev_7.74.0-1.3%2Bdeb11u11_amd64.deb libcurl4-openssl-dev 7.74.0-1.3+deb11u11 https://snapshot.debian.org/archive/debian-security/20231224T011632Z/pool/updates/main/c/curl/libcurl4-openssl-dev_7.74.0-1.3%2Bdeb11u11_amd64.deb -libncursesw5-dev 6.2+20201114-2+deb11u2 https://snapshot.debian.org/archive/debian/20230726T151952Z/pool/main/n/ncurses/libncursesw5-dev_6.2%2B20201114-2%2Bdeb11u2_amd64.deb -libncurses5-dev 6.2+20201114-2+deb11u2 https://snapshot.debian.org/archive/debian/20230726T151952Z/pool/main/n/ncurses/libncurses5-dev_6.2%2B20201114-2%2Bdeb11u2_amd64.deb -libncurses-dev 6.2+20201114-2+deb11u2 https://snapshot.debian.org/archive/debian/20230726T151952Z/pool/main/n/ncurses/libncurses-dev_6.2%2B20201114-2%2Bdeb11u2_amd64.deb libdaemon0 0.14-7.1 libdatrie1 0.2.13-1 libdaxctl1 71.1-1 @@ -500,7 +502,10 @@ libmount1 2.36.1-8+deb11u2 https://snapshot.debian.org/archive/debian-security/ libmpc3 1.2.0-1 libmpdec3 2.5.1-1 libmpfr6 4.1.0-3 +libncurses-dev 6.2+20201114-2+deb11u2 https://snapshot.debian.org/archive/debian/20230726T151952Z/pool/main/n/ncurses/libncurses-dev_6.2%2B20201114-2%2Bdeb11u2_amd64.deb +libncurses5-dev 6.2+20201114-2+deb11u2 https://snapshot.debian.org/archive/debian/20230726T151952Z/pool/main/n/ncurses/libncurses5-dev_6.2%2B20201114-2%2Bdeb11u2_amd64.deb libncurses6 6.2+20201114-2+deb11u2 https://snapshot.debian.org/archive/debian/20230726T151952Z/pool/main/n/ncurses/libncurses6_6.2%2B20201114-2%2Bdeb11u2_amd64.deb +libncursesw5-dev 6.2+20201114-2+deb11u2 https://snapshot.debian.org/archive/debian/20230726T151952Z/pool/main/n/ncurses/libncursesw5-dev_6.2%2B20201114-2%2Bdeb11u2_amd64.deb libncursesw6 6.2+20201114-2+deb11u2 https://snapshot.debian.org/archive/debian/20230726T151952Z/pool/main/n/ncurses/libncursesw6_6.2%2B20201114-2%2Bdeb11u2_amd64.deb libndctl6 71.1-1 libndp0 1.6-1+b1 diff --git a/debian-mirror-tools/config/debian/containers/os-std.lst b/debian-mirror-tools/config/debian/containers/os-std.lst index 38c6bb533..89844d42f 100644 --- a/debian-mirror-tools/config/debian/containers/os-std.lst +++ b/debian-mirror-tools/config/debian/containers/os-std.lst @@ -14,6 +14,10 @@ git-man 1:2.30.2-1 https://snapshot.debian.org/archive/debian/20220703T032011Z/p git-review 1.28.0-2 guile-2.2-libs 2.2.7+1-6 hwdata 0.345-1 +lib32ncurses-dev 6.2+20201114-2+deb11u2 https://snapshot.debian.org/archive/debian/20230726T151952Z/pool/main/n/ncurses/lib32ncurses-dev_6.2%2B20201114-2%2Bdeb11u2_amd64.deb +lib32ncurses6 6.2+20201114-2+deb11u2 https://snapshot.debian.org/archive/debian/20230726T151952Z/pool/main/n/ncurses/lib32ncurses6_6.2%2B20201114-2%2Bdeb11u2_amd64.deb +lib32ncursesw6 6.2+20201114-2+deb11u2 https://snapshot.debian.org/archive/debian/20230726T151952Z/pool/main/n/ncurses/lib32ncursesw6_6.2%2B20201114-2%2Bdeb11u2_amd64.deb +lib32tinfo6 6.2+20201114-2+deb11u2 https://snapshot.debian.org/archive/debian/20230726T151952Z/pool/main/n/ncurses/lib32tinfo6_6.2%2B20201114-2%2Bdeb11u2_amd64.deb libcap-dev 1:2.44-1 libclang-cpp11 1:11.0.1-2 libclang1-11 1:11.0.1-2