starlingx
/
upstream
Code Issues Proposed changes

debian: Fix cyclic depends 

Remove build-Depends-Indep for python-openstackclient as it is
not being used and it is causing problems with the build-pkgs
tool.

Tested by applying patch and running build.

Story: 2009101
Task: 43518

Signed-off-by: Charles Short <charles.short@windriver.com>
Change-Id: I46aa484588eb05635371a0544ca0622da04db87c
This commit is contained in:
Charles Short 2021-11-29 16:05:46 -05:00
parent 1187f7fce7
commit c5bafe1c3d
12 changed files with 180 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
openstack/python-barbicanclient/debian/deb_patches/remove-openstackclient.patch Normal file
View File

@ -0,0 +1,29 @@
From 599df369e9077f94a3dead25f0c3852222e13f0d 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
Remove build-Depends-Indep for python-openstackclient as it is
not being used and it is causing problems with the build-pkgs
tool
Signed-off-by: Charles Short <charles.short@windriver.com>
---
debian/control | 1 -
1 file changed, 1 deletion(-)
diff --git a/debian/control b/debian/control
index 73963d9..467dee1 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,6 @@ Build-Depends-Indep:
python3-hacking,
python3-keystoneauth1,
python3-nose,
- python3-openstackclient,
python3-openstackdocstheme <!nodoc>,
python3-oslo.config,
python3-oslo.i18n,
--
2.30.2

1
openstack/python-barbicanclient/debian/deb_patches/series
View File

@ -1 +1,2 @@
stx-add-wheel-support.patch
remove-openstackclient.patch

29
openstack/python-gnocchiclient/debian/deb_patches/remove-openstackcleint.patch Normal file
View File

@ -0,0 +1,29 @@
From 8f239c761ac065f0faa6a8d4d66704f583767fb1 Mon Sep 17 00:00:00 2001
From: Charles Short <charles.short@windriver.com>
Date: Mon, 29 Nov 2021 20:57:22 +0000
Subject: [PATCH] Remove openstackclient
Remove build-Depends-Indep for python-openstackclient as it is
not being used and it is causing problems with the build-pkgs
tool
Signed-off-by: Charles Short <charles.short@windriver.com>
---
debian/control | 1 -
1 file changed, 1 deletion(-)
diff --git a/debian/control b/debian/control
index c80f5f7..87e4cb8 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,6 @@ Build-Depends-Indep:
python3-keystoneauth1,
python3-keystonemiddleware <!nocheck>,
python3-monotonic,
- python3-openstackclient,
python3-osc-lib,
python3-pytest <!nocheck>,
python3-pytest-xdist <!nocheck>,
--
2.30.2

1
openstack/python-gnocchiclient/debian/deb_patches/series
View File

@ -1 +1,2 @@
0001-Add-python3-wheel.patch
remove-openstackcleint.patch

29
openstack/python-heatclient/debian/deb_patches/remove-openstackclient.patch Normal file
View File

@ -0,0 +1,29 @@
From d02fa3227bbf56e4f30d2cf3a21dd5a1d915d96a Mon Sep 17 00:00:00 2001
From: Charles Short <charles.short@windriver.com>
Date: Mon, 29 Nov 2021 20:51:40 +0000
Subject: [PATCH] Remove openstackcilent
Remove build-Depends-Indep for python-openstackclient as it is
not being used and it is causing problems with the build-pkgs
tool.
Signed-off-by: Charles Short <charles.short@windriver.com>
---
debian/control | 1 -
1 file changed, 1 deletion(-)
diff --git a/debian/control b/debian/control
index f287c45..5aeee36 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,6 @@ Build-Depends-Indep:
python3-hacking,
python3-iso8601,
python3-keystoneauth1,
- python3-openstackclient,
python3-openstackdocstheme,
python3-osc-lib,
python3-oslo.i18n,
--
2.30.2

1
openstack/python-heatclient/debian/deb_patches/series
View File

@ -1 +1,2 @@
0001-Add-wheel-support.patch
remove-openstackclient.patch

29
openstack/python-ironicclient/debian/deb_patches/remove-openstackclient.patch Normal file
View File

@ -0,0 +1,29 @@
From 26c374cef18537b8c2bd045838f5a4940f43323c Mon Sep 17 00:00:00 2001
From: Charles Short <charles.short@windriver.com>
Date: Mon, 29 Nov 2021 20:52:34 +0000
Subject: [PATCH] Remove openstackclient
Remove build-Depends-Indep for python-openstackclient as it is
not being used and it is causing problems with the build-pkgs
tool.
Signed-off-by: Charles Short <charles.short@windriver.com>
---
debian/control | 1 -
1 file changed, 1 deletion(-)
diff --git a/debian/control b/debian/control
index 8de0e3e..08a8fe1 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,6 @@ Build-Depends-Indep:
python3-fixtures,
python3-jsonschema (>= 3.2.0),
python3-keystoneauth1,
- python3-openstackclient,
python3-openstackdocstheme,
python3-openstacksdk (>= 0.18.0),
python3-osc-lib,
--
2.30.2

1
openstack/python-ironicclient/debian/deb_patches/series
View File

@ -1 +1,2 @@
0001-Add-wheel-package.patch
remove-openstackclient.patch

29
openstack/python-neutronclient/debian/deb_patches/remove-openstackclient.patch Normal file
View File

@ -0,0 +1,29 @@
From 05a9cb2d2c40aae1061191cd1f8627a7f8986fee Mon Sep 17 00:00:00 2001
From: Charles Short <charles.short@windriver.com>
Date: Mon, 29 Nov 2021 20:54:00 +0000
Subject: [PATCH] Remove openstackclient
Remove build-Depends-Indep for python-openstackclient as it is
not being used and it is causing problems with the build-pkgs
tool.
Signed-off-by: Charles Short <charles.short@windriver.com>
---
debian/control | 1 -
1 file changed, 1 deletion(-)
diff --git a/debian/control b/debian/control
index ac5fc13..097dadf 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,6 @@ Build-Depends-Indep:
python3-keystoneauth1,
python3-keystoneclient,
python3-netaddr,
- python3-openstackclient,
python3-openstackdocstheme,
python3-os-client-config,
python3-osc-lib,
--
2.30.2

1
openstack/python-neutronclient/debian/deb_patches/series
View File

@ -1 +1,2 @@
0001-Add-wheel-package.patch
remove-openstackclient.patch

29
openstack/python-pankoclient/debian/deb_patches/remove-openstackclient.patch Normal file
View File

@ -0,0 +1,29 @@
From 88f1f5f98b92555db1ccdd92f26b57dcd678636f Mon Sep 17 00:00:00 2001
From: Charles Short <charles.short@windriver.com>
Date: Mon, 29 Nov 2021 20:55:20 +0000
Subject: [PATCH] Remove python-openstackclient
Remove build-Depends-Indep for python-openstackclient as it is
not being used and it is causing problems with the build-pkgs
tool.
Signed-off-by: Charles Short <charles.short@windriver.com>
---
debian/control | 1 -
1 file changed, 1 deletion(-)
diff --git a/debian/control b/debian/control
index 0647124..4d3dda6 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Build-Depends-Indep:
python3-coverage,
python3-hacking,
python3-keystoneauth1,
- python3-openstackclient,
python3-openstackdocstheme,
python3-osc-lib,
python3-oslo.i18n,
--
2.30.2

1
openstack/python-pankoclient/debian/deb_patches/series
View File

@ -1 +1,2 @@
0001-Add-wheel-package.patch
remove-openstackclient.patch