<div dir="ltr">merged<div><br></div><div>Bruce</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jun 11, 2018 at 10:24 AM, Mark Asselstine <span dir="ltr"><<a href="mailto:mark.asselstine@windriver.com" target="_blank">mark.asselstine@windriver.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Bitbake now prints warnings when a patch is successfully applied but<br>
there is fuzz or an offset. The following refreshes patches for<br>
several packages which report warnings when openstack-image-controller<br>
is built.<br>
<br>
Signed-off-by: Mark Asselstine <<a href="mailto:mark.asselstine@windriver.com">mark.asselstine@windriver.com</a><wbr>><br>
---<br>
 ...ican-fix-path-to-find-<wbr>configuration-files.patch | 12 +++++------<br>
 ...ncrease-buffer-size-to-<wbr>support-PKI-tokens.patch | 23 +++++++++++-----------<br>
 .../fix_ceilometer_memory_<wbr>leak.patch               | 18 +++++++++++------<br>
 .../python/python-horizon/fix_<wbr>bindir_path.patch    | 21 ++++++++++++++------<br>
 ...use-full-package-path-to-<wbr>test-directories.patch | 10 ++++------<br>
 ...-path-of-header-files-<wbr>check-in-Yocto-buil.patch | 14 ++++++-------<br>
 .../tgt/files/0001-usr-<wbr>Makefile-WARNING-fix.patch  |  8 +++-----<br>
 7 files changed, 57 insertions(+), 49 deletions(-)<br>
<br>
diff --git a/meta-openstack/recipes-<wbr>devtools/python/python-<wbr>barbican/barbican-fix-path-to-<wbr>find-configuration-files.patch b/meta-openstack/recipes-<wbr>devtools/python/python-<wbr>barbican/barbican-fix-path-to-<wbr>find-configuration-files.patch<br>
index 8fd1010..b7e74cd 100644<br>
--- a/meta-openstack/recipes-<wbr>devtools/python/python-<wbr>barbican/barbican-fix-path-to-<wbr>find-configuration-files.patch<br>
+++ b/meta-openstack/recipes-<wbr>devtools/python/python-<wbr>barbican/barbican-fix-path-to-<wbr>find-configuration-files.patch<br>
@@ -1,4 +1,4 @@<br>
-From 30a57a0b4f2dcaff76821f21f4a545<wbr>ecb9ddf194 Mon Sep 17 00:00:00 2001<br>
+From 3364915002aa2deaf63841e3383756<wbr>48e5dc8f24 Mon Sep 17 00:00:00 2001<br>
 From: Keith Holman <<a href="mailto:Keith.Holman@windriver.com">Keith.Holman@windriver.com</a>><br>
 Date: Fri, 13 Jun 2014 13:46:04 -0400<br>
 Subject: [PATCH] barbican: fix path to find configuration files<br>
@@ -10,15 +10,16 @@ recipe.  This fix updates the location for the configuration files<br>
 with an identifier that is replaced during deployment.<br>
<br>
 Signed-off-by: Keith Holman <<a href="mailto:Keith.Holman@windriver.com">Keith.Holman@windriver.com</a>><br>
+<br>
 ---<br>
  barbican/tests/api/test_<wbr>resources_policy.py | 3 +--<br>
  1 file changed, 1 insertion(+), 2 deletions(-)<br>
<br>
 diff --git a/barbican/tests/api/test_<wbr>resources_policy.py b/barbican/tests/api/test_<wbr>resources_policy.py<br>
-index 7d995c6..28b7599 100644<br>
+index 5c75bc3..f2332f6 100644<br>
 --- a/barbican/tests/api/test_<wbr>resources_policy.py<br>
 +++ b/barbican/tests/api/test_<wbr>resources_policy.py<br>
-@@ -35,8 +35,7 @@ from barbican.openstack.common import policy<br>
+@@ -37,8 +37,7 @@ from barbican.tests import utils<br>
  CONF = cfg.CONF<br>
<br>
  # Point to the policy.json file located in source control.<br>
@@ -26,8 +27,5 @@ index 7d995c6..28b7599 100644<br>
 -                                            '../../../etc', 'barbican'))<br>
 +TEST_VAR_DIR = "%BARBICAN_CONF_DIR%"<br>
<br>
- ENFORCER = policy.Enforcer()<br>
+ ENFORCER = policy.Enforcer(CONF)<br>
<br>
--- <br>
-1.9.3<br>
-<br>
diff --git a/meta-openstack/recipes-<wbr>devtools/python/python-<wbr>barbican/barbican-increase-<wbr>buffer-size-to-support-PKI-<wbr>tokens.patch b/meta-openstack/recipes-<wbr>devtools/python/python-<wbr>barbican/barbican-increase-<wbr>buffer-size-to-support-PKI-<wbr>tokens.patch<br>
index acde89c..c85e473 100644<br>
--- a/meta-openstack/recipes-<wbr>devtools/python/python-<wbr>barbican/barbican-increase-<wbr>buffer-size-to-support-PKI-<wbr>tokens.patch<br>
+++ b/meta-openstack/recipes-<wbr>devtools/python/python-<wbr>barbican/barbican-increase-<wbr>buffer-size-to-support-PKI-<wbr>tokens.patch<br>
@@ -1,4 +1,4 @@<br>
-From 8b78d792ca7f7ba4e105225c3917c0<wbr>a467a2fadb Mon Sep 17 00:00:00 2001<br>
+From 542a384cf1de68dc21ec335ff95188<wbr>89e342d76e Mon Sep 17 00:00:00 2001<br>
 From: Keith Holman <<a href="mailto:Keith.Holman@windriver.com">Keith.Holman@windriver.com</a>><br>
 Date: Thu, 22 May 2014 12:08:13 -0400<br>
 Subject: [PATCH] barbican: increase buffer-size to support PKI tokens<br>
@@ -10,25 +10,26 @@ buffer size uWSGI uses fixes this problem.  This fix allows the<br>
 packet sized to be specified in the build recipe file.<br>
<br>
 Signed-off-by: Keith Holman <<a href="mailto:Keith.Holman@windriver.com">Keith.Holman@windriver.com</a>><br>
+<br>
 ---<br>
  etc/barbican/vassals/barbican-<wbr>admin.ini | 1 +<br>
  etc/barbican/vassals/barbican-<wbr>api.ini   | 1 +<br>
  2 files changed, 2 insertions(+)<br>
<br>
-Index: git/etc/barbican/vassals/<wbr>barbican-admin.ini<br>
-=============================<wbr>==============================<wbr>========<br>
---- git.orig/etc/barbican/vassals/<wbr>barbican-admin.ini<br>
-+++ git/etc/barbican/vassals/<wbr>barbican-admin.ini<br>
-@@ -9,3 +9,4 @@<br>
+diff --git a/etc/barbican/vassals/<wbr>barbican-admin.ini b/etc/barbican/vassals/<wbr>barbican-admin.ini<br>
+index cd8bc49..562b6e7 100644<br>
+--- a/etc/barbican/vassals/<wbr>barbican-admin.ini<br>
++++ b/etc/barbican/vassals/<wbr>barbican-admin.ini<br>
+@@ -9,3 +9,4 @@ memory-report = true<br>
  plugins = python<br>
  paste = config:/etc/barbican/barbican-<wbr>admin-paste.ini<br>
  add-header = Connection: close<br>
 +buffer-size = %BARBICAN_MAX_PACKET_SIZE%<br>
-Index: git/etc/barbican/vassals/<wbr>barbican-api.ini<br>
-=============================<wbr>==============================<wbr>========<br>
---- git.orig/etc/barbican/vassals/<wbr>barbican-api.ini<br>
-+++ git/etc/barbican/vassals/<wbr>barbican-api.ini<br>
-@@ -9,3 +9,4 @@<br>
+diff --git a/etc/barbican/vassals/<wbr>barbican-api.ini b/etc/barbican/vassals/<wbr>barbican-api.ini<br>
+index a4f0bee..fa476b6 100644<br>
+--- a/etc/barbican/vassals/<wbr>barbican-api.ini<br>
++++ b/etc/barbican/vassals/<wbr>barbican-api.ini<br>
+@@ -9,3 +9,4 @@ memory-report = true<br>
  plugins = python<br>
  paste = config:/etc/barbican/barbican-<wbr>api-paste.ini<br>
  add-header = Connection: close<br>
diff --git a/meta-openstack/recipes-<wbr>devtools/python/python-<wbr>ceilometer/fix_ceilometer_<wbr>memory_leak.patch b/meta-openstack/recipes-<wbr>devtools/python/python-<wbr>ceilometer/fix_ceilometer_<wbr>memory_leak.patch<br>
index bdc1bf7..9581e90 100644<br>
--- a/meta-openstack/recipes-<wbr>devtools/python/python-<wbr>ceilometer/fix_ceilometer_<wbr>memory_leak.patch<br>
+++ b/meta-openstack/recipes-<wbr>devtools/python/python-<wbr>ceilometer/fix_ceilometer_<wbr>memory_leak.patch<br>
@@ -1,10 +1,16 @@<br>
+From fd4b8446cf3cf01a21f4b4a43897fe<wbr>2603be5aba Mon Sep 17 00:00:00 2001<br>
+From: Amy Fong <<a href="mailto:amy.fong@windriver.com">amy.fong@windriver.com</a>><br>
+Date: Fri, 28 Mar 2014 15:58:45 -0400<br>
+<br>
 ---<br>
- ceilometer/nova_client.py |    7 +++++++<br>
+ ceilometer/nova_client.py | 7 +++++++<br>
  1 file changed, 7 insertions(+)<br>
<br>
+diff --git a/ceilometer/nova_client.py b/ceilometer/nova_client.py<br>
+index 084c4ea..0219d00 100644<br>
 --- a/ceilometer/nova_client.py<br>
 +++ b/ceilometer/nova_client.py<br>
-@@ -26,6 +26,12 @@<br>
+@@ -38,6 +38,12 @@ cfg.CONF.import_group('<wbr>service_credentials', 'ceilometer.service')<br>
<br>
  LOG = log.getLogger(__name__)<br>
<br>
@@ -17,11 +23,11 @@<br>
<br>
  def logged(func):<br>
<br>
-@@ -56,6 +62,7 @@<br>
-             endpoint_type=conf.os_<wbr>endpoint_type,<br>
-             cacert=conf.os_cacert,<br>
+@@ -75,6 +81,7 @@ class Client(object):<br>
+             timeout=cfg.CONF.http_timeout,<br>
+             http_log_debug=cfg.CONF.nova_<wbr>http_log_debug,<br>
              no_cache=True)<br>
 +        self.nova_client.set_timings_<wbr>max_len(cfg.CONF.nova_client.<wbr>max_timing_buffer)<br>
<br>
      def _with_flavor_and_image(self, instances):<br>
-         for instance in instances:<br>
+         flavor_cache = {}<br>
diff --git a/meta-openstack/recipes-<wbr>devtools/python/python-<wbr>horizon/fix_bindir_path.patch b/meta-openstack/recipes-<wbr>devtools/python/python-<wbr>horizon/fix_bindir_path.patch<br>
index c9d0b1a..d390ae1 100644<br>
--- a/meta-openstack/recipes-<wbr>devtools/python/python-<wbr>horizon/fix_bindir_path.patch<br>
+++ b/meta-openstack/recipes-<wbr>devtools/python/python-<wbr>horizon/fix_bindir_path.patch<br>
@@ -1,11 +1,20 @@<br>
+From e56f1df2d7567ed428888429f51a6f<wbr>4a0864a414 Mon Sep 17 00:00:00 2001<br>
+From: Mihai Prica <<a href="mailto:prica.mihai@gmail.com">prica.mihai@gmail.com</a>><br>
+Date: Tue, 23 Jul 2013 10:56:00 +0300<br>
+Subject: [PATCH] python-horizon: Fix bindir search path<br>
+<br>
 Upstream-Status: Inappropriate [configuration]<br>
<br>
-Index: horizon-2013.1.2/openstack_<wbr>dashboard/settings.py<br>
-=============================<wbr>==============================<wbr>========<br>
---- horizon-2013.1.2.orig/<wbr>openstack_dashboard/settings.<wbr>py<br>
-+++ horizon-2013.1.2/openstack_<wbr>dashboard/settings.py<br>
-@@ -29,7 +29,7 @@ warnings.formatwarning = lambda message,<br>
-                                 '%s: %s' % (category.__name__, message)<br>
+---<br>
+ openstack_dashboard/settings.<wbr>py | 2 +-<br>
+ 1 file changed, 1 insertion(+), 1 deletion(-)<br>
+<br>
+diff --git a/openstack_dashboard/<wbr>settings.py b/openstack_dashboard/<wbr>settings.py<br>
+index 51db4ca..a1f1d32 100644<br>
+--- a/openstack_dashboard/<wbr>settings.py<br>
++++ b/openstack_dashboard/<wbr>settings.py<br>
+@@ -38,7 +38,7 @@ warnings.formatwarning = lambda message, category, *args, **kwargs: \<br>
+     '%s: %s' % (category.__name__, message)<br>
<br>
  ROOT_PATH = os.path.dirname(os.path.<wbr>abspath(__file__))<br>
 -BIN_DIR = os.path.abspath(os.path.join(<wbr>ROOT_PATH, '..', 'bin'))<br>
diff --git a/meta-openstack/recipes-<wbr>devtools/python/python-<wbr>horizon/horizon-use-full-<wbr>package-path-to-test-<wbr>directories.patch b/meta-openstack/recipes-<wbr>devtools/python/python-<wbr>horizon/horizon-use-full-<wbr>package-path-to-test-<wbr>directories.patch<br>
index e5e1966..ea29a16 100644<br>
--- a/meta-openstack/recipes-<wbr>devtools/python/python-<wbr>horizon/horizon-use-full-<wbr>package-path-to-test-<wbr>directories.patch<br>
+++ b/meta-openstack/recipes-<wbr>devtools/python/python-<wbr>horizon/horizon-use-full-<wbr>package-path-to-test-<wbr>directories.patch<br>
@@ -1,4 +1,4 @@<br>
-From 89aa2a575687013f4b4f4d4353c50a<wbr>f1de4c26ba Mon Sep 17 00:00:00 2001<br>
+From 16f66dec1dc9e7c98cc5d6d0099a78<wbr>65bf5b8e71 Mon Sep 17 00:00:00 2001<br>
 From: Keith Holman <<a href="mailto:Keith.Holman@windriver.com">Keith.Holman@windriver.com</a>><br>
 Date: Fri, 30 May 2014 11:58:33 -0400<br>
 Subject: [PATCH] horizon: use full package path to test directories<br>
@@ -15,15 +15,16 @@ within the build recipe with the full path to the python site<br>
 packages.<br>
<br>
 Signed-off-by: Keith Holman <<a href="mailto:Keith.Holman@windriver.com">Keith.Holman@windriver.com</a>><br>
+<br>
 ---<br>
  horizon/test/settings.py | 4 ++--<br>
  1 file changed, 2 insertions(+), 2 deletions(-)<br>
<br>
 diff --git a/horizon/test/settings.py b/horizon/test/settings.py<br>
-index f5ea700..10318eb 100644<br>
+index fde7c12..3df65af 100644<br>
 --- a/horizon/test/settings.py<br>
 +++ b/horizon/test/settings.py<br>
-@@ -95,8 +95,8 @@ SITE_BRANDING = 'Horizon'<br>
+@@ -109,8 +109,8 @@ SITE_BRANDING = 'Horizon'<br>
  TEST_RUNNER = 'django_nose.<wbr>NoseTestSuiteRunner'<br>
  NOSE_ARGS = ['--nocapture',<br>
               '--nologcapture',<br>
@@ -34,6 +35,3 @@ index f5ea700..10318eb 100644<br>
               '--cover-package=horizon',<br>
               '--cover-inclusive',<br>
               '--all-modules']<br>
--- <br>
-1.9.3<br>
-<br>
diff --git a/meta-openstack/recipes-<wbr>support/tgt/files/0001-<wbr>Correct-the-path-of-header-<wbr>files-check-in-Yocto-buil.<wbr>patch b/meta-openstack/recipes-<wbr>support/tgt/files/0001-<wbr>Correct-the-path-of-header-<wbr>files-check-in-Yocto-buil.<wbr>patch<br>
index 6630163..173ecb6 100644<br>
--- a/meta-openstack/recipes-<wbr>support/tgt/files/0001-<wbr>Correct-the-path-of-header-<wbr>files-check-in-Yocto-buil.<wbr>patch<br>
+++ b/meta-openstack/recipes-<wbr>support/tgt/files/0001-<wbr>Correct-the-path-of-header-<wbr>files-check-in-Yocto-buil.<wbr>patch<br>
@@ -1,4 +1,4 @@<br>
-From 5f6a261e44fec387e66d8b89d69f96<wbr>02de5d5c53 Mon Sep 17 00:00:00 2001<br>
+From 93fea40915d01be6d02587a0b8be85<wbr>a642e6a8d5 Mon Sep 17 00:00:00 2001<br>
 From: Zhenhua Luo <<a href="mailto:zhenhua.luo@freescale.com">zhenhua.luo@freescale.com</a>><br>
 Date: Thu, 10 Apr 2014 11:26:39 +0800<br>
 Subject: [PATCH] Correct the path of header files check in Yocto build env<br>
@@ -13,18 +13,19 @@ error appears. Change the path of header check.<br>
 | compilation terminated.<br>
<br>
 Signed-off-by: Zhenhua Luo <<a href="mailto:zhenhua.luo@freescale.com">zhenhua.luo@freescale.com</a>><br>
+<br>
 ---<br>
  usr/Makefile | 6 +++---<br>
  1 file changed, 3 insertions(+), 3 deletions(-)<br>
<br>
 diff --git a/usr/Makefile b/usr/Makefile<br>
-index 453eb1a..191503d 100644<br>
+index decf13c..9ff8f15 100644<br>
 --- a/usr/Makefile<br>
 +++ b/usr/Makefile<br>
 @@ -1,11 +1,11 @@<br>
  sbindir ?= $(PREFIX)/sbin<br>
  libdir ?= $(PREFIX)/lib/tgt<br>
-<br>
+ <br>
 -ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),)<br>
 +ifneq ($(shell test -e $(SYSROOT)/usr/include/linux/<wbr>signalfd.h && echo 1),)<br>
  CFLAGS += -DUSE_SIGNALFD<br>
@@ -35,8 +36,8 @@ index 453eb1a..191503d 100644<br>
  CFLAGS += -DUSE_TIMERFD<br>
  endif<br>
<br>
-@@ -25,7 +25,7 @@ TGTD_OBJS += bs_rbd.o<br>
- CFLAGS += -DUSE_TIMERFD<br>
+@@ -25,7 +25,7 @@ ifneq ($(SD_NOTIFY),)<br>
+ CFLAGS += -DUSE_SYSTEMD<br>
  endif<br>
<br>
 -ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e /usr/include/libaio.h && echo 1),)<br>
@@ -44,6 +45,3 @@ index 453eb1a..191503d 100644<br>
  CFLAGS += -DUSE_EVENTFD<br>
  TGTD_OBJS += bs_aio.o<br>
  LIBS += -laio<br>
--- <br>
-1.9.1<br>
-<br>
diff --git a/meta-openstack/recipes-<wbr>support/tgt/files/0001-usr-<wbr>Makefile-WARNING-fix.patch b/meta-openstack/recipes-<wbr>support/tgt/files/0001-usr-<wbr>Makefile-WARNING-fix.patch<br>
index f749101..078ba9e 100644<br>
--- a/meta-openstack/recipes-<wbr>support/tgt/files/0001-usr-<wbr>Makefile-WARNING-fix.patch<br>
+++ b/meta-openstack/recipes-<wbr>support/tgt/files/0001-usr-<wbr>Makefile-WARNING-fix.patch<br>
@@ -1,4 +1,4 @@<br>
-From 2a336ec5bf939d86425570617471df<wbr>60140d839e Mon Sep 17 00:00:00 2001<br>
+From 6f4e3b11c7dccf83e2d18635c84837<wbr>b212dfcc1c Mon Sep 17 00:00:00 2001<br>
 From: Li xin <<a href="mailto:lixin.fnst@cn.fujitsu.com">lixin.fnst@cn.fujitsu.com</a>><br>
 Date: Sun, 26 Jul 2015 04:23:51 +0900<br>
 Subject: [PATCH] usr/Makefile: WARNING fix WARNING: QA Issue: tgt:<br>
@@ -9,12 +9,13 @@ Subject: [PATCH] usr/Makefile: WARNING fix WARNING: QA Issue: tgt:<br>
 Upstream-Status: pending<br>
<br>
 Signed-off-by: Li Xin <<a href="mailto:lixin.fnst@cn.fujitsu.com">lixin.fnst@cn.fujitsu.com</a>><br>
+<br>
 ---<br>
  usr/Makefile | 2 +-<br>
  1 file changed, 1 insertion(+), 1 deletion(-)<br>
<br>
 diff --git a/usr/Makefile b/usr/Makefile<br>
-index 1fae7e7..2db109c 100644<br>
+index 9ff8f15..cc8df11 100644<br>
 --- a/usr/Makefile<br>
 +++ b/usr/Makefile<br>
 @@ -63,7 +63,7 @@ TGTD_OBJS += tgtd.o mgmt.o target.o scsi.o log.o driver.o util.o work.o \<br>
@@ -26,6 +27,3 @@ index 1fae7e7..2db109c 100644<br>
<br>
  .PHONY:all<br>
  all: $(PROGRAMS) $(MODULES)<br>
--- <br>
-1.8.4.2<br>
-<br>
<span class="HOEnZb"><font color="#888888">-- <br>
2.7.4<br>
<br>
-- <br>
______________________________<wbr>_________________<br>
meta-virtualization mailing list<br>
<a href="mailto:meta-virtualization@yoctoproject.org">meta-virtualization@<wbr>yoctoproject.org</a><br>
<a href="https://lists.yoctoproject.org/listinfo/meta-virtualization" rel="noreferrer" target="_blank">https://lists.yoctoproject.<wbr>org/listinfo/meta-<wbr>virtualization</a><br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature" data-smartmail="gmail_signature">"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"</div>
</div>