From cd4dd1006139c1578489ceeec69a006df00c85ed Mon Sep 17 00:00:00 2001 From: Luan Nunes Utimura Date: Fri, 15 Sep 2023 16:37:02 -0300 Subject: [PATCH] Reorganize OPAE tools package dependencies After moving OPAE tools package dependencies to the `flock` layer [1], it has been observed that both `stx-debian-dev` and `stx-debian-tools-dev` container images are failing to build due to missing packages. Therefore, this change moves back some of the dependencies that should have stayed in the `containers` layer. Note: We do not need to add `libnuma-dev` back because it is already present in `common` layer's `base-bullseye.lst`, which is accessible during container image builds (deb-local-binary). [1] https://review.opendev.org/c/starlingx/tools/+/893561 Test Plan: PASS - Run `downloader` PASS - Build `opae-sdk` package PASS - Build `python3-opae.admin` package PASS - Build `python3-opae.pacsign` package PASS - Build `stx-debian-dev` container image PASS - Build `stx-debian-tools-dev` container image Closes-Bug: 2036285 Change-Id: I92c9a9f27c487610ef6c932d03b5e6eb0910d13f Signed-off-by: Luan Nunes Utimura (cherry picked from commit ae6d6d70d2ab5f58e3d4e2ecf3b8b4035a38a2c9) --- .../config/debian/containers/os-std.lst | 10 ++++++++++ debian-mirror-tools/config/debian/flock/os-std.lst | 13 +------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/debian-mirror-tools/config/debian/containers/os-std.lst b/debian-mirror-tools/config/debian/containers/os-std.lst index 9272beb7..b2ec7629 100644 --- a/debian-mirror-tools/config/debian/containers/os-std.lst +++ b/debian-mirror-tools/config/debian/containers/os-std.lst @@ -1,3 +1,4 @@ +acpica-tools 20200925-1.2 autoconf-archive 20190106-2.1 autogen 1:5.18.16-4 autogen-doc 1:5.18.16-4 @@ -17,9 +18,12 @@ libcap-dev 1:2.44-1 libclang-cpp11 1:11.0.1-2 libclang1-11 1:11.0.1-2 liberror-perl 0.17029-1 +libhwloc-dev 1.11.12-3 https://snapshot.debian.org/archive/debian/20220703T032011Z/pool/main/h/hwloc/libhwloc-dev_1.11.12-3_amd64.deb +libhwloc5 1.11.12-3 https://snapshot.debian.org/archive/debian/20220703T032011Z/pool/main/h/hwloc/libhwloc5_1.11.12-3_amd64.deb libjs-mathjax 2.7.9+dfsg-1 libjson-c-dev 0.15-2 libjsoncpp24 1.9.4-4 +libltdl-dev 2.4.6-15 libncurses-dev 6.2+20201114-2 libopts25-dev 1:5.18.16-4 libpython2-stdlib 2.7.18-3 @@ -29,15 +33,21 @@ librhash0 1.4.1-2 libsimdjson5 0.7.1-1 libstdc++-10-dev 10.2.1-6 libxapian30 1.4.18-3 +pandoc 2.9.2.1-1+b1 +pkg-config 0.29.2-1 +pybind11-dev 2.6.2-1 python-requests-doc 2.25.1+dfsg-2 python2 2.7.18-3 python2-minimal 2.7.18-3 python2.7 2.7.18-8 python2.7-minimal 2.7.18-8 python3-doc 3.9.2-3 +python3-intelhex 2.1-2.2 +python3-pybind11 2.6.2-1 python3-thriftpy 0.3.9+ds1-1+b5 python3.9-doc 3.9.2-1 sphinx-doc 3.4.3-2 +trace-cmd 2.9.1-1 tree 1.8.0-1+b1 unzip 6.0-26+deb11u1 usb.ids 2022.05.20-0+deb11u1 https://snapshot.debian.org/archive/debian/20220702T033910Z/pool/main/u/usb.ids/usb.ids_2022.05.20-0+deb11u1_all.deb diff --git a/debian-mirror-tools/config/debian/flock/os-std.lst b/debian-mirror-tools/config/debian/flock/os-std.lst index 1a0e9129..0ffd2ef3 100644 --- a/debian-mirror-tools/config/debian/flock/os-std.lst +++ b/debian-mirror-tools/config/debian/flock/os-std.lst @@ -1,13 +1,2 @@ -acpica-tools 20200925-1.2 libhwloc-dev 1.11.12-3 https://snapshot.debian.org/archive/debian/20220703T032011Z/pool/main/h/hwloc/libhwloc-dev_1.11.12-3_amd64.deb -libhwloc5 1.11.12-3 https://snapshot.debian.org/archive/debian/20220703T032011Z/pool/main/h/hwloc/libhwloc5_1.11.12-3_amd64.deb -libltdl-dev 2.4.6-15 -libnuma-dev 2.0.12-1+b1 -pandoc 2.9.2.1-1+b1 -pkg-config 0.29.2-1 -pybind11-dev 2.6.2-1 -python3-all 3.9.2-3 -python3-dev 3.9.2-3 -python3-intelhex 2.1-2.2 -python3-pybind11 2.6.2-1 -trace-cmd 2.9.1-1 +libhwloc5 1.11.12-3 https://snapshot.debian.org/archive/debian/20220703T032011Z/pool/main/h/hwloc/libhwloc5_1.11.12-3_amd64.deb \ No newline at end of file