scripts: add build_stx.sh to support StarlingX build
[pti/rtp.git] / scripts / meta-patches / src_stx / meta-cloud-services / 0001-Workaround-and-fix-compile-and-dependency-problems.patch
1 From 743a95f637e68916bcb8fdc82b9672a3b2fd3f6a Mon Sep 17 00:00:00 2001
2 From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
3 Date: Thu, 23 Jan 2020 14:00:56 -0800
4 Subject: [PATCH 1/5] Workaround and fix compile and dependency problems.
5
6 ---
7  meta-openstack/recipes-devtools/python/python-barbican_git.bb   | 2 +-
8  .../recipes-devtools/python/python-barbicanclient_git.bb        | 2 +-
9  meta-openstack/recipes-devtools/python/python-castellan_git.bb  | 2 +-
10  meta-openstack/recipes-devtools/python/python-ceilometer_git.bb | 2 +-
11  .../recipes-devtools/python/python-ceilometerclient_git.bb      | 2 +-
12  meta-openstack/recipes-devtools/python/python-cinder_git.bb     | 2 +-
13  .../recipes-devtools/python/python-cinderclient_git.bb          | 2 +-
14  meta-openstack/recipes-devtools/python/python-cliff_2.14.1.bb   | 2 +-
15  meta-openstack/recipes-devtools/python/python-cursive_git.bb    | 2 +-
16  .../recipes-devtools/python/python-debtcollector_1.17.1.bb      | 2 +-
17  .../recipes-devtools/python/python-designateclient_git.bb       | 2 +-
18  .../recipes-devtools/python/python-django-openstack-auth_git.bb | 2 +-
19  meta-openstack/recipes-devtools/python/python-ecdsa_0.13.bb     | 2 +-
20  meta-openstack/recipes-devtools/python/python-fasteners_git.bb  | 2 +-
21  meta-openstack/recipes-devtools/python/python-fixtures_3.0.0.bb | 2 +-
22  .../recipes-devtools/python/python-functools32_git.bb           | 2 +-
23  .../recipes-devtools/python/python-glance-store_git.bb          | 2 +-
24  meta-openstack/recipes-devtools/python/python-glance_git.bb     | 2 +-
25  .../recipes-devtools/python/python-glanceclient_git.bb          | 2 +-
26  .../recipes-devtools/python/python-glancestore_git.bb           | 2 +-
27  .../recipes-devtools/python/python-heat-cfntools_1.2.8.bb       | 2 +-
28  meta-openstack/recipes-devtools/python/python-heat_git.bb       | 2 +-
29  meta-openstack/recipes-devtools/python/python-heatclient_git.bb | 2 +-
30  meta-openstack/recipes-devtools/python/python-horizon_git.bb    | 2 +-
31  meta-openstack/recipes-devtools/python/python-ipaddr_2.1.11.bb  | 2 +-
32  .../recipes-devtools/python/python-jsonpath-rw-ext_git.bb       | 2 +-
33  meta-openstack/recipes-devtools/python/python-kafka_git.bb      | 2 +-
34  meta-openstack/recipes-devtools/python/python-keystone_git.bb   | 2 +-
35  .../recipes-devtools/python/python-keystoneauth1_3.2.0.bb       | 2 +-
36  .../recipes-devtools/python/python-keystoneclient_git.bb        | 2 +-
37  .../recipes-devtools/python/python-keystonemiddleware_git.bb    | 2 +-
38  .../recipes-devtools/python/python-lockfile_0.12.2.bb           | 2 +-
39  .../recipes-devtools/python/python-magnumclient_git.bb          | 2 +-
40  .../recipes-devtools/python/python-manilaclient_git.bb          | 2 +-
41  .../recipes-devtools/python/python-mistralclient_git.bb         | 2 +-
42  meta-openstack/recipes-devtools/python/python-monotonic_git.bb  | 2 +-
43  meta-openstack/recipes-devtools/python/python-mox3_0.26.0.bb    | 2 +-
44  .../recipes-devtools/python/python-neutron-lib_git.bb           | 2 +-
45  meta-openstack/recipes-devtools/python/python-neutron_git.bb    | 2 +-
46  .../recipes-devtools/python/python-neutronclient_git.bb         | 2 +-
47  meta-openstack/recipes-devtools/python/python-nova_git.bb       | 2 +-
48  meta-openstack/recipes-devtools/python/python-novaclient_git.bb | 2 +-
49  .../recipes-devtools/python/python-openstackclient_git.bb       | 2 +-
50  .../recipes-devtools/python/python-openstacksdk_git.bb          | 2 +-
51  meta-openstack/recipes-devtools/python/python-os-brick_git.bb   | 2 +-
52  .../recipes-devtools/python/python-os-client-config_git.bb      | 2 +-
53  meta-openstack/recipes-devtools/python/python-os-traits_git.bb  | 2 +-
54  meta-openstack/recipes-devtools/python/python-os-vif_git.bb     | 2 +-
55  meta-openstack/recipes-devtools/python/python-os-win_git.bb     | 2 +-
56  meta-openstack/recipes-devtools/python/python-os-xenapi_git.bb  | 2 +-
57  meta-openstack/recipes-devtools/python/python-oslo.cache_git.bb | 2 +-
58  .../recipes-devtools/python/python-oslo.concurrency_git.bb      | 2 +-
59  .../recipes-devtools/python/python-oslo.config_git.bb           | 2 +-
60  .../recipes-devtools/python/python-oslo.context_git.bb          | 2 +-
61  meta-openstack/recipes-devtools/python/python-oslo.db_git.bb    | 2 +-
62  .../recipes-devtools/python/python-oslo.i18n_3.20.0.bb          | 2 +-
63  meta-openstack/recipes-devtools/python/python-oslo.i18n_git.bb  | 2 +-
64  meta-openstack/recipes-devtools/python/python-oslo.log_git.bb   | 2 +-
65  .../recipes-devtools/python/python-oslo.messaging_git.bb        | 2 +-
66  .../recipes-devtools/python/python-oslo.middleware_git.bb       | 2 +-
67  .../recipes-devtools/python/python-oslo.policy_git.bb           | 2 +-
68  .../recipes-devtools/python/python-oslo.privsep_git.bb          | 2 +-
69  .../recipes-devtools/python/python-oslo.reports_git.bb          | 2 +-
70  .../recipes-devtools/python/python-oslo.rootwrap_git.bb         | 2 +-
71  .../recipes-devtools/python/python-oslo.serialization_git.bb    | 2 +-
72  .../recipes-devtools/python/python-oslo.service_git.bb          | 2 +-
73  meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb | 2 +-
74  .../recipes-devtools/python/python-oslo.versionedobjects_git.bb | 2 +-
75  .../recipes-devtools/python/python-oslo.vmware_git.bb           | 2 +-
76  meta-openstack/recipes-devtools/python/python-oslotest_git.bb   | 2 +-
77  .../recipes-devtools/python/python-osprofiler_1.5.0.bb          | 2 +-
78  meta-openstack/recipes-devtools/python/python-ovsdbapp_git.bb   | 2 +-
79  meta-openstack/recipes-devtools/python/python-pycadf_git.bb     | 2 +-
80  meta-openstack/recipes-devtools/python/python-rally_git.bb      | 2 +-
81  meta-openstack/recipes-devtools/python/python-ryu_git.bb        | 2 +-
82  .../recipes-devtools/python/python-saharaclient_git.bb          | 2 +-
83  meta-openstack/recipes-devtools/python/python-swift_git.bb      | 2 +-
84  .../recipes-devtools/python/python-swiftclient_git.bb           | 2 +-
85  meta-openstack/recipes-devtools/python/python-taskflow_git.bb   | 2 +-
86  .../recipes-devtools/python/python-testscenarios_0.5.0.bb       | 2 +-
87  .../recipes-devtools/python/python-testtools_2.3.0.bb           | 2 +-
88  meta-openstack/recipes-devtools/python/python-tooz_1.48.0.bb    | 2 +-
89  meta-openstack/recipes-devtools/python/python-trove_git.bb      | 2 +-
90  .../recipes-devtools/python/python-troveclient_git.bb           | 2 +-
91  meta-openstack/recipes-devtools/python/python-unicodecsv_git.bb | 2 +-
92  meta-openstack/recipes-devtools/python/python-wsme_0.9.2.bb     | 2 +-
93  .../recipes-devtools/python/python-zaqarclient_git.bb           | 2 +-
94  87 files changed, 87 insertions(+), 87 deletions(-)
95
96 diff --git a/meta-openstack/recipes-devtools/python/python-barbican_git.bb b/meta-openstack/recipes-devtools/python/python-barbican_git.bb
97 index 579413c..ebb93b1 100644
98 --- a/meta-openstack/recipes-devtools/python/python-barbican_git.bb
99 +++ b/meta-openstack/recipes-devtools/python/python-barbican_git.bb
100 @@ -93,7 +93,7 @@ pkg_postinst_${SRCNAME}-setup () {
101  
102  DEPENDS += " \
103          python-pip \
104 -        python-pbr \
105 +        python-pbr-native\
106          "
107  
108  RDEPENDS_${SRCNAME} = "${PN} \
109 diff --git a/meta-openstack/recipes-devtools/python/python-barbicanclient_git.bb b/meta-openstack/recipes-devtools/python/python-barbicanclient_git.bb
110 index 2d57158..06a75c2 100644
111 --- a/meta-openstack/recipes-devtools/python/python-barbicanclient_git.bb
112 +++ b/meta-openstack/recipes-devtools/python/python-barbicanclient_git.bb
113 @@ -16,7 +16,7 @@ inherit setuptools
114  
115  DEPENDS += " \
116          python-pip \
117 -        python-pbr \
118 +        python-pbr-native\
119          "
120  
121  # Satisfy setup.py 'setup_requires'
122 diff --git a/meta-openstack/recipes-devtools/python/python-castellan_git.bb b/meta-openstack/recipes-devtools/python/python-castellan_git.bb
123 index 9401ad9..909ed91 100644
124 --- a/meta-openstack/recipes-devtools/python/python-castellan_git.bb
125 +++ b/meta-openstack/recipes-devtools/python/python-castellan_git.bb
126 @@ -18,7 +18,7 @@ inherit setuptools
127  
128  DEPENDS += " \
129          python-pip \
130 -        python-pbr \
131 +        python-pbr-native\
132          "
133  
134  RDEPENDS_${PN} += " \
135 diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
136 index 4b01022..911b9cd 100644
137 --- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
138 +++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
139 @@ -175,7 +175,7 @@ FILES_${SRCNAME}-controller = "${bindir}/* \
140  
141  DEPENDS += " \
142          python-pip \
143 -        python-pbr \
144 +        python-pbr-native\
145          "
146  
147  RDEPENDS_${PN} += " \
148 diff --git a/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb
149 index 1a13198..678867f 100644
150 --- a/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb
151 +++ b/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb
152 @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
153  
154  DEPENDS += " \
155          python-pip \
156 -        python-pbr \
157 +        python-pbr-native\
158          "
159  
160  # Satisfy setup.py 'setup_requires'
161 diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
162 index 5274698..78d4533 100644
163 --- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb
164 +++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
165 @@ -196,7 +196,7 @@ FILES_${SRCNAME} = "${bindir}/* \
166  
167  DEPENDS += " \
168          python-pip \
169 -        python-pbr \
170 +        python-pbr-native\
171          "
172  
173  RDEPENDS_${PN} += " \
174 diff --git a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
175 index e425237..a932abb 100644
176 --- a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
177 +++ b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
178 @@ -20,7 +20,7 @@ inherit setuptools monitor
179  
180  DEPENDS += " \
181          python-pip \
182 -        python-pbr \
183 +        python-pbr-native\
184          "
185  
186  # Satisfy setup.py 'setup_requires'
187 diff --git a/meta-openstack/recipes-devtools/python/python-cliff_2.14.1.bb b/meta-openstack/recipes-devtools/python/python-cliff_2.14.1.bb
188 index 70ac4e6..1103eca 100644
189 --- a/meta-openstack/recipes-devtools/python/python-cliff_2.14.1.bb
190 +++ b/meta-openstack/recipes-devtools/python/python-cliff_2.14.1.bb
191 @@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "b47387a344898ccb28ca7f386f017ade9eb66dc1713e5c642a0bc09ec6
192  inherit setuptools pypi
193  
194  DEPENDS += "\
195 -    python-pbr \
196 +    python-pbr-native\
197      "
198  
199  # Satisfy setup.py 'setup_requires'
200 diff --git a/meta-openstack/recipes-devtools/python/python-cursive_git.bb b/meta-openstack/recipes-devtools/python/python-cursive_git.bb
201 index 1a677f1..124821b 100644
202 --- a/meta-openstack/recipes-devtools/python/python-cursive_git.bb
203 +++ b/meta-openstack/recipes-devtools/python/python-cursive_git.bb
204 @@ -15,7 +15,7 @@ S = "${WORKDIR}/git"
205  inherit setuptools
206  
207  DEPENDS += " \
208 -        python-pbr \
209 +        python-pbr-native\
210          "
211  
212  RDEPENDS_${PN} += " \
213 diff --git a/meta-openstack/recipes-devtools/python/python-debtcollector_1.17.1.bb b/meta-openstack/recipes-devtools/python/python-debtcollector_1.17.1.bb
214 index 52b1319..231a5a6 100644
215 --- a/meta-openstack/recipes-devtools/python/python-debtcollector_1.17.1.bb
216 +++ b/meta-openstack/recipes-devtools/python/python-debtcollector_1.17.1.bb
217 @@ -11,7 +11,7 @@ inherit setuptools pypi
218  
219  DEPENDS += " \
220          python-pip \
221 -        python-pbr \
222 +        python-pbr-native\
223          "
224  
225  # Satisfy setup.py 'setup_requires'
226 diff --git a/meta-openstack/recipes-devtools/python/python-designateclient_git.bb b/meta-openstack/recipes-devtools/python/python-designateclient_git.bb
227 index a6f7cbf..b4aa968 100644
228 --- a/meta-openstack/recipes-devtools/python/python-designateclient_git.bb
229 +++ b/meta-openstack/recipes-devtools/python/python-designateclient_git.bb
230 @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
231  
232  DEPENDS += " \
233          python-pip \
234 -        python-pbr \
235 +        python-pbr-native\
236          "
237  
238  # Satisfy setup.py 'setup_requires'
239 diff --git a/meta-openstack/recipes-devtools/python/python-django-openstack-auth_git.bb b/meta-openstack/recipes-devtools/python/python-django-openstack-auth_git.bb
240 index 0df4efb..406a92d 100644
241 --- a/meta-openstack/recipes-devtools/python/python-django-openstack-auth_git.bb
242 +++ b/meta-openstack/recipes-devtools/python/python-django-openstack-auth_git.bb
243 @@ -18,7 +18,7 @@ inherit setuptools
244  
245  DEPENDS += " \
246          python-pip \
247 -        python-pbr \
248 +        python-pbr-native\
249          "
250  
251  RDEPENDS_${PN} += " \
252 diff --git a/meta-openstack/recipes-devtools/python/python-ecdsa_0.13.bb b/meta-openstack/recipes-devtools/python/python-ecdsa_0.13.bb
253 index 8fe492c..e3e2577 100644
254 --- a/meta-openstack/recipes-devtools/python/python-ecdsa_0.13.bb
255 +++ b/meta-openstack/recipes-devtools/python/python-ecdsa_0.13.bb
256 @@ -11,7 +11,7 @@ inherit setuptools pypi
257  
258  DEPENDS += " \
259          python-pip \
260 -        python-pbr \
261 +        python-pbr-native\
262          "
263  
264  # RDEPENDS_default:
265 diff --git a/meta-openstack/recipes-devtools/python/python-fasteners_git.bb b/meta-openstack/recipes-devtools/python/python-fasteners_git.bb
266 index 5f496bc..44092ff 100644
267 --- a/meta-openstack/recipes-devtools/python/python-fasteners_git.bb
268 +++ b/meta-openstack/recipes-devtools/python/python-fasteners_git.bb
269 @@ -17,7 +17,7 @@ inherit setuptools
270  
271  DEPENDS += " \
272          python-pip \
273 -        python-pbr \
274 +        python-pbr-native\
275          "
276  
277  # RDEPENDS_default:
278 diff --git a/meta-openstack/recipes-devtools/python/python-fixtures_3.0.0.bb b/meta-openstack/recipes-devtools/python/python-fixtures_3.0.0.bb
279 index dc03a5b..2f0b540 100644
280 --- a/meta-openstack/recipes-devtools/python/python-fixtures_3.0.0.bb
281 +++ b/meta-openstack/recipes-devtools/python/python-fixtures_3.0.0.bb
282 @@ -15,7 +15,7 @@ DISTUTILS_INSTALL_ARGS = "--root=${D} \
283      --install-data=${datadir}"
284  
285  DEPENDS += " \
286 -       python-pbr \
287 +       python-pbr-native\
288         "
289  
290  # Satisfy setup.py 'setup_requires'
291 diff --git a/meta-openstack/recipes-devtools/python/python-functools32_git.bb b/meta-openstack/recipes-devtools/python/python-functools32_git.bb
292 index f167e7d..9fb7205 100644
293 --- a/meta-openstack/recipes-devtools/python/python-functools32_git.bb
294 +++ b/meta-openstack/recipes-devtools/python/python-functools32_git.bb
295 @@ -21,7 +21,7 @@ DISTUTILS_INSTALL_ARGS = "--root=${D} \
296      --install-data=${datadir}"
297  
298  DEPENDS += " \
299 -       python-pbr \
300 +       python-pbr-native\
301         "
302  
303  RDEPENDS_${PN} += "python-testtools \
304 diff --git a/meta-openstack/recipes-devtools/python/python-glance-store_git.bb b/meta-openstack/recipes-devtools/python/python-glance-store_git.bb
305 index f6cfaa7..405d49d 100644
306 --- a/meta-openstack/recipes-devtools/python/python-glance-store_git.bb
307 +++ b/meta-openstack/recipes-devtools/python/python-glance-store_git.bb
308 @@ -16,7 +16,7 @@ inherit setuptools
309  
310  DEPENDS += " \
311          python-pip \
312 -        python-pbr \
313 +        python-pbr-native\
314          "
315  
316  RDEPENDS_${PN} += " \
317 diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb
318 index 6a6cded..f6b2353 100644
319 --- a/meta-openstack/recipes-devtools/python/python-glance_git.bb
320 +++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb
321 @@ -166,7 +166,7 @@ FILES_${SRCNAME}-registry = "\
322  
323  DEPENDS += " \
324          python-pip \
325 -        python-pbr \
326 +        python-pbr-native\
327          "
328  
329  RDEPENDS_${PN} += " \
330 diff --git a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
331 index 00ea2ab..6b2fbb4 100644
332 --- a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
333 +++ b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
334 @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
335  DEPENDS += " \
336          gmp \
337          python-pip \
338 -        python-pbr \
339 +        python-pbr-native\
340          "
341  
342  SRCREV = "13b25ff1fed908cfe7b4e719a97efd7121e3be96"
343 diff --git a/meta-openstack/recipes-devtools/python/python-glancestore_git.bb b/meta-openstack/recipes-devtools/python/python-glancestore_git.bb
344 index 0abf521..f45abed 100644
345 --- a/meta-openstack/recipes-devtools/python/python-glancestore_git.bb
346 +++ b/meta-openstack/recipes-devtools/python/python-glancestore_git.bb
347 @@ -18,7 +18,7 @@ inherit setuptools
348  DEPENDS += " \
349          gmp \
350          python-pip \
351 -        python-pbr \
352 +        python-pbr-native\
353          "
354  
355  RDEPENDS_${PN} = " \
356 diff --git a/meta-openstack/recipes-devtools/python/python-heat-cfntools_1.2.8.bb b/meta-openstack/recipes-devtools/python/python-heat-cfntools_1.2.8.bb
357 index ca6a48d..aebfa1d 100644
358 --- a/meta-openstack/recipes-devtools/python/python-heat-cfntools_1.2.8.bb
359 +++ b/meta-openstack/recipes-devtools/python/python-heat-cfntools_1.2.8.bb
360 @@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "de7d93338d3afb71cc4c53d713740316ead0af3a9c869b1231617347e9
361  inherit setuptools pypi
362  
363  DEPENDS += "\
364 -    python-pbr \
365 +    python-pbr-native\
366      "
367  
368  RDPENDS_${PN} += "\
369 diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb
370 index 2cf7ce4..8f538a5 100644
371 --- a/meta-openstack/recipes-devtools/python/python-heat_git.bb
372 +++ b/meta-openstack/recipes-devtools/python/python-heat_git.bb
373 @@ -157,7 +157,7 @@ FILES_${SRCNAME}-engine = "${bindir}/heat-engine \
374  
375  DEPENDS += " \
376          python-pip \
377 -        python-pbr \
378 +        python-pbr-native\
379          "
380  
381  # Satisfy setup.py 'setup_requires'
382 diff --git a/meta-openstack/recipes-devtools/python/python-heatclient_git.bb b/meta-openstack/recipes-devtools/python/python-heatclient_git.bb
383 index 9440f95..7d97b44 100644
384 --- a/meta-openstack/recipes-devtools/python/python-heatclient_git.bb
385 +++ b/meta-openstack/recipes-devtools/python/python-heatclient_git.bb
386 @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
387  
388  DEPENDS += " \
389          python-pip \
390 -        python-pbr \
391 +        python-pbr-native\
392          "
393  
394  # Satisfy setup.py 'setup_requires'
395 diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
396 index 5e12e87..fa831cb 100644
397 --- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb
398 +++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
399 @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
400  
401  DEPENDS += " \
402          python-pip \
403 -        python-pbr \
404 +        python-pbr-native\
405          "
406  
407  RDEPENDS_${PN} += " \
408 diff --git a/meta-openstack/recipes-devtools/python/python-ipaddr_2.1.11.bb b/meta-openstack/recipes-devtools/python/python-ipaddr_2.1.11.bb
409 index 501e895..02cfd76 100644
410 --- a/meta-openstack/recipes-devtools/python/python-ipaddr_2.1.11.bb
411 +++ b/meta-openstack/recipes-devtools/python/python-ipaddr_2.1.11.bb
412 @@ -11,7 +11,7 @@ inherit distutils pypi
413  
414  DEPENDS += " \
415          python-pip \
416 -        python-pbr \
417 +        python-pbr-native\
418          "
419  
420  RDEPENDS_${PN} += " \
421 diff --git a/meta-openstack/recipes-devtools/python/python-jsonpath-rw-ext_git.bb b/meta-openstack/recipes-devtools/python/python-jsonpath-rw-ext_git.bb
422 index 53cc1c4..c059942 100644
423 --- a/meta-openstack/recipes-devtools/python/python-jsonpath-rw-ext_git.bb
424 +++ b/meta-openstack/recipes-devtools/python/python-jsonpath-rw-ext_git.bb
425 @@ -16,7 +16,7 @@ S = "${WORKDIR}/git"
426  inherit setuptools
427  
428  DEPENDS += " \
429 -       python-pbr \
430 +       python-pbr-native\
431         "
432  
433  RDEPENDS_${PN} += " \
434 diff --git a/meta-openstack/recipes-devtools/python/python-kafka_git.bb b/meta-openstack/recipes-devtools/python/python-kafka_git.bb
435 index 7fbb826..737c95c 100644
436 --- a/meta-openstack/recipes-devtools/python/python-kafka_git.bb
437 +++ b/meta-openstack/recipes-devtools/python/python-kafka_git.bb
438 @@ -16,7 +16,7 @@ S = "${WORKDIR}/git"
439  inherit setuptools
440  
441  DEPENDS += " \
442 -       python-pbr \
443 +       python-pbr-native\
444         "
445  
446  RDEPENDS_${PN} += " \
447 diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
448 index b8b4fb0..423134c 100644
449 --- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb
450 +++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
451 @@ -224,7 +224,7 @@ FILES_${SRCNAME} = "${bindir}/* \
452  
453  DEPENDS += " \
454          python-pip \
455 -        python-pbr \
456 +        python-pbr-native\
457          "
458  
459  # Satisfy setup.py 'setup_requires'
460 diff --git a/meta-openstack/recipes-devtools/python/python-keystoneauth1_3.2.0.bb b/meta-openstack/recipes-devtools/python/python-keystoneauth1_3.2.0.bb
461 index 6466056..469a31e 100644
462 --- a/meta-openstack/recipes-devtools/python/python-keystoneauth1_3.2.0.bb
463 +++ b/meta-openstack/recipes-devtools/python/python-keystoneauth1_3.2.0.bb
464 @@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "768036ee66372df2ad56716b8be4965cef9a59a01647992919516defb2
465  inherit setuptools pypi
466  
467  DEPENDS += " \
468 -        python-pbr \
469 +        python-pbr-native\
470          "
471  
472  # Satisfy setup.py 'setup_requires'
473 diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
474 index e82c5f6..ecff38a 100644
475 --- a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
476 +++ b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
477 @@ -21,7 +21,7 @@ FILES_${PN}-doc += "${datadir}/keystoneclient"
478  
479  DEPENDS += " \
480          python-pip \
481 -        python-pbr \
482 +        python-pbr-native\
483          "
484  
485  # Satisfy setup.py 'setup_requires'
486 diff --git a/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb b/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb
487 index 557a557..526b48f 100644
488 --- a/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb
489 +++ b/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb
490 @@ -18,7 +18,7 @@ inherit setuptools
491  
492  DEPENDS += " \
493          python-pip \
494 -        python-pbr \
495 +        python-pbr-native\
496          "
497  
498  # Satisfy setup.py 'setup_requires'
499 diff --git a/meta-openstack/recipes-devtools/python/python-lockfile_0.12.2.bb b/meta-openstack/recipes-devtools/python/python-lockfile_0.12.2.bb
500 index 6191577..f954b65 100644
501 --- a/meta-openstack/recipes-devtools/python/python-lockfile_0.12.2.bb
502 +++ b/meta-openstack/recipes-devtools/python/python-lockfile_0.12.2.bb
503 @@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361
504  inherit distutils pypi
505  
506  DEPENDS += "\
507 -    python-pbr \
508 +    python-pbr-native\
509      "
510  
511  # Satisfy setup.py 'setup_requires'
512 diff --git a/meta-openstack/recipes-devtools/python/python-magnumclient_git.bb b/meta-openstack/recipes-devtools/python/python-magnumclient_git.bb
513 index 1bed1ed..3d0e779 100644
514 --- a/meta-openstack/recipes-devtools/python/python-magnumclient_git.bb
515 +++ b/meta-openstack/recipes-devtools/python/python-magnumclient_git.bb
516 @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"
517  
518  DEPENDS += " \
519          python-pip \
520 -        python-pbr \
521 +        python-pbr-native\
522          "
523  
524  # Satisfy setup.py 'setup_requires'
525 diff --git a/meta-openstack/recipes-devtools/python/python-manilaclient_git.bb b/meta-openstack/recipes-devtools/python/python-manilaclient_git.bb
526 index d547717..ee75ab3 100644
527 --- a/meta-openstack/recipes-devtools/python/python-manilaclient_git.bb
528 +++ b/meta-openstack/recipes-devtools/python/python-manilaclient_git.bb
529 @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9edbbf5857ab51214ef0e8b79069bb07"
530  
531  DEPENDS += " \
532          python-pip \
533 -        python-pbr \
534 +        python-pbr-native\
535          "
536  
537  # Satisfy setup.py 'setup_requires'
538 diff --git a/meta-openstack/recipes-devtools/python/python-mistralclient_git.bb b/meta-openstack/recipes-devtools/python/python-mistralclient_git.bb
539 index 1c6a9bd..855ebd3 100644
540 --- a/meta-openstack/recipes-devtools/python/python-mistralclient_git.bb
541 +++ b/meta-openstack/recipes-devtools/python/python-mistralclient_git.bb
542 @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
543  
544  DEPENDS += " \
545          python-pip \
546 -        python-pbr \
547 +        python-pbr-native\
548          "
549  
550  # Satisfy setup.py 'setup_requires'
551 diff --git a/meta-openstack/recipes-devtools/python/python-monotonic_git.bb b/meta-openstack/recipes-devtools/python/python-monotonic_git.bb
552 index 2552409..bffc6af 100644
553 --- a/meta-openstack/recipes-devtools/python/python-monotonic_git.bb
554 +++ b/meta-openstack/recipes-devtools/python/python-monotonic_git.bb
555 @@ -15,7 +15,7 @@ S = "${WORKDIR}/git"
556  inherit distutils
557  
558  DEPENDS += " \
559 -        python-pbr \
560 +        python-pbr-native\
561          "
562  
563  RDEPENDS_${PN} += " \
564 diff --git a/meta-openstack/recipes-devtools/python/python-mox3_0.26.0.bb b/meta-openstack/recipes-devtools/python/python-mox3_0.26.0.bb
565 index c420bc2..9da45b7 100644
566 --- a/meta-openstack/recipes-devtools/python/python-mox3_0.26.0.bb
567 +++ b/meta-openstack/recipes-devtools/python/python-mox3_0.26.0.bb
568 @@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "b13c0b8459d6fb0688f9a4e70feeec43fa2cca05b727fc01156789596e
569  inherit setuptools pypi
570  
571  DEPENDS += "\
572 -    python-pbr \
573 +    python-pbr-native\
574      "
575  
576  # Satisfy setup.py 'setup_requires'
577 diff --git a/meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb b/meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb
578 index 1ac7dca..1e7447e 100644
579 --- a/meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb
580 +++ b/meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb
581 @@ -15,7 +15,7 @@ S = "${WORKDIR}/git"
582  inherit setuptools
583  
584  DEPENDS += " \
585 -        python-pbr \
586 +        python-pbr-native\
587          "
588  
589  RDEPENDS_${PN} += " \
590 diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
591 index a054551..630bbce 100644
592 --- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb
593 +++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
594 @@ -330,7 +330,7 @@ FILES_${SRCNAME}-setup = " \
595  
596  DEPENDS += " \
597          python-pip \
598 -        python-pbr \
599 +        python-pbr-native\
600          "
601  
602  RDEPENDS_${PN} += " \
603 diff --git a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
604 index 204f19b..8cbee0c 100644
605 --- a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
606 +++ b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
607 @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
608  
609  DEPENDS += " \
610          python-pip \
611 -        python-pbr \
612 +        python-pbr-native\
613          "
614  
615  # Satisfy setup.py 'setup_requires'
616 diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
617 index 3e646df..9946582 100644
618 --- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
619 +++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
620 @@ -262,7 +262,7 @@ FILES_${SRCNAME}-controller = "${bindir}/* \
621  
622  DEPENDS += " \
623          python-pip \
624 -        python-pbr \
625 +        python-pbr-native\
626          "
627  
628  RDEPENDS_${PN} += " \
629 diff --git a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
630 index 44f73fa..363d0a3 100644
631 --- a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
632 +++ b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
633 @@ -17,7 +17,7 @@ inherit setuptools monitor rmargparse
634  
635  DEPENDS += " \
636          python-pip \
637 -        python-pbr \
638 +        python-pbr-native\
639          "
640  
641  # Satisfy setup.py 'setup_requires'
642 diff --git a/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb b/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb
643 index ce33f0c..a7e2b8c 100644
644 --- a/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb
645 +++ b/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb
646 @@ -15,7 +15,7 @@ S = "${WORKDIR}/git"
647  inherit setuptools
648  
649  DEPENDS += "\
650 -        python-pbr \
651 +        python-pbr-native\
652          "
653  
654  RDEPENDS_${PN} += " \
655 diff --git a/meta-openstack/recipes-devtools/python/python-openstacksdk_git.bb b/meta-openstack/recipes-devtools/python/python-openstacksdk_git.bb
656 index 12472ec..ee8942d 100644
657 --- a/meta-openstack/recipes-devtools/python/python-openstacksdk_git.bb
658 +++ b/meta-openstack/recipes-devtools/python/python-openstacksdk_git.bb
659 @@ -15,7 +15,7 @@ S = "${WORKDIR}/git"
660  inherit setuptools
661  
662  DEPENDS += "\
663 -        python-pbr \
664 +        python-pbr-native\
665          "
666  
667  RDEPENDS_${PN} += " \
668 diff --git a/meta-openstack/recipes-devtools/python/python-os-brick_git.bb b/meta-openstack/recipes-devtools/python/python-os-brick_git.bb
669 index f266f70..65d3ddf 100644
670 --- a/meta-openstack/recipes-devtools/python/python-os-brick_git.bb
671 +++ b/meta-openstack/recipes-devtools/python/python-os-brick_git.bb
672 @@ -17,7 +17,7 @@ inherit setuptools
673  FILES_${PN} += "${datadir}/etc/*"
674  
675  DEPENDS += " \
676 -        python-pbr \
677 +        python-pbr-native\
678          "
679  
680  RDEPENDS_${PN} += " \
681 diff --git a/meta-openstack/recipes-devtools/python/python-os-client-config_git.bb b/meta-openstack/recipes-devtools/python/python-os-client-config_git.bb
682 index a48f2c4..c49c710 100644
683 --- a/meta-openstack/recipes-devtools/python/python-os-client-config_git.bb
684 +++ b/meta-openstack/recipes-devtools/python/python-os-client-config_git.bb
685 @@ -15,7 +15,7 @@ S = "${WORKDIR}/git"
686  inherit setuptools
687  
688  DEPENDS += " \
689 -        python-pbr \
690 +        python-pbr-native\
691          "
692  # Satisfy setup.py 'setup_requires'
693  DEPENDS += " \
694 diff --git a/meta-openstack/recipes-devtools/python/python-os-traits_git.bb b/meta-openstack/recipes-devtools/python/python-os-traits_git.bb
695 index 8d4079b..d983252 100644
696 --- a/meta-openstack/recipes-devtools/python/python-os-traits_git.bb
697 +++ b/meta-openstack/recipes-devtools/python/python-os-traits_git.bb
698 @@ -15,7 +15,7 @@ S = "${WORKDIR}/git"
699  inherit setuptools
700  
701  DEPENDS += " \
702 -        python-pbr \
703 +        python-pbr-native\
704          "
705  
706  RDEPENDS_${PN} += " \
707 diff --git a/meta-openstack/recipes-devtools/python/python-os-vif_git.bb b/meta-openstack/recipes-devtools/python/python-os-vif_git.bb
708 index 52fa05e..656f5ab 100644
709 --- a/meta-openstack/recipes-devtools/python/python-os-vif_git.bb
710 +++ b/meta-openstack/recipes-devtools/python/python-os-vif_git.bb
711 @@ -15,7 +15,7 @@ S = "${WORKDIR}/git"
712  inherit setuptools
713  
714  DEPENDS += " \
715 -        python-pbr \
716 +        python-pbr-native\
717          "
718  
719  RDEPENDS_${PN} += " \
720 diff --git a/meta-openstack/recipes-devtools/python/python-os-win_git.bb b/meta-openstack/recipes-devtools/python/python-os-win_git.bb
721 index a742506..882c1b7 100644
722 --- a/meta-openstack/recipes-devtools/python/python-os-win_git.bb
723 +++ b/meta-openstack/recipes-devtools/python/python-os-win_git.bb
724 @@ -15,7 +15,7 @@ S = "${WORKDIR}/git"
725  inherit setuptools
726  
727  DEPENDS += " \
728 -        python-pbr \
729 +        python-pbr-native\
730          "
731  
732  RDEPENDS_${PN} += " \
733 diff --git a/meta-openstack/recipes-devtools/python/python-os-xenapi_git.bb b/meta-openstack/recipes-devtools/python/python-os-xenapi_git.bb
734 index f3d54f6..ea46a60 100644
735 --- a/meta-openstack/recipes-devtools/python/python-os-xenapi_git.bb
736 +++ b/meta-openstack/recipes-devtools/python/python-os-xenapi_git.bb
737 @@ -16,7 +16,7 @@ inherit setuptools
738  # DEPENDS_default: python-pip
739  
740  DEPENDS += " \
741 -        python-pbr \
742 +        python-pbr-native\
743          "
744  
745  RDEPENDS_${PN} += " \
746 diff --git a/meta-openstack/recipes-devtools/python/python-oslo.cache_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.cache_git.bb
747 index e71a815..9d07f74 100644
748 --- a/meta-openstack/recipes-devtools/python/python-oslo.cache_git.bb
749 +++ b/meta-openstack/recipes-devtools/python/python-oslo.cache_git.bb
750 @@ -18,7 +18,7 @@ inherit setuptools
751  
752  DEPENDS += " \
753          python-pip \
754 -        python-pbr \
755 +        python-pbr-native\
756          "
757  
758  # Satisfy setup.py 'setup_requires'
759 diff --git a/meta-openstack/recipes-devtools/python/python-oslo.concurrency_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.concurrency_git.bb
760 index fe095d0..f91ff98 100644
761 --- a/meta-openstack/recipes-devtools/python/python-oslo.concurrency_git.bb
762 +++ b/meta-openstack/recipes-devtools/python/python-oslo.concurrency_git.bb
763 @@ -18,7 +18,7 @@ inherit setuptools
764  
765  DEPENDS += " \
766          python-pip \
767 -        python-pbr \
768 +        python-pbr-native\
769          "
770  
771  # Satisfy setup.py 'setup_requires'
772 diff --git a/meta-openstack/recipes-devtools/python/python-oslo.config_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.config_git.bb
773 index eed00c5..f0156b1 100644
774 --- a/meta-openstack/recipes-devtools/python/python-oslo.config_git.bb
775 +++ b/meta-openstack/recipes-devtools/python/python-oslo.config_git.bb
776 @@ -15,7 +15,7 @@ S = "${WORKDIR}/git"
777  inherit setuptools rmargparse
778  
779  DEPENDS += " \
780 -        python-pbr \
781 +        python-pbr-native\
782          python-pip \
783          "
784  
785 diff --git a/meta-openstack/recipes-devtools/python/python-oslo.context_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.context_git.bb
786 index bf1ae7a..05674c9 100644
787 --- a/meta-openstack/recipes-devtools/python/python-oslo.context_git.bb
788 +++ b/meta-openstack/recipes-devtools/python/python-oslo.context_git.bb
789 @@ -15,7 +15,7 @@ inherit setuptools
790  
791  DEPENDS += " \
792          python-pip \
793 -        python-pbr \
794 +        python-pbr-native\
795          "
796  
797  # Satisfy setup.py 'setup_requires'
798 diff --git a/meta-openstack/recipes-devtools/python/python-oslo.db_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.db_git.bb
799 index d693570..2e1ec5e 100644
800 --- a/meta-openstack/recipes-devtools/python/python-oslo.db_git.bb
801 +++ b/meta-openstack/recipes-devtools/python/python-oslo.db_git.bb
802 @@ -16,7 +16,7 @@ inherit setuptools
803  
804  DEPENDS += " \
805          python-pip \
806 -        python-pbr \
807 +        python-pbr-native\
808          "
809  
810  # Satisfy setup.py 'setup_requires'
811 diff --git a/meta-openstack/recipes-devtools/python/python-oslo.i18n_3.20.0.bb b/meta-openstack/recipes-devtools/python/python-oslo.i18n_3.20.0.bb
812 index 76a8b53..100c44f 100644
813 --- a/meta-openstack/recipes-devtools/python/python-oslo.i18n_3.20.0.bb
814 +++ b/meta-openstack/recipes-devtools/python/python-oslo.i18n_3.20.0.bb
815 @@ -17,7 +17,7 @@ inherit setuptools
816  
817  DEPENDS += " \
818          python-pip \
819 -        python-pbr \
820 +        python-pbr-native\
821          "
822  
823  # Satisfy setup.py 'setup_requires'
824 diff --git a/meta-openstack/recipes-devtools/python/python-oslo.i18n_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.i18n_git.bb
825 index 9f7ddc5..599d30c 100644
826 --- a/meta-openstack/recipes-devtools/python/python-oslo.i18n_git.bb
827 +++ b/meta-openstack/recipes-devtools/python/python-oslo.i18n_git.bb
828 @@ -18,7 +18,7 @@ inherit setuptools
829  
830  DEPENDS += " \
831          python-pip \
832 -        python-pbr \
833 +        python-pbr-native\
834          "
835  
836  # Satisfy setup.py 'setup_requires'
837 diff --git a/meta-openstack/recipes-devtools/python/python-oslo.log_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.log_git.bb
838 index d6ca0ee..7b0c946 100644
839 --- a/meta-openstack/recipes-devtools/python/python-oslo.log_git.bb
840 +++ b/meta-openstack/recipes-devtools/python/python-oslo.log_git.bb
841 @@ -16,7 +16,7 @@ inherit setuptools
842  DEPENDS += " \
843          python-pip \
844          python-babel \
845 -        python-pbr \
846 +        python-pbr-native\
847          "
848  
849  # Satisfy setup.py 'setup_requires'
850 diff --git a/meta-openstack/recipes-devtools/python/python-oslo.messaging_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.messaging_git.bb
851 index 7fe66f1..2f7ba98 100644
852 --- a/meta-openstack/recipes-devtools/python/python-oslo.messaging_git.bb
853 +++ b/meta-openstack/recipes-devtools/python/python-oslo.messaging_git.bb
854 @@ -17,7 +17,7 @@ inherit setuptools
855  
856  DEPENDS += " \
857          python-pip \
858 -        python-pbr \
859 +        python-pbr-native\
860          "
861  
862  # Satisfy setup.py 'setup_requires'
863 diff --git a/meta-openstack/recipes-devtools/python/python-oslo.middleware_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.middleware_git.bb
864 index 3a1d4d9..2b255c9 100644
865 --- a/meta-openstack/recipes-devtools/python/python-oslo.middleware_git.bb
866 +++ b/meta-openstack/recipes-devtools/python/python-oslo.middleware_git.bb
867 @@ -18,7 +18,7 @@ inherit setuptools
868  
869  DEPENDS += " \
870          python-pip \
871 -        python-pbr \
872 +        python-pbr-native\
873          "
874  # Satisfy setup.py 'setup_requires'
875  DEPENDS += " \
876 diff --git a/meta-openstack/recipes-devtools/python/python-oslo.policy_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.policy_git.bb
877 index 0e7a6ad..e2afd98 100644
878 --- a/meta-openstack/recipes-devtools/python/python-oslo.policy_git.bb
879 +++ b/meta-openstack/recipes-devtools/python/python-oslo.policy_git.bb
880 @@ -17,7 +17,7 @@ inherit setuptools
881  
882  DEPENDS += " \
883          python-pip \
884 -        python-pbr \
885 +        python-pbr-native\
886  "
887  
888  # Satisfy setup.py 'setup_requires'
889 diff --git a/meta-openstack/recipes-devtools/python/python-oslo.privsep_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.privsep_git.bb
890 index 83504b6..73e4d44 100644
891 --- a/meta-openstack/recipes-devtools/python/python-oslo.privsep_git.bb
892 +++ b/meta-openstack/recipes-devtools/python/python-oslo.privsep_git.bb
893 @@ -14,7 +14,7 @@ S = "${WORKDIR}/git"
894  inherit setuptools
895  
896  DEPENDS += " \
897 -        python-pbr \
898 +        python-pbr-native\
899          "
900  
901  # RDEPENDS_default:
902 diff --git a/meta-openstack/recipes-devtools/python/python-oslo.reports_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.reports_git.bb
903 index 2db5aae..f1a5767 100644
904 --- a/meta-openstack/recipes-devtools/python/python-oslo.reports_git.bb
905 +++ b/meta-openstack/recipes-devtools/python/python-oslo.reports_git.bb
906 @@ -16,7 +16,7 @@ inherit setuptools
907  
908  DEPENDS += " \
909          python-pip \
910 -        python-pbr \
911 +        python-pbr-native\
912          "
913  
914  # Satisfy setup.py 'setup_requires'
915 diff --git a/meta-openstack/recipes-devtools/python/python-oslo.rootwrap_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.rootwrap_git.bb
916 index 2dbbfe8..8ebdf8d 100644
917 --- a/meta-openstack/recipes-devtools/python/python-oslo.rootwrap_git.bb
918 +++ b/meta-openstack/recipes-devtools/python/python-oslo.rootwrap_git.bb
919 @@ -18,7 +18,7 @@ inherit setuptools
920  
921  DEPENDS += " \
922          python-pip \
923 -        python-pbr \
924 +        python-pbr-native\
925          "
926  
927  # RDEPENDS_default: 
928 diff --git a/meta-openstack/recipes-devtools/python/python-oslo.serialization_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.serialization_git.bb
929 index b11957d..42f282a 100644
930 --- a/meta-openstack/recipes-devtools/python/python-oslo.serialization_git.bb
931 +++ b/meta-openstack/recipes-devtools/python/python-oslo.serialization_git.bb
932 @@ -17,7 +17,7 @@ inherit setuptools
933  
934  DEPENDS += " \
935          python-pip \
936 -        python-pbr \
937 +        python-pbr-native\
938          "
939  
940  # Satisfy setup.py 'setup_requires'
941 diff --git a/meta-openstack/recipes-devtools/python/python-oslo.service_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.service_git.bb
942 index 7b72ad2..4ad6593 100644
943 --- a/meta-openstack/recipes-devtools/python/python-oslo.service_git.bb
944 +++ b/meta-openstack/recipes-devtools/python/python-oslo.service_git.bb
945 @@ -16,7 +16,7 @@ inherit setuptools
946  
947  DEPENDS += " \
948          python-pip \
949 -        python-pbr \
950 +        python-pbr-native\
951          "
952  
953  # Satisfy setup.py 'setup_requires'
954 diff --git a/meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb
955 index e73bf53..9ce6a7f 100644
956 --- a/meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb
957 +++ b/meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb
958 @@ -17,7 +17,7 @@ inherit setuptools
959  
960  DEPENDS += " \
961          python-pip \
962 -        python-pbr \
963 +        python-pbr-native\
964          "
965  
966  # Satisfy setup.py 'setup_requires'
967 diff --git a/meta-openstack/recipes-devtools/python/python-oslo.versionedobjects_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.versionedobjects_git.bb
968 index 574ac88..7dae91d 100644
969 --- a/meta-openstack/recipes-devtools/python/python-oslo.versionedobjects_git.bb
970 +++ b/meta-openstack/recipes-devtools/python/python-oslo.versionedobjects_git.bb
971 @@ -16,7 +16,7 @@ inherit setuptools
972  
973  DEPENDS += " \
974          python-pip \
975 -        python-pbr \
976 +        python-pbr-native\
977          "
978  
979  # Satisfy setup.py 'setup_requires'
980 diff --git a/meta-openstack/recipes-devtools/python/python-oslo.vmware_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.vmware_git.bb
981 index f6e7b5e..89d9381 100644
982 --- a/meta-openstack/recipes-devtools/python/python-oslo.vmware_git.bb
983 +++ b/meta-openstack/recipes-devtools/python/python-oslo.vmware_git.bb
984 @@ -16,7 +16,7 @@ inherit setuptools
985  
986  DEPENDS += " \
987          python-pip \
988 -        python-pbr \
989 +        python-pbr-native\
990          "
991  
992  RDEPENDS_${PN} += " \
993 diff --git a/meta-openstack/recipes-devtools/python/python-oslotest_git.bb b/meta-openstack/recipes-devtools/python/python-oslotest_git.bb
994 index 20c0b53..3a6c171 100644
995 --- a/meta-openstack/recipes-devtools/python/python-oslotest_git.bb
996 +++ b/meta-openstack/recipes-devtools/python/python-oslotest_git.bb
997 @@ -17,7 +17,7 @@ S = "${WORKDIR}/git"
998  inherit setuptools
999  
1000  DEPENDS += "\
1001 -    python-pbr \
1002 +    python-pbr-native\
1003      "
1004  
1005  RDEPENDS_${PN} = "python-fixtures \
1006 diff --git a/meta-openstack/recipes-devtools/python/python-osprofiler_1.5.0.bb b/meta-openstack/recipes-devtools/python/python-osprofiler_1.5.0.bb
1007 index efb38a0..ffef6be 100644
1008 --- a/meta-openstack/recipes-devtools/python/python-osprofiler_1.5.0.bb
1009 +++ b/meta-openstack/recipes-devtools/python/python-osprofiler_1.5.0.bb
1010 @@ -13,7 +13,7 @@ inherit setuptools pypi
1011  
1012  DEPENDS += " \
1013          python-pip \
1014 -        python-pbr \
1015 +        python-pbr-native\
1016          "
1017  
1018  # Satisfy setup.py 'setup_requires'
1019 diff --git a/meta-openstack/recipes-devtools/python/python-ovsdbapp_git.bb b/meta-openstack/recipes-devtools/python/python-ovsdbapp_git.bb
1020 index cc1f424..f1b1b36 100644
1021 --- a/meta-openstack/recipes-devtools/python/python-ovsdbapp_git.bb
1022 +++ b/meta-openstack/recipes-devtools/python/python-ovsdbapp_git.bb
1023 @@ -17,7 +17,7 @@ inherit setuptools
1024  
1025  DEPENDS += " \
1026          python-pip \
1027 -        python-pbr \
1028 +        python-pbr-native\
1029          "
1030  
1031  # Satisfy setup.py 'setup_requires'
1032 diff --git a/meta-openstack/recipes-devtools/python/python-pycadf_git.bb b/meta-openstack/recipes-devtools/python/python-pycadf_git.bb
1033 index 58cb5bf..fedab3b 100644
1034 --- a/meta-openstack/recipes-devtools/python/python-pycadf_git.bb
1035 +++ b/meta-openstack/recipes-devtools/python/python-pycadf_git.bb
1036 @@ -18,7 +18,7 @@ FILES_${PN} += "${datadir}/etc/${SRCNAME}/*"
1037  
1038  DEPENDS += " \
1039          python-pip \
1040 -        python-pbr \
1041 +        python-pbr-native\
1042          "
1043  # Satisfy setup.py 'setup_requires'
1044  DEPENDS += " \
1045 diff --git a/meta-openstack/recipes-devtools/python/python-rally_git.bb b/meta-openstack/recipes-devtools/python/python-rally_git.bb
1046 index 31d4242..194e549 100644
1047 --- a/meta-openstack/recipes-devtools/python/python-rally_git.bb
1048 +++ b/meta-openstack/recipes-devtools/python/python-rally_git.bb
1049 @@ -97,7 +97,7 @@ FILES_${SRCNAME}-api = "${bindir}/rally-api \
1050  
1051  DEPENDS += " \
1052      python-pip \
1053 -    python-pbr \
1054 +    python-pbr-native\
1055      "
1056  
1057  RDEPENDS_${PN} += " python-babel \
1058 diff --git a/meta-openstack/recipes-devtools/python/python-ryu_git.bb b/meta-openstack/recipes-devtools/python/python-ryu_git.bb
1059 index b5ee113..9a3bad5 100644
1060 --- a/meta-openstack/recipes-devtools/python/python-ryu_git.bb
1061 +++ b/meta-openstack/recipes-devtools/python/python-ryu_git.bb
1062 @@ -18,7 +18,7 @@ FILES_${PN} += "${datadir}/etc/${SRCNAME}/*"
1063  
1064  DEPENDS += " \
1065          python-pip \
1066 -        python-pbr \
1067 +        python-pbr-native\
1068          "
1069  
1070  RDEPENDS_${PN} += " \
1071 diff --git a/meta-openstack/recipes-devtools/python/python-saharaclient_git.bb b/meta-openstack/recipes-devtools/python/python-saharaclient_git.bb
1072 index 170d460..b9522ba 100644
1073 --- a/meta-openstack/recipes-devtools/python/python-saharaclient_git.bb
1074 +++ b/meta-openstack/recipes-devtools/python/python-saharaclient_git.bb
1075 @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
1076  
1077  DEPENDS += " \
1078          python-pip \
1079 -        python-pbr \
1080 +        python-pbr-native\
1081          "
1082  
1083  # Satisfy setup.py 'setup_requires'
1084 diff --git a/meta-openstack/recipes-devtools/python/python-swift_git.bb b/meta-openstack/recipes-devtools/python/python-swift_git.bb
1085 index fc7c258..f52b47e 100644
1086 --- a/meta-openstack/recipes-devtools/python/python-swift_git.bb
1087 +++ b/meta-openstack/recipes-devtools/python/python-swift_git.bb
1088 @@ -150,7 +150,7 @@ FILES_${SRCNAME} = "${bindir}/* \
1089  
1090  DEPENDS += " \
1091          python-pip \
1092 -        python-pbr \
1093 +        python-pbr-native\
1094          "
1095  
1096  RDEPENDS_${PN} += " \
1097 diff --git a/meta-openstack/recipes-devtools/python/python-swiftclient_git.bb b/meta-openstack/recipes-devtools/python/python-swiftclient_git.bb
1098 index 0ee9680..f7f5343 100644
1099 --- a/meta-openstack/recipes-devtools/python/python-swiftclient_git.bb
1100 +++ b/meta-openstack/recipes-devtools/python/python-swiftclient_git.bb
1101 @@ -21,7 +21,7 @@ do_install_append() {
1102  
1103  DEPENDS += " \
1104          python-pip \
1105 -        python-pbr \
1106 +        python-pbr-native\
1107          "
1108  
1109  # Satisfy setup.py 'setup_requires'
1110 diff --git a/meta-openstack/recipes-devtools/python/python-taskflow_git.bb b/meta-openstack/recipes-devtools/python/python-taskflow_git.bb
1111 index 1717617..ce860d0 100644
1112 --- a/meta-openstack/recipes-devtools/python/python-taskflow_git.bb
1113 +++ b/meta-openstack/recipes-devtools/python/python-taskflow_git.bb
1114 @@ -16,7 +16,7 @@ inherit setuptools
1115  
1116  DEPENDS += " \
1117          python-pip \
1118 -        python-pbr \
1119 +        python-pbr-native\
1120          "
1121  
1122  RDEPENDS_${PN} += " \
1123 diff --git a/meta-openstack/recipes-devtools/python/python-testscenarios_0.5.0.bb b/meta-openstack/recipes-devtools/python/python-testscenarios_0.5.0.bb
1124 index 18971d6..ef0acd7 100644
1125 --- a/meta-openstack/recipes-devtools/python/python-testscenarios_0.5.0.bb
1126 +++ b/meta-openstack/recipes-devtools/python/python-testscenarios_0.5.0.bb
1127 @@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "c257cb6b90ea7e6f8fef3158121d430543412c9a87df30b5dde6ec8b9b
1128  inherit setuptools pypi
1129  
1130  DEPENDS += "\
1131 -    python-pbr \
1132 +    python-pbr-native\
1133      "
1134  
1135  # Satisfy setup.py 'setup_requires'
1136 diff --git a/meta-openstack/recipes-devtools/python/python-testtools_2.3.0.bb b/meta-openstack/recipes-devtools/python/python-testtools_2.3.0.bb
1137 index bbf1d01..51d7613 100644
1138 --- a/meta-openstack/recipes-devtools/python/python-testtools_2.3.0.bb
1139 +++ b/meta-openstack/recipes-devtools/python/python-testtools_2.3.0.bb
1140 @@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "5827ec6cf8233e0f29f51025addd713ca010061204fdea77484a293469
1141  
1142  inherit setuptools pypi
1143  DEPENDS += " \
1144 -    python-pbr \
1145 +    python-pbr-native\
1146      "
1147  
1148  # Satisfy setup.py 'setup_requires'
1149 diff --git a/meta-openstack/recipes-devtools/python/python-tooz_1.48.0.bb b/meta-openstack/recipes-devtools/python/python-tooz_1.48.0.bb
1150 index 6260663..5e2b3d7 100644
1151 --- a/meta-openstack/recipes-devtools/python/python-tooz_1.48.0.bb
1152 +++ b/meta-openstack/recipes-devtools/python/python-tooz_1.48.0.bb
1153 @@ -13,7 +13,7 @@ inherit setuptools pypi
1154  
1155  DEPENDS += " \
1156          python-pip \
1157 -        python-pbr \
1158 +        python-pbr-native\
1159          "
1160  
1161  # RDEPENDS_default:
1162 diff --git a/meta-openstack/recipes-devtools/python/python-trove_git.bb b/meta-openstack/recipes-devtools/python/python-trove_git.bb
1163 index e1f8ae0..531cfe5 100755
1164 --- a/meta-openstack/recipes-devtools/python/python-trove_git.bb
1165 +++ b/meta-openstack/recipes-devtools/python/python-trove_git.bb
1166 @@ -234,7 +234,7 @@ FILES_${SRCNAME}-setup = " \
1167  
1168  
1169  DEPENDS += " \
1170 -    python-pbr \
1171 +    python-pbr-native\
1172      python-pip \
1173      "
1174  
1175 diff --git a/meta-openstack/recipes-devtools/python/python-troveclient_git.bb b/meta-openstack/recipes-devtools/python/python-troveclient_git.bb
1176 index 95ec5ae..c715cb4 100644
1177 --- a/meta-openstack/recipes-devtools/python/python-troveclient_git.bb
1178 +++ b/meta-openstack/recipes-devtools/python/python-troveclient_git.bb
1179 @@ -51,7 +51,7 @@ FILES_${SRCNAME}-bin = " \
1180  
1181  DEPENDS += " \
1182          python-pip \
1183 -        python-pbr \
1184 +        python-pbr-native\
1185          "
1186  
1187  RDEPENDS_${PN} += " \
1188 diff --git a/meta-openstack/recipes-devtools/python/python-unicodecsv_git.bb b/meta-openstack/recipes-devtools/python/python-unicodecsv_git.bb
1189 index 76d638a..c5a1cbc 100644
1190 --- a/meta-openstack/recipes-devtools/python/python-unicodecsv_git.bb
1191 +++ b/meta-openstack/recipes-devtools/python/python-unicodecsv_git.bb
1192 @@ -16,7 +16,7 @@ S = "${WORKDIR}/git"
1193  inherit setuptools
1194  
1195  DEPENDS += " \
1196 -       python-pbr \
1197 +       python-pbr-native\
1198         "
1199  
1200  RDEPENDS_${PN} += " \
1201 diff --git a/meta-openstack/recipes-devtools/python/python-wsme_0.9.2.bb b/meta-openstack/recipes-devtools/python/python-wsme_0.9.2.bb
1202 index 15f46d4..5a2628e 100644
1203 --- a/meta-openstack/recipes-devtools/python/python-wsme_0.9.2.bb
1204 +++ b/meta-openstack/recipes-devtools/python/python-wsme_0.9.2.bb
1205 @@ -13,7 +13,7 @@ inherit setuptools pypi
1206  
1207  DEPENDS += " \
1208          python-pip \
1209 -        python-pbr \
1210 +        python-pbr-native\
1211          "
1212  
1213  # Satisfy setup.py 'setup_requires'
1214 diff --git a/meta-openstack/recipes-devtools/python/python-zaqarclient_git.bb b/meta-openstack/recipes-devtools/python/python-zaqarclient_git.bb
1215 index d3d24ea..d519c8c 100644
1216 --- a/meta-openstack/recipes-devtools/python/python-zaqarclient_git.bb
1217 +++ b/meta-openstack/recipes-devtools/python/python-zaqarclient_git.bb
1218 @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
1219  
1220  DEPENDS += " \
1221          python-pip \
1222 -        python-pbr \
1223 +        python-pbr-native\
1224          "
1225  
1226  # Satisfy setup.py 'setup_requires'
1227 -- 
1228 2.23.0
1229