python-barbicanclient: rebase patches onto 7.1.0-3
Pick the meta_data.yaml from f/trixie branch: https://review.opendev.org/c/starlingx/upstream/+/955092 Resave stx-add-wheel-support.patch as git unified diff; add git log. Minor context changes. Test Plan: PASS master trixie build PASS ongoing integration work on the f/trixie branch N/A openstack-pkg-tools is a build dep, not included on ISO Story: 2011360 Task: 53128 Change-Id: I837a94e36b2e95916b29c86828b204705bdb6868 Signed-off-by: Michel Thebeau <Michel.Thebeau@windriver.com>
This commit is contained in:
Michel Thebeau
committed by
Michel Thebeau
Michel Thebeau
parent
a2c4f58420
commit
59a30f099b
@@ -14,7 +14,7 @@
|
||||
#python3-keystone
|
||||
|
||||
#python-barbicanclient
|
||||
#python3-barbicanclient
|
||||
python3-barbicanclient
|
||||
|
||||
#python-horizon
|
||||
#horizon-doc
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#openstack/keystone
|
||||
openstack/openstack-pkg-tools
|
||||
#openstack/openstack-ras
|
||||
#openstack/python-barbicanclient
|
||||
openstack/python-barbicanclient
|
||||
#openstack/python-horizon
|
||||
#openstack/python-keystoneclient
|
||||
#openstack/python-keystoneauth1
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 599df369e9077f94a3dead25f0c3852222e13f0d Mon Sep 17 00:00:00 2001
|
||||
From d76e93c9968fef0eb44d5f38ee9ae4716c961fbf Mon Sep 17 00:00:00 2001
|
||||
From: Charles Short <charles.short@windriver.com>
|
||||
Date: Mon, 29 Nov 2021 20:50:16 +0000
|
||||
Subject: [PATCH] Remove openstackclient
|
||||
Subject: [PATCH 2/2] Remove openstackclient
|
||||
|
||||
Remove build-Depends-Indep for python-openstackclient as it is
|
||||
not being used and it is causing problems with the build-pkgs
|
||||
@@ -13,17 +13,17 @@ Signed-off-by: Charles Short <charles.short@windriver.com>
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/debian/control b/debian/control
|
||||
index 73963d9..467dee1 100644
|
||||
index 66dff50..d871986 100644
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -19,7 +19,6 @@ Build-Depends-Indep:
|
||||
@@ -18,7 +18,6 @@ Build-Depends-Indep:
|
||||
python3-fixtures,
|
||||
python3-hacking,
|
||||
python3-keystoneauth1,
|
||||
python3-nose,
|
||||
python3-keystoneauth1 (>= 5.1.1),
|
||||
- python3-openstackclient,
|
||||
python3-openstackdocstheme <!nodoc>,
|
||||
python3-oslo.config,
|
||||
python3-oslo.i18n,
|
||||
--
|
||||
2.30.2
|
||||
2.34.1
|
||||
|
||||
|
||||
@@ -1,21 +1,41 @@
|
||||
diff -Nru python-barbicanclient-5.0.1/debian/changelog python-barbicanclient-5.0.1/debian/changelog
|
||||
--- python-barbicanclient-5.0.1/debian/changelog 2020-10-16 08:42:06.000000000 +0000
|
||||
+++ python-barbicanclient-5.0.1/debian/changelog 2021-10-03 18:30:48.000000000 +0000
|
||||
@@ -1,3 +1,10 @@
|
||||
+python-barbicanclient (5.0.1-2.1) unstable; urgency=medium
|
||||
From 013efeaa11ef7894123fae2558cb997e80ddb296 Mon Sep 17 00:00:00 2001
|
||||
From: Charles Short <charles.short@windriver.com>
|
||||
Date: Mon, 29 Nov 2021 16:05:46 -0500
|
||||
Subject: [PATCH 1/2] Add wheels support
|
||||
|
||||
Add support for building python3 wheel for python-barbicanclient
|
||||
|
||||
Signed-off-by: Charles Short <charles.short@windriver.com>
|
||||
|
||||
[resave as unified diff, add git log]
|
||||
Signed-off-by: Michel Thebeau <Michel.Thebeau@windriver.com>
|
||||
---
|
||||
debian/changelog | 8 ++++++++
|
||||
debian/control | 13 +++++++++++++
|
||||
debian/rules | 2 +-
|
||||
3 files changed, 22 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/debian/changelog b/debian/changelog
|
||||
index 534a14c..e96552c 100644
|
||||
--- a/debian/changelog
|
||||
+++ b/debian/changelog
|
||||
@@ -1,3 +1,11 @@
|
||||
+python-barbicanclient (7.1.0-3.1) unstable; urgency=medium
|
||||
+
|
||||
+ * Non-maintainer upload.
|
||||
+ * debian/control, debian/rules: Add wheels support.
|
||||
+ * Rebase onto 7.1.0-3; Michel Thebeau
|
||||
+
|
||||
+ -- Chuck Short <charles.short@windriver.com> Sun, 03 Oct 2021 18:30:48 +0000
|
||||
+
|
||||
python-barbicanclient (5.0.1-2) unstable; urgency=medium
|
||||
python-barbicanclient (7.1.0-3) unstable; urgency=medium
|
||||
|
||||
* Uploading to unstable.
|
||||
diff -Nru python-barbicanclient-5.0.1/debian/control python-barbicanclient-5.0.1/debian/control
|
||||
--- python-barbicanclient-5.0.1/debian/control 2020-10-16 08:42:06.000000000 +0000
|
||||
+++ python-barbicanclient-5.0.1/debian/control 2021-10-03 18:30:42.000000000 +0000
|
||||
@@ -57,3 +57,16 @@
|
||||
diff --git a/debian/control b/debian/control
|
||||
index 3b0a473..66dff50 100644
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -54,3 +54,16 @@ Description: OpenStack Key Management API client - Python 3.x
|
||||
command-line script (barbican).
|
||||
.
|
||||
This package contains the Python 3.x module.
|
||||
@@ -32,10 +52,11 @@ diff -Nru python-barbicanclient-5.0.1/debian/control python-barbicanclient-5.0.1
|
||||
+ command-line script (barbican).
|
||||
+ .
|
||||
+ This package contains the Python 3.x wheel.
|
||||
diff -Nru python-barbicanclient-5.0.1/debian/rules python-barbicanclient-5.0.1/debian/rules
|
||||
--- python-barbicanclient-5.0.1/debian/rules 2020-10-16 08:42:06.000000000 +0000
|
||||
+++ python-barbicanclient-5.0.1/debian/rules 2021-10-03 18:29:57.000000000 +0000
|
||||
@@ -12,7 +12,7 @@
|
||||
diff --git a/debian/rules b/debian/rules
|
||||
index 396d533..4ea090c 100755
|
||||
--- a/debian/rules
|
||||
+++ b/debian/rules
|
||||
@@ -14,7 +14,7 @@ override_dh_auto_build:
|
||||
echo "Do nothing..."
|
||||
|
||||
override_dh_auto_install:
|
||||
@@ -44,3 +65,6 @@ diff -Nru python-barbicanclient-5.0.1/debian/rules python-barbicanclient-5.0.1/d
|
||||
|
||||
override_dh_auto_test:
|
||||
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
---
|
||||
debname: python-barbicanclient
|
||||
debver: 5.0.1-2
|
||||
debver: 7.1.0-3
|
||||
dl_path:
|
||||
name: python-barbicanclient-debian-5.0.1-2.tar.gz
|
||||
url: https://salsa.debian.org/openstack-team/clients/python-barbicanclient/-/archive/debian/5.0.1-2/python-barbicanclient-debian-5.0.1-2.tar.gz
|
||||
md5sum: 80fe9db068b5ca8638f1ed63dbff7327
|
||||
name: python-barbicanclient-debian-7.1.0-3.tar.gz
|
||||
url: https://salsa.debian.org/openstack-team/clients/python-barbicanclient/-/archive/debian/7.1.0-3/python-barbicanclient-debian-7.1.0-3.tar.gz
|
||||
sha256sum: 3dfc901d3babb4eb00b181879e2a555d983eb85c811aca54c230632c47f02d5d
|
||||
revision:
|
||||
dist: $STX_DIST
|
||||
GITREVCOUNT:
|
||||
|
||||
Reference in New Issue
Block a user