From 4b37a01d3fc80310c6c46b3abc1cc3b4d4cf6457 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Mon, 11 Jun 2018 10:24:31 -0400 Subject: housekeeping: patch refresh Bitbake now prints warnings when a patch is successfully applied but there is fuzz or an offset. The following refreshes patches for several packages which report warnings when openstack-image-controller is built. Signed-off-by: Mark Asselstine Signed-off-by: Bruce Ashfield --- .../python/python-horizon/fix_bindir_path.patch | 21 +++++++++++++++------ ...-use-full-package-path-to-test-directories.patch | 10 ++++------ 2 files changed, 19 insertions(+), 12 deletions(-) (limited to 'meta-openstack/recipes-devtools/python/python-horizon') diff --git a/meta-openstack/recipes-devtools/python/python-horizon/fix_bindir_path.patch b/meta-openstack/recipes-devtools/python/python-horizon/fix_bindir_path.patch index c9d0b1a..d390ae1 100644 --- a/meta-openstack/recipes-devtools/python/python-horizon/fix_bindir_path.patch +++ b/meta-openstack/recipes-devtools/python/python-horizon/fix_bindir_path.patch @@ -1,11 +1,20 @@ +From e56f1df2d7567ed428888429f51a6f4a0864a414 Mon Sep 17 00:00:00 2001 +From: Mihai Prica +Date: Tue, 23 Jul 2013 10:56:00 +0300 +Subject: [PATCH] python-horizon: Fix bindir search path + Upstream-Status: Inappropriate [configuration] -Index: horizon-2013.1.2/openstack_dashboard/settings.py -=================================================================== ---- horizon-2013.1.2.orig/openstack_dashboard/settings.py -+++ horizon-2013.1.2/openstack_dashboard/settings.py -@@ -29,7 +29,7 @@ warnings.formatwarning = lambda message, - '%s: %s' % (category.__name__, message) +--- + openstack_dashboard/settings.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py +index 51db4ca..a1f1d32 100644 +--- a/openstack_dashboard/settings.py ++++ b/openstack_dashboard/settings.py +@@ -38,7 +38,7 @@ warnings.formatwarning = lambda message, category, *args, **kwargs: \ + '%s: %s' % (category.__name__, message) ROOT_PATH = os.path.dirname(os.path.abspath(__file__)) -BIN_DIR = os.path.abspath(os.path.join(ROOT_PATH, '..', 'bin')) diff --git a/meta-openstack/recipes-devtools/python/python-horizon/horizon-use-full-package-path-to-test-directories.patch b/meta-openstack/recipes-devtools/python/python-horizon/horizon-use-full-package-path-to-test-directories.patch index e5e1966..ea29a16 100644 --- a/meta-openstack/recipes-devtools/python/python-horizon/horizon-use-full-package-path-to-test-directories.patch +++ b/meta-openstack/recipes-devtools/python/python-horizon/horizon-use-full-package-path-to-test-directories.patch @@ -1,4 +1,4 @@ -From 89aa2a575687013f4b4f4d4353c50af1de4c26ba Mon Sep 17 00:00:00 2001 +From 16f66dec1dc9e7c98cc5d6d0099a7865bf5b8e71 Mon Sep 17 00:00:00 2001 From: Keith Holman Date: Fri, 30 May 2014 11:58:33 -0400 Subject: [PATCH] horizon: use full package path to test directories @@ -15,15 +15,16 @@ within the build recipe with the full path to the python site packages. Signed-off-by: Keith Holman + --- horizon/test/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/horizon/test/settings.py b/horizon/test/settings.py -index f5ea700..10318eb 100644 +index fde7c12..3df65af 100644 --- a/horizon/test/settings.py +++ b/horizon/test/settings.py -@@ -95,8 +95,8 @@ SITE_BRANDING = 'Horizon' +@@ -109,8 +109,8 @@ SITE_BRANDING = 'Horizon' TEST_RUNNER = 'django_nose.NoseTestSuiteRunner' NOSE_ARGS = ['--nocapture', '--nologcapture', @@ -34,6 +35,3 @@ index f5ea700..10318eb 100644 '--cover-package=horizon', '--cover-inclusive', '--all-modules'] --- -1.9.3 - -- cgit v1.2.3-54-g00ecf