starlingx/openstack-armada-app
Code Issues Proposed changes

Merge "Upversion openstack-pkg-tools to caracal"

Browse Source
This commit is contained in:
Zuul 2025-02-20 19:24:25 +00:00 committed by Gerrit Code Review
commit 18f1183204
5 changed files with 78 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
upstream/openstack/openstack-pkg-tools/debian/deb_patches/add-ipv6-support.patch → upstream/openstack/openstack-pkg-tools/debian/deb_patches/0001-Add-ipv6-support-for-keystone.patch
View File

@ -8,10 +8,10 @@ Subject: [PATCH] Descritpion: Add ipv6 support for keystone
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/init-template/init-script-template b/init-template/init-script-template 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 --- a/init-template/init-script-template
+++ b/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
fi fi
else else
@ -19,6 +19,7 @@ index c0df791..2cd88a7 100644
+ UWSGI_BIND_IP="[::]" + UWSGI_BIND_IP="[::]"
fi fi
if [ -n "${KEY_FILE}" ] && [ -n "${CERT_FILE}" ] ; then if [ -n "${BIND_PARAMS}" ] ; then
-- --
2.17.1 2.34.1

66
upstream/openstack/openstack-pkg-tools/debian/deb_patches/0002-Add-support-for-building-python3-wheel.patch Normal file
View File

@ -0,0 +1,66 @@
Description: Add support for building python3 wheel in Debian Openstack
Author: Chuck Short <charles.short@windriver.com>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 <zigo@debian.org> 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 <zulcss@ubuntu.com> 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

4
upstream/openstack/openstack-pkg-tools/debian/deb_patches/series
View File

@ -1,2 +1,2 @@
stx-add-wheel-support.patch 0001-Add-ipv6-support-for-keystone.patch
add-ipv6-support.patch 0002-Add-support-for-building-python3-wheel.patch

53
upstream/openstack/openstack-pkg-tools/debian/deb_patches/stx-add-wheel-support.patch
View File

@ -1,53 +0,0 @@
Description: Add support for building python3 wheel in Debian Openstack
Author: Chuck Short <charles.short@windriver.com>
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 <zulcss@ubuntu.com> 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,

9
upstream/openstack/openstack-pkg-tools/debian/meta_data.yaml
View File

@ -1,10 +1,11 @@
--- ---
debname: openstack-pkg-tools debname: openstack-pkg-tools
debver: 117 debver: 124
dl_path: dl_path:
name: openstack-pkg-tools-debian-117.tar.gz name: openstack-pkg-tools-debian-124.tar.gz
url: https://salsa.debian.org/openstack-team/debian/openstack-pkg-tools/-/archive/debian/117/openstack-pkg-tools-debian-117.tar.gz url: https://salsa.debian.org/openstack-team/debian/openstack-pkg-tools/-/archive/debian/caracal/openstack-pkg-tools-debian-caracal.tar.gz
md5sum: 6c26ff316b869ca12e09e7f3e77c150e md5sum: f288c1071d8e0e2c939a876c260af818
sha256sum: 55afe08934b2ab5f4487ab07b26439d2136e224e5cbfa02b25666ac25b61ca7b
revision: revision:
dist: $STX_DIST dist: $STX_DIST
GITREVCOUNT: GITREVCOUNT: