From c7c27a34491acff9c5c628fe18dedd6db7f0eeb6 Mon Sep 17 00:00:00 2001 From: Luan Nunes Utimura Date: Fri, 1 Sep 2023 14:06:05 -0300 Subject: [PATCH] Move OPAE tools package dependencies to flock In [1], dependencies for the OPAE tools package (opae-sdk) were added in the `containers` layer, despite the package itself being on the `flock` layer (`starlingx/utilities`). This isn't a problem when all downloaded binaries go to the same repository: `deb-local-binary`. However, now that we are considering creating one repository per layer ([2] and [3]), these dependencies need to be on the appropriate layer. In this case, on the same layer as the `opae-sdk`. [1] https://review.opendev.org/c/starlingx/tools/+/862743 [2] https://review.opendev.org/c/starlingx/tools/+/893105 [3] https://review.opendev.org/c/starlingx/root/+/893095 Test Plan: PASS - Run: $ repo_manage.py clean and verify that it cleaned all existing repositories: $ repo_manage.py list PASS - Run `downloader` successfully and verify that the dependencies were uploaded to `deb-local-binary-flock` instead of `deb-local-binary-containers` PASS - Build `opae-sdk` package PASS - Build all packages PASS - Build image Story: 2010797 Task: 48714 Change-Id: Ic9a8663102872fdaf9de9e45aadbc78d328c8f4e Signed-off-by: Luan Nunes Utimura (cherry picked from commit 65f635f35e6f9dd00c8a7829a672a710027f3b46) --- .../config/debian/containers/os-std.lst | 13 ------------- debian-mirror-tools/config/debian/flock/os-std.lst | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 debian-mirror-tools/config/debian/flock/os-std.lst diff --git a/debian-mirror-tools/config/debian/containers/os-std.lst b/debian-mirror-tools/config/debian/containers/os-std.lst index 86cd7bf2..9272beb7 100644 --- a/debian-mirror-tools/config/debian/containers/os-std.lst +++ b/debian-mirror-tools/config/debian/containers/os-std.lst @@ -1,4 +1,3 @@ -acpica-tools 20200925-1.2 autoconf-archive 20190106-2.1 autogen 1:5.18.16-4 autogen-doc 1:5.18.16-4 @@ -18,14 +17,10 @@ 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 -libnuma-dev 2.0.12-1+b1 libopts25-dev 1:5.18.16-4 libpython2-stdlib 2.7.18-3 libpython2.7-minimal 2.7.18-8 @@ -34,23 +29,15 @@ 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-all 3.9.2-3 -python3-dev 3.9.2-3 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 new file mode 100644 index 00000000..1a0e9129 --- /dev/null +++ b/debian-mirror-tools/config/debian/flock/os-std.lst @@ -0,0 +1,13 @@ +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