From c5bafe1c3d0ecadd62e8e99dd1dee7a8d804d5f0 Mon Sep 17 00:00:00 2001 From: Charles Short Date: Mon, 29 Nov 2021 16:05:46 -0500 Subject: [PATCH] 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 Change-Id: I46aa484588eb05635371a0544ca0622da04db87c --- .../deb_patches/remove-openstackclient.patch | 29 +++++++++++++++++++ .../debian/deb_patches/series | 1 + .../deb_patches/remove-openstackcleint.patch | 29 +++++++++++++++++++ .../debian/deb_patches/series | 1 + .../deb_patches/remove-openstackclient.patch | 29 +++++++++++++++++++ .../debian/deb_patches/series | 1 + .../deb_patches/remove-openstackclient.patch | 29 +++++++++++++++++++ .../debian/deb_patches/series | 1 + .../deb_patches/remove-openstackclient.patch | 29 +++++++++++++++++++ .../debian/deb_patches/series | 1 + .../deb_patches/remove-openstackclient.patch | 29 +++++++++++++++++++ .../debian/deb_patches/series | 1 + 12 files changed, 180 insertions(+) create mode 100644 openstack/python-barbicanclient/debian/deb_patches/remove-openstackclient.patch create mode 100644 openstack/python-gnocchiclient/debian/deb_patches/remove-openstackcleint.patch create mode 100644 openstack/python-heatclient/debian/deb_patches/remove-openstackclient.patch create mode 100644 openstack/python-ironicclient/debian/deb_patches/remove-openstackclient.patch create mode 100644 openstack/python-neutronclient/debian/deb_patches/remove-openstackclient.patch create mode 100644 openstack/python-pankoclient/debian/deb_patches/remove-openstackclient.patch diff --git a/openstack/python-barbicanclient/debian/deb_patches/remove-openstackclient.patch b/openstack/python-barbicanclient/debian/deb_patches/remove-openstackclient.patch new file mode 100644 index 00000000..27a0fd11 --- /dev/null +++ b/openstack/python-barbicanclient/debian/deb_patches/remove-openstackclient.patch @@ -0,0 +1,29 @@ +From 599df369e9077f94a3dead25f0c3852222e13f0d Mon Sep 17 00:00:00 2001 +From: Charles Short +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 +--- + 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 , + python3-oslo.config, + python3-oslo.i18n, +-- +2.30.2 + diff --git a/openstack/python-barbicanclient/debian/deb_patches/series b/openstack/python-barbicanclient/debian/deb_patches/series index 315d03bb..fe75e774 100644 --- a/openstack/python-barbicanclient/debian/deb_patches/series +++ b/openstack/python-barbicanclient/debian/deb_patches/series @@ -1 +1,2 @@ stx-add-wheel-support.patch +remove-openstackclient.patch diff --git a/openstack/python-gnocchiclient/debian/deb_patches/remove-openstackcleint.patch b/openstack/python-gnocchiclient/debian/deb_patches/remove-openstackcleint.patch new file mode 100644 index 00000000..0ef259dc --- /dev/null +++ b/openstack/python-gnocchiclient/debian/deb_patches/remove-openstackcleint.patch @@ -0,0 +1,29 @@ +From 8f239c761ac065f0faa6a8d4d66704f583767fb1 Mon Sep 17 00:00:00 2001 +From: Charles Short +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 +--- + 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 , + python3-monotonic, +- python3-openstackclient, + python3-osc-lib, + python3-pytest , + python3-pytest-xdist , +-- +2.30.2 + diff --git a/openstack/python-gnocchiclient/debian/deb_patches/series b/openstack/python-gnocchiclient/debian/deb_patches/series index 6c3d35ef..1d28fb9e 100644 --- a/openstack/python-gnocchiclient/debian/deb_patches/series +++ b/openstack/python-gnocchiclient/debian/deb_patches/series @@ -1 +1,2 @@ 0001-Add-python3-wheel.patch +remove-openstackcleint.patch diff --git a/openstack/python-heatclient/debian/deb_patches/remove-openstackclient.patch b/openstack/python-heatclient/debian/deb_patches/remove-openstackclient.patch new file mode 100644 index 00000000..39b1de7a --- /dev/null +++ b/openstack/python-heatclient/debian/deb_patches/remove-openstackclient.patch @@ -0,0 +1,29 @@ +From d02fa3227bbf56e4f30d2cf3a21dd5a1d915d96a Mon Sep 17 00:00:00 2001 +From: Charles Short +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 +--- + 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 + diff --git a/openstack/python-heatclient/debian/deb_patches/series b/openstack/python-heatclient/debian/deb_patches/series index bc87bad2..a754a1a2 100644 --- a/openstack/python-heatclient/debian/deb_patches/series +++ b/openstack/python-heatclient/debian/deb_patches/series @@ -1 +1,2 @@ 0001-Add-wheel-support.patch +remove-openstackclient.patch diff --git a/openstack/python-ironicclient/debian/deb_patches/remove-openstackclient.patch b/openstack/python-ironicclient/debian/deb_patches/remove-openstackclient.patch new file mode 100644 index 00000000..44dd2616 --- /dev/null +++ b/openstack/python-ironicclient/debian/deb_patches/remove-openstackclient.patch @@ -0,0 +1,29 @@ +From 26c374cef18537b8c2bd045838f5a4940f43323c Mon Sep 17 00:00:00 2001 +From: Charles Short +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 +--- + 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 + diff --git a/openstack/python-ironicclient/debian/deb_patches/series b/openstack/python-ironicclient/debian/deb_patches/series index c200b057..8478f3b7 100644 --- a/openstack/python-ironicclient/debian/deb_patches/series +++ b/openstack/python-ironicclient/debian/deb_patches/series @@ -1 +1,2 @@ 0001-Add-wheel-package.patch +remove-openstackclient.patch diff --git a/openstack/python-neutronclient/debian/deb_patches/remove-openstackclient.patch b/openstack/python-neutronclient/debian/deb_patches/remove-openstackclient.patch new file mode 100644 index 00000000..9c7eac23 --- /dev/null +++ b/openstack/python-neutronclient/debian/deb_patches/remove-openstackclient.patch @@ -0,0 +1,29 @@ +From 05a9cb2d2c40aae1061191cd1f8627a7f8986fee Mon Sep 17 00:00:00 2001 +From: Charles Short +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 +--- + 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 + diff --git a/openstack/python-neutronclient/debian/deb_patches/series b/openstack/python-neutronclient/debian/deb_patches/series index c200b057..8478f3b7 100644 --- a/openstack/python-neutronclient/debian/deb_patches/series +++ b/openstack/python-neutronclient/debian/deb_patches/series @@ -1 +1,2 @@ 0001-Add-wheel-package.patch +remove-openstackclient.patch diff --git a/openstack/python-pankoclient/debian/deb_patches/remove-openstackclient.patch b/openstack/python-pankoclient/debian/deb_patches/remove-openstackclient.patch new file mode 100644 index 00000000..01508bda --- /dev/null +++ b/openstack/python-pankoclient/debian/deb_patches/remove-openstackclient.patch @@ -0,0 +1,29 @@ +From 88f1f5f98b92555db1ccdd92f26b57dcd678636f Mon Sep 17 00:00:00 2001 +From: Charles Short +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 +--- + 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 + diff --git a/openstack/python-pankoclient/debian/deb_patches/series b/openstack/python-pankoclient/debian/deb_patches/series index c200b057..8478f3b7 100644 --- a/openstack/python-pankoclient/debian/deb_patches/series +++ b/openstack/python-pankoclient/debian/deb_patches/series @@ -1 +1,2 @@ 0001-Add-wheel-package.patch +remove-openstackclient.patch