From 776b032becec283d240560b7ae3cbdf5a181b15a Mon Sep 17 00:00:00 2001 From: Romulo Leite Date: Mon, 17 Feb 2025 15:43:55 -0300 Subject: [PATCH] Upversion openstack-pkg-tools to caracal As part of the STX-Openstack upversion, it was noticed that this package creates a .deb necessary for images build. All patches were updated in order to make the package buildable in the new version. With that upversion, future images updates will happen easily. NOTE: this was initially committed on [1] but an error occurred on the build of other packages so it was reverted until now, when that error was fixed. The problem was a missed file on patch 0002 Test Plan: PASS: Build the openstack-pkg-tools package PASS: Build all packages PASS: Build all stx docker images Story: 2011303 Task: 51552 [1] https://review.opendev.org/c/starlingx/openstack-armada-app/+/939474 Change-Id: I2f53aadec423264404c6c004e477d798da4ba86f Signed-off-by: Romulo Leite --- ... 0001-Add-ipv6-support-for-keystone.patch} | 9 +-- ...d-support-for-building-python3-wheel.patch | 66 +++++++++++++++++++ .../debian/deb_patches/series | 4 +- .../deb_patches/stx-add-wheel-support.patch | 53 --------------- .../openstack-pkg-tools/debian/meta_data.yaml | 9 +-- 5 files changed, 78 insertions(+), 63 deletions(-) rename upstream/openstack/openstack-pkg-tools/debian/deb_patches/{add-ipv6-support.patch => 0001-Add-ipv6-support-for-keystone.patch} (79%) create mode 100644 upstream/openstack/openstack-pkg-tools/debian/deb_patches/0002-Add-support-for-building-python3-wheel.patch delete mode 100644 upstream/openstack/openstack-pkg-tools/debian/deb_patches/stx-add-wheel-support.patch diff --git a/upstream/openstack/openstack-pkg-tools/debian/deb_patches/add-ipv6-support.patch b/upstream/openstack/openstack-pkg-tools/debian/deb_patches/0001-Add-ipv6-support-for-keystone.patch similarity index 79% rename from upstream/openstack/openstack-pkg-tools/debian/deb_patches/add-ipv6-support.patch rename to upstream/openstack/openstack-pkg-tools/debian/deb_patches/0001-Add-ipv6-support-for-keystone.patch index 6bfe31f5..bbbafa61 100644 --- a/upstream/openstack/openstack-pkg-tools/debian/deb_patches/add-ipv6-support.patch +++ b/upstream/openstack/openstack-pkg-tools/debian/deb_patches/0001-Add-ipv6-support-for-keystone.patch @@ -8,10 +8,10 @@ Subject: [PATCH] Descritpion: Add ipv6 support for keystone 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init-template/init-script-template b/init-template/init-script-template -index c0df791..2cd88a7 100644 +index d7149f5..b2e23b6 100644 --- a/init-template/init-script-template +++ b/init-template/init-script-template -@@ -57,7 +57,7 @@ if [ -n "${UWSGI_PORT}" ] && [ -n "${UWSGI_INI_PATH}" ] && [ -n "${UWSGI_INI_APP +@@ -70,7 +70,7 @@ if [ -n "${UWSGI_PORT}" ] && [ -n "${UWSGI_INI_PATH}" ] && [ -n "${UWSGI_INI_APP fi fi else @@ -19,6 +19,7 @@ index c0df791..2cd88a7 100644 + UWSGI_BIND_IP="[::]" fi - if [ -n "${KEY_FILE}" ] && [ -n "${CERT_FILE}" ] ; then + if [ -n "${BIND_PARAMS}" ] ; then -- -2.17.1 \ No newline at end of file +2.34.1 + diff --git a/upstream/openstack/openstack-pkg-tools/debian/deb_patches/0002-Add-support-for-building-python3-wheel.patch b/upstream/openstack/openstack-pkg-tools/debian/deb_patches/0002-Add-support-for-building-python3-wheel.patch new file mode 100644 index 00000000..b11640b0 --- /dev/null +++ b/upstream/openstack/openstack-pkg-tools/debian/deb_patches/0002-Add-support-for-building-python3-wheel.patch @@ -0,0 +1,66 @@ +Description: Add support for building python3 wheel in Debian Openstack +Author: Chuck Short m> +--- + build-tools/pkgos-dh_auto_install | 9 +++++++++ + debian/changelog | 6 ++++++ + debian/control | 1 + + 3 files changed, 16 insertions(+) + +diff --git a/build-tools/pkgos-dh_auto_install b/build-tools/pkgos-dh_auto_install +index f766f13..dcccb5b 100755 +--- a/build-tools/pkgos-dh_auto_install ++++ b/build-tools/pkgos-dh_auto_install +@@ -18,6 +18,10 @@ for i in $@ ; do + PKGOS_IN_TMP=yes + shift + ;; ++ "--wheel") ++ PKGOS_USE_WHEEL=yes ++ shift ++ ;; + *) + ;; + esac +@@ -36,5 +40,10 @@ fi + for pyvers in ${PYTHON3S}; do + python${pyvers} setup.py install --install-layout=deb --root $(pwd)/debian/${TARGET_DIR} + done ++ if [ "${PKGOS_USE_WHEEL}" = "yes" ]; then ++ for pyvers in ${PYTHON3S}; do ++ python${pyvers} setup.py bdist_wheel --universal -d $(pwd)/debian/python3-${PY_MODULE_NAME}-wheel/usr/share/python-wheel ++ done ++ fi + rm -rf $(pwd)/debian/python*/usr/lib/python*/dist-packages/*.pth + rm -rf $(pwd)/debian/tmp/usr/lib/python*/dist-packages/*.pth +diff --git a/debian/changelog b/debian/changelog +index 63aa502..4533066 100644 +--- a/debian/changelog ++++ b/debian/changelog +@@ -91,6 +91,12 @@ openstack-pkg-tools (118) unstable; urgency=medium + * Add code to calculate swift-object multi-port uwsgi startup. + + -- Thomas Goirand Mon, 18 Jan 2021 21:41:08 +0100 ++openstack-pkg-tools (117+nmu1) unstable; urgency=medium ++ ++ * Non-maintainer upload. ++ * build-tools/pkgos-dh_auto_install: Add wheel support. ++ ++ -- Chuck Short Sun, 03 Oct 2021 15:10:16 +0000 + + openstack-pkg-tools (117) unstable; urgency=medium + +diff --git a/debian/control b/debian/control +index 8cb1b2d..70ed450 100644 +--- a/debian/control ++++ b/debian/control +@@ -17,6 +17,7 @@ Architecture: all + Multi-Arch: foreign + Depends: + python3-pip, ++ python3-wheel, + gettext, + jq, + po-debconf, +-- +2.34.1 + diff --git a/upstream/openstack/openstack-pkg-tools/debian/deb_patches/series b/upstream/openstack/openstack-pkg-tools/debian/deb_patches/series index 5773114b..5786c78c 100644 --- a/upstream/openstack/openstack-pkg-tools/debian/deb_patches/series +++ b/upstream/openstack/openstack-pkg-tools/debian/deb_patches/series @@ -1,2 +1,2 @@ -stx-add-wheel-support.patch -add-ipv6-support.patch +0001-Add-ipv6-support-for-keystone.patch +0002-Add-support-for-building-python3-wheel.patch diff --git a/upstream/openstack/openstack-pkg-tools/debian/deb_patches/stx-add-wheel-support.patch b/upstream/openstack/openstack-pkg-tools/debian/deb_patches/stx-add-wheel-support.patch deleted file mode 100644 index 1325507d..00000000 --- a/upstream/openstack/openstack-pkg-tools/debian/deb_patches/stx-add-wheel-support.patch +++ /dev/null @@ -1,53 +0,0 @@ -Description: Add support for building python3 wheel in Debian Openstack -Author: Chuck Short -diff -Nru openstack-pkg-tools-117/build-tools/pkgos-dh_auto_install openstack-pkg-tools-117+nmu1/build-tools/pkgos-dh_auto_install ---- openstack-pkg-tools-117/build-tools/pkgos-dh_auto_install 2020-11-29 19:50:57.000000000 +0000 -+++ openstack-pkg-tools-117+nmu1/build-tools/pkgos-dh_auto_install 2021-10-03 15:10:16.000000000 +0000 -@@ -20,6 +20,10 @@ - PKGOS_IN_TMP=yes - shift - ;; -+ "--wheel") -+ PKGOS_USE_WHEEL=yes -+ shift -+ ;; - *) - ;; - esac -@@ -50,6 +54,11 @@ - for pyvers in ${PYTHON3S}; do - python${pyvers} setup.py install --install-layout=deb --root $(pwd)/debian/${TARGET_DIR} - done -+ if [ "${PKGOS_USE_WHEEL}" = "yes" ]; then -+ for pyvers in ${PYTHON3S}; do -+ python${pyvers} setup.py bdist_wheel --universal -d $(pwd)/debian/python3-${PY_MODULE_NAME}-wheel/usr/share/python-wheel -+ done -+ fi - fi - rm -rf $(pwd)/debian/python*/usr/lib/python*/dist-packages/*.pth - rm -rf $(pwd)/debian/tmp/usr/lib/python*/dist-packages/*.pth -diff -Nru openstack-pkg-tools-117/debian/changelog openstack-pkg-tools-117+nmu1/debian/changelog ---- openstack-pkg-tools-117/debian/changelog 2020-11-29 19:50:57.000000000 +0000 -+++ openstack-pkg-tools-117+nmu1/debian/changelog 2021-10-03 15:10:16.000000000 +0000 -@@ -1,3 +1,10 @@ -+openstack-pkg-tools (117+nmu1) unstable; urgency=medium -+ -+ * Non-maintainer upload. -+ * build-tools/pkgos-dh_auto_install: Add wheel support. -+ -+ -- Chuck Short Sun, 03 Oct 2021 15:10:16 +0000 -+ - openstack-pkg-tools (117) unstable; urgency=medium - - * Using override_installsystemd instead of override_dh_systemd_enable -diff -Nru openstack-pkg-tools-117/debian/control openstack-pkg-tools-117+nmu1/debian/control ---- openstack-pkg-tools-117/debian/control 2020-11-29 19:50:57.000000000 +0000 -+++ openstack-pkg-tools-117+nmu1/debian/control 2021-10-03 15:10:16.000000000 +0000 -@@ -16,6 +16,7 @@ - Multi-Arch: foreign - Depends: - python3-pip, -+ python3-wheel, - gettext, - jq, - po-debconf, diff --git a/upstream/openstack/openstack-pkg-tools/debian/meta_data.yaml b/upstream/openstack/openstack-pkg-tools/debian/meta_data.yaml index c70184a5..fb8f74c3 100644 --- a/upstream/openstack/openstack-pkg-tools/debian/meta_data.yaml +++ b/upstream/openstack/openstack-pkg-tools/debian/meta_data.yaml @@ -1,10 +1,11 @@ --- debname: openstack-pkg-tools -debver: 117 +debver: 124 dl_path: - name: openstack-pkg-tools-debian-117.tar.gz - url: https://salsa.debian.org/openstack-team/debian/openstack-pkg-tools/-/archive/debian/117/openstack-pkg-tools-debian-117.tar.gz - md5sum: 6c26ff316b869ca12e09e7f3e77c150e + name: openstack-pkg-tools-debian-124.tar.gz + url: https://salsa.debian.org/openstack-team/debian/openstack-pkg-tools/-/archive/debian/caracal/openstack-pkg-tools-debian-caracal.tar.gz + md5sum: f288c1071d8e0e2c939a876c260af818 + sha256sum: 55afe08934b2ab5f4487ab07b26439d2136e224e5cbfa02b25666ac25b61ca7b revision: dist: $STX_DIST GITREVCOUNT: