From c43afe3b7383ce93fef9cdd1ebb18de5dda0044a Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 20 Feb 2015 15:41:06 -0500 Subject: bbappends: resync to oe-core versions Updating the bbappends to match the oe-core versions ~commit 530565c6cb77319f4cc49edeea6fec6be997415d Signed-off-by: Bruce Ashfield --- .../openssh/openssh_6.6p1.bbappend | 11 --- .../openssh/openssh_6.7p1.bbappend | 11 +++ .../recipes-containers/lxc/lxc_1.0.6.bbappend | 1 - .../recipes-containers/lxc/lxc_1.0.7.bbappend | 1 + .../recipes-core/busybox/busybox_1.22.1.bbappend | 5 - .../recipes-core/busybox/busybox_1.23.1.bbappend | 5 + .../fix_novaclient_memory_leak.patch | 105 --------------------- ...ent-specify-full-path-to-test-certificate.patch | 32 ------- .../recipes-devtools/qemu/qemu_2.1.0.bbappend | 5 - .../recipes-devtools/qemu/qemu_2.2.0.bbappend | 5 + .../libvirt/libvirt_1.2.12.bbappend | 13 +++ .../libvirt/libvirt_1.2.8.bbappend | 13 --- .../sysklogd/sysklogd_1.5.1.bbappend | 6 ++ .../sysklogd/sysklogd_1.5.bbappend | 6 -- .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 5 - .../recipes-kernel/linux/linux-yocto_3.19.bbappend | 9 ++ .../iproute2/iproute2_3.16.0.bbappend | 6 -- .../iproute2/iproute2_3.17.0.bbappend | 6 ++ .../recipes-support/xmlto/xmlto_0.0.25.bbappend | 1 - .../recipes-support/xmlto/xmlto_0.0.26.bbappend | 1 + 20 files changed, 57 insertions(+), 190 deletions(-) delete mode 100644 meta-openstack/recipes-connectivity/openssh/openssh_6.6p1.bbappend create mode 100644 meta-openstack/recipes-connectivity/openssh/openssh_6.7p1.bbappend delete mode 100644 meta-openstack/recipes-containers/lxc/lxc_1.0.6.bbappend create mode 100644 meta-openstack/recipes-containers/lxc/lxc_1.0.7.bbappend delete mode 100644 meta-openstack/recipes-core/busybox/busybox_1.22.1.bbappend create mode 100644 meta-openstack/recipes-core/busybox/busybox_1.23.1.bbappend delete mode 100644 meta-openstack/recipes-devtools/python/python-novaclient/fix_novaclient_memory_leak.patch delete mode 100644 meta-openstack/recipes-devtools/python/python-novaclient/novaclient-specify-full-path-to-test-certificate.patch delete mode 100644 meta-openstack/recipes-devtools/qemu/qemu_2.1.0.bbappend create mode 100644 meta-openstack/recipes-devtools/qemu/qemu_2.2.0.bbappend create mode 100644 meta-openstack/recipes-extended/libvirt/libvirt_1.2.12.bbappend delete mode 100644 meta-openstack/recipes-extended/libvirt/libvirt_1.2.8.bbappend create mode 100644 meta-openstack/recipes-extended/sysklogd/sysklogd_1.5.1.bbappend delete mode 100644 meta-openstack/recipes-extended/sysklogd/sysklogd_1.5.bbappend delete mode 100644 meta-openstack/recipes-kernel/linux/linux-yocto_3.10.bbappend create mode 100644 meta-openstack/recipes-kernel/linux/linux-yocto_3.19.bbappend delete mode 100644 meta-openstack/recipes-support/iproute2/iproute2_3.16.0.bbappend create mode 100644 meta-openstack/recipes-support/iproute2/iproute2_3.17.0.bbappend delete mode 100644 meta-openstack/recipes-support/xmlto/xmlto_0.0.25.bbappend create mode 100644 meta-openstack/recipes-support/xmlto/xmlto_0.0.26.bbappend diff --git a/meta-openstack/recipes-connectivity/openssh/openssh_6.6p1.bbappend b/meta-openstack/recipes-connectivity/openssh/openssh_6.6p1.bbappend deleted file mode 100644 index bfc543a..0000000 --- a/meta-openstack/recipes-connectivity/openssh/openssh_6.6p1.bbappend +++ /dev/null @@ -1,11 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI += "file://mcs-sshd" -SRC_URI += "file://mcs-sshd_config" - -do_install_append() { - if ${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then - install -D -m 644 ${WORKDIR}/mcs-sshd ${D}/etc/pam.d/sshd - install -D -m 644 ${WORKDIR}/mcs-sshd_config ${D}/etc/ssh/sshd_config - fi -} diff --git a/meta-openstack/recipes-connectivity/openssh/openssh_6.7p1.bbappend b/meta-openstack/recipes-connectivity/openssh/openssh_6.7p1.bbappend new file mode 100644 index 0000000..bfc543a --- /dev/null +++ b/meta-openstack/recipes-connectivity/openssh/openssh_6.7p1.bbappend @@ -0,0 +1,11 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI += "file://mcs-sshd" +SRC_URI += "file://mcs-sshd_config" + +do_install_append() { + if ${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then + install -D -m 644 ${WORKDIR}/mcs-sshd ${D}/etc/pam.d/sshd + install -D -m 644 ${WORKDIR}/mcs-sshd_config ${D}/etc/ssh/sshd_config + fi +} diff --git a/meta-openstack/recipes-containers/lxc/lxc_1.0.6.bbappend b/meta-openstack/recipes-containers/lxc/lxc_1.0.6.bbappend deleted file mode 100644 index 7447c56..0000000 --- a/meta-openstack/recipes-containers/lxc/lxc_1.0.6.bbappend +++ /dev/null @@ -1 +0,0 @@ -inherit autotools-brokensep diff --git a/meta-openstack/recipes-containers/lxc/lxc_1.0.7.bbappend b/meta-openstack/recipes-containers/lxc/lxc_1.0.7.bbappend new file mode 100644 index 0000000..7447c56 --- /dev/null +++ b/meta-openstack/recipes-containers/lxc/lxc_1.0.7.bbappend @@ -0,0 +1 @@ +inherit autotools-brokensep diff --git a/meta-openstack/recipes-core/busybox/busybox_1.22.1.bbappend b/meta-openstack/recipes-core/busybox/busybox_1.22.1.bbappend deleted file mode 100644 index 569bd30..0000000 --- a/meta-openstack/recipes-core/busybox/busybox_1.22.1.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += " \ - file://horizon.cfg \ - " diff --git a/meta-openstack/recipes-core/busybox/busybox_1.23.1.bbappend b/meta-openstack/recipes-core/busybox/busybox_1.23.1.bbappend new file mode 100644 index 0000000..569bd30 --- /dev/null +++ b/meta-openstack/recipes-core/busybox/busybox_1.23.1.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://horizon.cfg \ + " diff --git a/meta-openstack/recipes-devtools/python/python-novaclient/fix_novaclient_memory_leak.patch b/meta-openstack/recipes-devtools/python/python-novaclient/fix_novaclient_memory_leak.patch deleted file mode 100644 index 37688d6..0000000 --- a/meta-openstack/recipes-devtools/python/python-novaclient/fix_novaclient_memory_leak.patch +++ /dev/null @@ -1,105 +0,0 @@ ---- - novaclient/client.py | 10 ++++++++++ - novaclient/openstack/common/apiclient/client.py | 10 ++++++++++ - novaclient/v1_1/client.py | 6 ++++++ - novaclient/v3/client.py | 6 ++++++ - 4 files changed, 32 insertions(+) - -Index: git/novaclient/client.py -=================================================================== ---- git.orig/novaclient/client.py -+++ git/novaclient/client.py -@@ -266,6 +266,7 @@ - self.timeout = None - - self.times = [] # [("item", starttime, endtime), ...] -+ self.times_max_len = 200 - - self.management_url = self.bypass_url or None - self.auth_token = auth_token -@@ -328,6 +329,12 @@ - else: - return name, value - -+ def get_timings_max_len(self): -+ return self.times_max_len -+ -+ def set_timings_max_len(self, new_len): -+ self.times_max_len = new_len -+ - def http_log_req(self, method, url, kwargs): - if not self.http_log_debug: - return -@@ -441,6 +448,9 @@ - resp, body = self.request(url, method, **kwargs) - self.times.append(("%s %s" % (method, url), - start_time, time.time())) -+ # remove oldest items until we maintain max length -+ while len(self.times) > self.times_max_len: -+ del self.times[0] - return resp, body - - def _cs_request(self, url, method, **kwargs): -Index: git/novaclient/openstack/common/apiclient/client.py -=================================================================== ---- git.orig/novaclient/openstack/common/apiclient/client.py -+++ git/novaclient/openstack/common/apiclient/client.py -@@ -92,6 +92,7 @@ - self.user_agent = user_agent or self.user_agent - - self.times = [] # [("item", starttime, endtime), ...] -+ self.times_max_len = 200 - self.timings = timings - - # requests within the same session can reuse TCP connections from pool -@@ -144,6 +145,12 @@ - def reset_timings(self): - self.times = [] - -+ def get_timings_max_len(self): -+ return self.times_max_len -+ -+ def set_timings_max_len(self, new_len): -+ self.times_max_len = new_len -+ - def request(self, method, url, **kwargs): - """Send an http request with the specified characteristics. - -@@ -175,6 +182,9 @@ - if self.timings: - self.times.append(("%s %s" % (method, url), - start_time, time.time())) -+ # remove oldest items until we maintain max length -+ while len(self.times) > self.times_max_len: -+ del self.times[0] - self._http_log_resp(resp) - - if resp.status_code >= 400: -Index: git/novaclient/v1_1/client.py -=================================================================== ---- git.orig/novaclient/v1_1/client.py -+++ git/novaclient/v1_1/client.py -@@ -232,3 +232,9 @@ - credentials are wrong. - """ - self.client.authenticate() -+ -+ def get_timings_max_len(self): -+ return self.client.get_timings_max_len() -+ -+ def set_timings_max_len(self, new_len): -+ self.client.set_timings_max_len(new_len) -Index: git/novaclient/v3/client.py -=================================================================== ---- git.orig/novaclient/v3/client.py -+++ git/novaclient/v3/client.py -@@ -194,3 +194,9 @@ - credentials are wrong. - """ - self.client.authenticate() -+ -+ def get_timings_max_len(self): -+ return self.client.get_timings_max_len() -+ -+ def set_timings_max_len(self, new_len): -+ self.client.set_timings_max_len(new_len) diff --git a/meta-openstack/recipes-devtools/python/python-novaclient/novaclient-specify-full-path-to-test-certificate.patch b/meta-openstack/recipes-devtools/python/python-novaclient/novaclient-specify-full-path-to-test-certificate.patch deleted file mode 100644 index 1cee4d0..0000000 --- a/meta-openstack/recipes-devtools/python/python-novaclient/novaclient-specify-full-path-to-test-certificate.patch +++ /dev/null @@ -1,32 +0,0 @@ -From bdd853d38c7b14088d3e6368e298201c249ab004 Mon Sep 17 00:00:00 2001 -From: Keith Holman -Date: Fri, 13 Jun 2014 09:54:41 -0400 -Subject: [PATCH] novaclient: specify full path to test certificate - -The tests shipped with novaclient assume that the files -exist at the same location as are appear within the -source tree. The tests also assume that the test is ran -from the root of the tree. This causes a test to fail as -it can't find a test certificate used in one of the -tests. This patch fixes the affected test by putting in -an identifier that is replaced with the full path to the -certificate file. - -Signed-off-by: Keith Holman ---- - novaclient/tests/v1_1/test_servers.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: git/novaclient/tests/v1_1/test_servers.py -=================================================================== ---- git.orig/novaclient/tests/v1_1/test_servers.py -+++ git/novaclient/tests/v1_1/test_servers.py -@@ -501,7 +501,7 @@ - def test_get_password(self): - s = self.cs.servers.get(1234) - self.assertEqual(b'FooBar123', -- s.get_password('novaclient/tests/idfake.pem')) -+ s.get_password('%PYTHON_SITEPACKAGES_DIR%/novaclient/tests/idfake.pem')) - self.assert_called('GET', '/servers/1234/os-server-password') - - def test_get_password_without_key(self): diff --git a/meta-openstack/recipes-devtools/qemu/qemu_2.1.0.bbappend b/meta-openstack/recipes-devtools/qemu/qemu_2.1.0.bbappend deleted file mode 100644 index 1c8c682..0000000 --- a/meta-openstack/recipes-devtools/qemu/qemu_2.1.0.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -PACKAGECONFIG[spice] = "--enable-spice,--disable-spice,spice," - -PACKAGECONFIG ?= "fdt spice virtfs attr cap-ng" -PACKAGECONFIG_class-native = "fdt" -PACKAGECONFIG_class-nativesdk = "fdt" diff --git a/meta-openstack/recipes-devtools/qemu/qemu_2.2.0.bbappend b/meta-openstack/recipes-devtools/qemu/qemu_2.2.0.bbappend new file mode 100644 index 0000000..1c8c682 --- /dev/null +++ b/meta-openstack/recipes-devtools/qemu/qemu_2.2.0.bbappend @@ -0,0 +1,5 @@ +PACKAGECONFIG[spice] = "--enable-spice,--disable-spice,spice," + +PACKAGECONFIG ?= "fdt spice virtfs attr cap-ng" +PACKAGECONFIG_class-native = "fdt" +PACKAGECONFIG_class-nativesdk = "fdt" diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_1.2.12.bbappend b/meta-openstack/recipes-extended/libvirt/libvirt_1.2.12.bbappend new file mode 100644 index 0000000..195633b --- /dev/null +++ b/meta-openstack/recipes-extended/libvirt/libvirt_1.2.12.bbappend @@ -0,0 +1,13 @@ +PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \ + python sanlock ebtables \ + ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ + " + +inherit useradd +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "--system libvirt" + +do_install_append() { + sed -e "s:^#unix_sock_group =:unix_sock_group =:g" -i ${D}/etc/libvirt/libvirtd.conf + sed -e "s:^#unix_sock_rw_perms =:unix_sock_rw_perms =:g" -i ${D}/etc/libvirt/libvirtd.conf +} diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_1.2.8.bbappend b/meta-openstack/recipes-extended/libvirt/libvirt_1.2.8.bbappend deleted file mode 100644 index 195633b..0000000 --- a/meta-openstack/recipes-extended/libvirt/libvirt_1.2.8.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \ - python sanlock ebtables \ - ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ - " - -inherit useradd -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system libvirt" - -do_install_append() { - sed -e "s:^#unix_sock_group =:unix_sock_group =:g" -i ${D}/etc/libvirt/libvirtd.conf - sed -e "s:^#unix_sock_rw_perms =:unix_sock_rw_perms =:g" -i ${D}/etc/libvirt/libvirtd.conf -} diff --git a/meta-openstack/recipes-extended/sysklogd/sysklogd_1.5.1.bbappend b/meta-openstack/recipes-extended/sysklogd/sysklogd_1.5.1.bbappend new file mode 100644 index 0000000..8da640f --- /dev/null +++ b/meta-openstack/recipes-extended/sysklogd/sysklogd_1.5.1.bbappend @@ -0,0 +1,6 @@ +# +# Copyright (C) 2014 Wind River Systems, Inc. +# + +require recipes-extended/syslog/syslog-user.inc + diff --git a/meta-openstack/recipes-extended/sysklogd/sysklogd_1.5.bbappend b/meta-openstack/recipes-extended/sysklogd/sysklogd_1.5.bbappend deleted file mode 100644 index 8da640f..0000000 --- a/meta-openstack/recipes-extended/sysklogd/sysklogd_1.5.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -# -# Copyright (C) 2014 Wind River Systems, Inc. -# - -require recipes-extended/syslog/syslog-user.inc - diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-openstack/recipes-kernel/linux/linux-yocto_3.10.bbappend deleted file mode 100644 index 955716b..0000000 --- a/meta-openstack/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://iscsi-tcp.scc \ - file://enable-iscsi-tcp.cfg \ - " diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto_3.19.bbappend b/meta-openstack/recipes-kernel/linux/linux-yocto_3.19.bbappend new file mode 100644 index 0000000..843546c --- /dev/null +++ b/meta-openstack/recipes-kernel/linux/linux-yocto_3.19.bbappend @@ -0,0 +1,9 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://enable-veth.cfg \ + file://enable-iscsi-tcp.cfg \ + file://enable-nbd.cfg \ + file://enable-rtlink.cfg \ + file://nf.scc \ + file://nfs.scc \ + " diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.16.0.bbappend b/meta-openstack/recipes-support/iproute2/iproute2_3.16.0.bbappend deleted file mode 100644 index 8949646..0000000 --- a/meta-openstack/recipes-support/iproute2/iproute2_3.16.0.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -FILESEXTRAPATHS_append := "${THISDIR}/${PN}" - -RRECOMMENDS_${PN} += "kernel-module-veth \ - " - -SRC_URI += " file://0003-Don-t-enforce-that-dev-already-exists.patch" diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.17.0.bbappend b/meta-openstack/recipes-support/iproute2/iproute2_3.17.0.bbappend new file mode 100644 index 0000000..8949646 --- /dev/null +++ b/meta-openstack/recipes-support/iproute2/iproute2_3.17.0.bbappend @@ -0,0 +1,6 @@ +FILESEXTRAPATHS_append := "${THISDIR}/${PN}" + +RRECOMMENDS_${PN} += "kernel-module-veth \ + " + +SRC_URI += " file://0003-Don-t-enforce-that-dev-already-exists.patch" diff --git a/meta-openstack/recipes-support/xmlto/xmlto_0.0.25.bbappend b/meta-openstack/recipes-support/xmlto/xmlto_0.0.25.bbappend deleted file mode 100644 index 7447c56..0000000 --- a/meta-openstack/recipes-support/xmlto/xmlto_0.0.25.bbappend +++ /dev/null @@ -1 +0,0 @@ -inherit autotools-brokensep diff --git a/meta-openstack/recipes-support/xmlto/xmlto_0.0.26.bbappend b/meta-openstack/recipes-support/xmlto/xmlto_0.0.26.bbappend new file mode 100644 index 0000000..7447c56 --- /dev/null +++ b/meta-openstack/recipes-support/xmlto/xmlto_0.0.26.bbappend @@ -0,0 +1 @@ +inherit autotools-brokensep -- cgit v1.2.3-54-g00ecf