summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-openstack/recipes-devtools/python/python-barbican/barbican-fix-path-to-find-configuration-files.patch12
-rw-r--r--meta-openstack/recipes-devtools/python/python-barbican/barbican-increase-buffer-size-to-support-PKI-tokens.patch23
-rw-r--r--meta-openstack/recipes-devtools/python/python-ceilometer/fix_ceilometer_memory_leak.patch18
-rw-r--r--meta-openstack/recipes-devtools/python/python-horizon/fix_bindir_path.patch21
-rw-r--r--meta-openstack/recipes-devtools/python/python-horizon/horizon-use-full-package-path-to-test-directories.patch10
-rw-r--r--meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch14
-rw-r--r--meta-openstack/recipes-support/tgt/files/0001-usr-Makefile-WARNING-fix.patch8
7 files changed, 57 insertions, 49 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-barbican/barbican-fix-path-to-find-configuration-files.patch b/meta-openstack/recipes-devtools/python/python-barbican/barbican-fix-path-to-find-configuration-files.patch
index 8fd1010..b7e74cd 100644
--- a/meta-openstack/recipes-devtools/python/python-barbican/barbican-fix-path-to-find-configuration-files.patch
+++ b/meta-openstack/recipes-devtools/python/python-barbican/barbican-fix-path-to-find-configuration-files.patch
@@ -1,4 +1,4 @@
1From 30a57a0b4f2dcaff76821f21f4a545ecb9ddf194 Mon Sep 17 00:00:00 2001 1From 3364915002aa2deaf63841e338375648e5dc8f24 Mon Sep 17 00:00:00 2001
2From: Keith Holman <Keith.Holman@windriver.com> 2From: Keith Holman <Keith.Holman@windriver.com>
3Date: Fri, 13 Jun 2014 13:46:04 -0400 3Date: Fri, 13 Jun 2014 13:46:04 -0400
4Subject: [PATCH] barbican: fix path to find configuration files 4Subject: [PATCH] barbican: fix path to find configuration files
@@ -10,15 +10,16 @@ recipe. This fix updates the location for the configuration files
10with an identifier that is replaced during deployment. 10with an identifier that is replaced during deployment.
11 11
12Signed-off-by: Keith Holman <Keith.Holman@windriver.com> 12Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
13
13--- 14---
14 barbican/tests/api/test_resources_policy.py | 3 +-- 15 barbican/tests/api/test_resources_policy.py | 3 +--
15 1 file changed, 1 insertion(+), 2 deletions(-) 16 1 file changed, 1 insertion(+), 2 deletions(-)
16 17
17diff --git a/barbican/tests/api/test_resources_policy.py b/barbican/tests/api/test_resources_policy.py 18diff --git a/barbican/tests/api/test_resources_policy.py b/barbican/tests/api/test_resources_policy.py
18index 7d995c6..28b7599 100644 19index 5c75bc3..f2332f6 100644
19--- a/barbican/tests/api/test_resources_policy.py 20--- a/barbican/tests/api/test_resources_policy.py
20+++ b/barbican/tests/api/test_resources_policy.py 21+++ b/barbican/tests/api/test_resources_policy.py
21@@ -35,8 +35,7 @@ from barbican.openstack.common import policy 22@@ -37,8 +37,7 @@ from barbican.tests import utils
22 CONF = cfg.CONF 23 CONF = cfg.CONF
23 24
24 # Point to the policy.json file located in source control. 25 # Point to the policy.json file located in source control.
@@ -26,8 +27,5 @@ index 7d995c6..28b7599 100644
26- '../../../etc', 'barbican')) 27- '../../../etc', 'barbican'))
27+TEST_VAR_DIR = "%BARBICAN_CONF_DIR%" 28+TEST_VAR_DIR = "%BARBICAN_CONF_DIR%"
28 29
29 ENFORCER = policy.Enforcer() 30 ENFORCER = policy.Enforcer(CONF)
30 31
31--
321.9.3
33
diff --git a/meta-openstack/recipes-devtools/python/python-barbican/barbican-increase-buffer-size-to-support-PKI-tokens.patch b/meta-openstack/recipes-devtools/python/python-barbican/barbican-increase-buffer-size-to-support-PKI-tokens.patch
index acde89c..c85e473 100644
--- a/meta-openstack/recipes-devtools/python/python-barbican/barbican-increase-buffer-size-to-support-PKI-tokens.patch
+++ b/meta-openstack/recipes-devtools/python/python-barbican/barbican-increase-buffer-size-to-support-PKI-tokens.patch
@@ -1,4 +1,4 @@
1From 8b78d792ca7f7ba4e105225c3917c0a467a2fadb Mon Sep 17 00:00:00 2001 1From 542a384cf1de68dc21ec335ff9518889e342d76e Mon Sep 17 00:00:00 2001
2From: Keith Holman <Keith.Holman@windriver.com> 2From: Keith Holman <Keith.Holman@windriver.com>
3Date: Thu, 22 May 2014 12:08:13 -0400 3Date: Thu, 22 May 2014 12:08:13 -0400
4Subject: [PATCH] barbican: increase buffer-size to support PKI tokens 4Subject: [PATCH] barbican: increase buffer-size to support PKI tokens
@@ -10,25 +10,26 @@ buffer size uWSGI uses fixes this problem. This fix allows the
10packet sized to be specified in the build recipe file. 10packet sized to be specified in the build recipe file.
11 11
12Signed-off-by: Keith Holman <Keith.Holman@windriver.com> 12Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
13
13--- 14---
14 etc/barbican/vassals/barbican-admin.ini | 1 + 15 etc/barbican/vassals/barbican-admin.ini | 1 +
15 etc/barbican/vassals/barbican-api.ini | 1 + 16 etc/barbican/vassals/barbican-api.ini | 1 +
16 2 files changed, 2 insertions(+) 17 2 files changed, 2 insertions(+)
17 18
18Index: git/etc/barbican/vassals/barbican-admin.ini 19diff --git a/etc/barbican/vassals/barbican-admin.ini b/etc/barbican/vassals/barbican-admin.ini
19=================================================================== 20index cd8bc49..562b6e7 100644
20--- git.orig/etc/barbican/vassals/barbican-admin.ini 21--- a/etc/barbican/vassals/barbican-admin.ini
21+++ git/etc/barbican/vassals/barbican-admin.ini 22+++ b/etc/barbican/vassals/barbican-admin.ini
22@@ -9,3 +9,4 @@ 23@@ -9,3 +9,4 @@ memory-report = true
23 plugins = python 24 plugins = python
24 paste = config:/etc/barbican/barbican-admin-paste.ini 25 paste = config:/etc/barbican/barbican-admin-paste.ini
25 add-header = Connection: close 26 add-header = Connection: close
26+buffer-size = %BARBICAN_MAX_PACKET_SIZE% 27+buffer-size = %BARBICAN_MAX_PACKET_SIZE%
27Index: git/etc/barbican/vassals/barbican-api.ini 28diff --git a/etc/barbican/vassals/barbican-api.ini b/etc/barbican/vassals/barbican-api.ini
28=================================================================== 29index a4f0bee..fa476b6 100644
29--- git.orig/etc/barbican/vassals/barbican-api.ini 30--- a/etc/barbican/vassals/barbican-api.ini
30+++ git/etc/barbican/vassals/barbican-api.ini 31+++ b/etc/barbican/vassals/barbican-api.ini
31@@ -9,3 +9,4 @@ 32@@ -9,3 +9,4 @@ memory-report = true
32 plugins = python 33 plugins = python
33 paste = config:/etc/barbican/barbican-api-paste.ini 34 paste = config:/etc/barbican/barbican-api-paste.ini
34 add-header = Connection: close 35 add-header = Connection: close
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer/fix_ceilometer_memory_leak.patch b/meta-openstack/recipes-devtools/python/python-ceilometer/fix_ceilometer_memory_leak.patch
index bdc1bf7..9581e90 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer/fix_ceilometer_memory_leak.patch
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer/fix_ceilometer_memory_leak.patch
@@ -1,10 +1,16 @@
1From fd4b8446cf3cf01a21f4b4a43897fe2603be5aba Mon Sep 17 00:00:00 2001
2From: Amy Fong <amy.fong@windriver.com>
3Date: Fri, 28 Mar 2014 15:58:45 -0400
4
1--- 5---
2 ceilometer/nova_client.py | 7 +++++++ 6 ceilometer/nova_client.py | 7 +++++++
3 1 file changed, 7 insertions(+) 7 1 file changed, 7 insertions(+)
4 8
9diff --git a/ceilometer/nova_client.py b/ceilometer/nova_client.py
10index 084c4ea..0219d00 100644
5--- a/ceilometer/nova_client.py 11--- a/ceilometer/nova_client.py
6+++ b/ceilometer/nova_client.py 12+++ b/ceilometer/nova_client.py
7@@ -26,6 +26,12 @@ 13@@ -38,6 +38,12 @@ cfg.CONF.import_group('service_credentials', 'ceilometer.service')
8 14
9 LOG = log.getLogger(__name__) 15 LOG = log.getLogger(__name__)
10 16
@@ -17,11 +23,11 @@
17 23
18 def logged(func): 24 def logged(func):
19 25
20@@ -56,6 +62,7 @@ 26@@ -75,6 +81,7 @@ class Client(object):
21 endpoint_type=conf.os_endpoint_type, 27 timeout=cfg.CONF.http_timeout,
22 cacert=conf.os_cacert, 28 http_log_debug=cfg.CONF.nova_http_log_debug,
23 no_cache=True) 29 no_cache=True)
24+ self.nova_client.set_timings_max_len(cfg.CONF.nova_client.max_timing_buffer) 30+ self.nova_client.set_timings_max_len(cfg.CONF.nova_client.max_timing_buffer)
25 31
26 def _with_flavor_and_image(self, instances): 32 def _with_flavor_and_image(self, instances):
27 for instance in instances: 33 flavor_cache = {}
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 @@
1From e56f1df2d7567ed428888429f51a6f4a0864a414 Mon Sep 17 00:00:00 2001
2From: Mihai Prica <prica.mihai@gmail.com>
3Date: Tue, 23 Jul 2013 10:56:00 +0300
4Subject: [PATCH] python-horizon: Fix bindir search path
5
1Upstream-Status: Inappropriate [configuration] 6Upstream-Status: Inappropriate [configuration]
2 7
3Index: horizon-2013.1.2/openstack_dashboard/settings.py 8---
4=================================================================== 9 openstack_dashboard/settings.py | 2 +-
5--- horizon-2013.1.2.orig/openstack_dashboard/settings.py 10 1 file changed, 1 insertion(+), 1 deletion(-)
6+++ horizon-2013.1.2/openstack_dashboard/settings.py 11
7@@ -29,7 +29,7 @@ warnings.formatwarning = lambda message, 12diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
8 '%s: %s' % (category.__name__, message) 13index 51db4ca..a1f1d32 100644
14--- a/openstack_dashboard/settings.py
15+++ b/openstack_dashboard/settings.py
16@@ -38,7 +38,7 @@ warnings.formatwarning = lambda message, category, *args, **kwargs: \
17 '%s: %s' % (category.__name__, message)
9 18
10 ROOT_PATH = os.path.dirname(os.path.abspath(__file__)) 19 ROOT_PATH = os.path.dirname(os.path.abspath(__file__))
11-BIN_DIR = os.path.abspath(os.path.join(ROOT_PATH, '..', 'bin')) 20-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 @@
1From 89aa2a575687013f4b4f4d4353c50af1de4c26ba Mon Sep 17 00:00:00 2001 1From 16f66dec1dc9e7c98cc5d6d0099a7865bf5b8e71 Mon Sep 17 00:00:00 2001
2From: Keith Holman <Keith.Holman@windriver.com> 2From: Keith Holman <Keith.Holman@windriver.com>
3Date: Fri, 30 May 2014 11:58:33 -0400 3Date: Fri, 30 May 2014 11:58:33 -0400
4Subject: [PATCH] horizon: use full package path to test directories 4Subject: [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
15packages. 15packages.
16 16
17Signed-off-by: Keith Holman <Keith.Holman@windriver.com> 17Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
18
18--- 19---
19 horizon/test/settings.py | 4 ++-- 20 horizon/test/settings.py | 4 ++--
20 1 file changed, 2 insertions(+), 2 deletions(-) 21 1 file changed, 2 insertions(+), 2 deletions(-)
21 22
22diff --git a/horizon/test/settings.py b/horizon/test/settings.py 23diff --git a/horizon/test/settings.py b/horizon/test/settings.py
23index f5ea700..10318eb 100644 24index fde7c12..3df65af 100644
24--- a/horizon/test/settings.py 25--- a/horizon/test/settings.py
25+++ b/horizon/test/settings.py 26+++ b/horizon/test/settings.py
26@@ -95,8 +95,8 @@ SITE_BRANDING = 'Horizon' 27@@ -109,8 +109,8 @@ SITE_BRANDING = 'Horizon'
27 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner' 28 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
28 NOSE_ARGS = ['--nocapture', 29 NOSE_ARGS = ['--nocapture',
29 '--nologcapture', 30 '--nologcapture',
@@ -34,6 +35,3 @@ index f5ea700..10318eb 100644
34 '--cover-package=horizon', 35 '--cover-package=horizon',
35 '--cover-inclusive', 36 '--cover-inclusive',
36 '--all-modules'] 37 '--all-modules']
37--
381.9.3
39
diff --git a/meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch b/meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch
index 6630163..173ecb6 100644
--- a/meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch
+++ b/meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch
@@ -1,4 +1,4 @@
1From 5f6a261e44fec387e66d8b89d69f9602de5d5c53 Mon Sep 17 00:00:00 2001 1From 93fea40915d01be6d02587a0b8be85a642e6a8d5 Mon Sep 17 00:00:00 2001
2From: Zhenhua Luo <zhenhua.luo@freescale.com> 2From: Zhenhua Luo <zhenhua.luo@freescale.com>
3Date: Thu, 10 Apr 2014 11:26:39 +0800 3Date: Thu, 10 Apr 2014 11:26:39 +0800
4Subject: [PATCH] Correct the path of header files check in Yocto build env 4Subject: [PATCH] Correct the path of header files check in Yocto build env
@@ -13,18 +13,19 @@ error appears. Change the path of header check.
13| compilation terminated. 13| compilation terminated.
14 14
15Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> 15Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
16
16--- 17---
17 usr/Makefile | 6 +++--- 18 usr/Makefile | 6 +++---
18 1 file changed, 3 insertions(+), 3 deletions(-) 19 1 file changed, 3 insertions(+), 3 deletions(-)
19 20
20diff --git a/usr/Makefile b/usr/Makefile 21diff --git a/usr/Makefile b/usr/Makefile
21index 453eb1a..191503d 100644 22index decf13c..9ff8f15 100644
22--- a/usr/Makefile 23--- a/usr/Makefile
23+++ b/usr/Makefile 24+++ b/usr/Makefile
24@@ -1,11 +1,11 @@ 25@@ -1,11 +1,11 @@
25 sbindir ?= $(PREFIX)/sbin 26 sbindir ?= $(PREFIX)/sbin
26 libdir ?= $(PREFIX)/lib/tgt 27 libdir ?= $(PREFIX)/lib/tgt
27 28
28-ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),) 29-ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),)
29+ifneq ($(shell test -e $(SYSROOT)/usr/include/linux/signalfd.h && echo 1),) 30+ifneq ($(shell test -e $(SYSROOT)/usr/include/linux/signalfd.h && echo 1),)
30 CFLAGS += -DUSE_SIGNALFD 31 CFLAGS += -DUSE_SIGNALFD
@@ -35,8 +36,8 @@ index 453eb1a..191503d 100644
35 CFLAGS += -DUSE_TIMERFD 36 CFLAGS += -DUSE_TIMERFD
36 endif 37 endif
37 38
38@@ -25,7 +25,7 @@ TGTD_OBJS += bs_rbd.o 39@@ -25,7 +25,7 @@ ifneq ($(SD_NOTIFY),)
39 CFLAGS += -DUSE_TIMERFD 40 CFLAGS += -DUSE_SYSTEMD
40 endif 41 endif
41 42
42-ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e /usr/include/libaio.h && echo 1),) 43-ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e /usr/include/libaio.h && echo 1),)
@@ -44,6 +45,3 @@ index 453eb1a..191503d 100644
44 CFLAGS += -DUSE_EVENTFD 45 CFLAGS += -DUSE_EVENTFD
45 TGTD_OBJS += bs_aio.o 46 TGTD_OBJS += bs_aio.o
46 LIBS += -laio 47 LIBS += -laio
47--
481.9.1
49
diff --git a/meta-openstack/recipes-support/tgt/files/0001-usr-Makefile-WARNING-fix.patch b/meta-openstack/recipes-support/tgt/files/0001-usr-Makefile-WARNING-fix.patch
index f749101..078ba9e 100644
--- a/meta-openstack/recipes-support/tgt/files/0001-usr-Makefile-WARNING-fix.patch
+++ b/meta-openstack/recipes-support/tgt/files/0001-usr-Makefile-WARNING-fix.patch
@@ -1,4 +1,4 @@
1From 2a336ec5bf939d86425570617471df60140d839e Mon Sep 17 00:00:00 2001 1From 6f4e3b11c7dccf83e2d18635c84837b212dfcc1c Mon Sep 17 00:00:00 2001
2From: Li xin <lixin.fnst@cn.fujitsu.com> 2From: Li xin <lixin.fnst@cn.fujitsu.com>
3Date: Sun, 26 Jul 2015 04:23:51 +0900 3Date: Sun, 26 Jul 2015 04:23:51 +0900
4Subject: [PATCH] usr/Makefile: WARNING fix WARNING: QA Issue: tgt: 4Subject: [PATCH] usr/Makefile: WARNING fix WARNING: QA Issue: tgt:
@@ -9,12 +9,13 @@ Subject: [PATCH] usr/Makefile: WARNING fix WARNING: QA Issue: tgt:
9Upstream-Status: pending 9Upstream-Status: pending
10 10
11Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> 11Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
12
12--- 13---
13 usr/Makefile | 2 +- 14 usr/Makefile | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
15 16
16diff --git a/usr/Makefile b/usr/Makefile 17diff --git a/usr/Makefile b/usr/Makefile
17index 1fae7e7..2db109c 100644 18index 9ff8f15..cc8df11 100644
18--- a/usr/Makefile 19--- a/usr/Makefile
19+++ b/usr/Makefile 20+++ b/usr/Makefile
20@@ -63,7 +63,7 @@ TGTD_OBJS += tgtd.o mgmt.o target.o scsi.o log.o driver.o util.o work.o \ 21@@ -63,7 +63,7 @@ TGTD_OBJS += tgtd.o mgmt.o target.o scsi.o log.o driver.o util.o work.o \
@@ -26,6 +27,3 @@ index 1fae7e7..2db109c 100644
26 27
27 .PHONY:all 28 .PHONY:all
28 all: $(PROGRAMS) $(MODULES) 29 all: $(PROGRAMS) $(MODULES)
29--
301.8.4.2
31