From 3830acbfe6a277aea2a6305cd78cdbe6f58eee15 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 4 Sep 2014 00:43:53 -0400 Subject: iproute/libssd: update to match meta-oe latest Not only do we update to meta-oe latest, we inherit the following issue that prevents instance creation: https://bugs.launchpad.net/ubuntu/+source/neutron/+bug/1364828 To fix the issue, we import 0003-Don-t-enforce-that-dev-already-exists.patch, until it is integrated into the upstream package. Signed-off-by: Bruce Ashfield --- ...003-Don-t-enforce-that-dev-already-exists.patch | 27 ++++++++++++++++++++++ .../iproute2/iproute2_3.15.0.bbappend | 2 -- .../iproute2/iproute2_3.16.0.bbappend | 6 +++++ .../recipes-support/libbsd/libbsd_0.6.0.bbappend | 1 - .../recipes-support/libbsd/libbsd_0.7.0.bbappend | 1 + 5 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 meta-openstack/recipes-support/iproute2/iproute2/0003-Don-t-enforce-that-dev-already-exists.patch delete mode 100644 meta-openstack/recipes-support/iproute2/iproute2_3.15.0.bbappend create mode 100644 meta-openstack/recipes-support/iproute2/iproute2_3.16.0.bbappend delete mode 100644 meta-openstack/recipes-support/libbsd/libbsd_0.6.0.bbappend create mode 100644 meta-openstack/recipes-support/libbsd/libbsd_0.7.0.bbappend (limited to 'meta-openstack') diff --git a/meta-openstack/recipes-support/iproute2/iproute2/0003-Don-t-enforce-that-dev-already-exists.patch b/meta-openstack/recipes-support/iproute2/iproute2/0003-Don-t-enforce-that-dev-already-exists.patch new file mode 100644 index 0000000..b296abe --- /dev/null +++ b/meta-openstack/recipes-support/iproute2/iproute2/0003-Don-t-enforce-that-dev-already-exists.patch @@ -0,0 +1,27 @@ +From 4a5577fab7490573ceaafa6e4417cf03bca178f1 Mon Sep 17 00:00:00 2001 +Message-Id: <4a5577fab7490573ceaafa6e4417cf03bca178f1.1407786415.git.agx@sigxcpu.org> +From: =?UTF-8?q?Guido=20G=C3=BCnther?= +Date: Mon, 11 Aug 2014 21:41:51 +0200 +Subject: [PATCH] Don't enforce that dev already exists + +Commit 9a02651a87d0fd56e2e7eedd63921a050a42b3ec tried to make sure +the device can be looked up but that e.g. isn't true for + + ip link add vnet10 type veth peer name vnet11 + +where vnet10 isn't yet existent. +--- + ip/iplink.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/ip/iplink.c ++++ b/ip/iplink.c +@@ -571,8 +571,6 @@ int iplink_parse(int argc, char **argv, + duparg2("dev", *argv); + *dev = *argv; + dev_index = ll_name_to_index(*dev); +- if (dev_index == 0) +- invarg("Unknown device", *argv); + } + argc--; argv++; + } diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.15.0.bbappend b/meta-openstack/recipes-support/iproute2/iproute2_3.15.0.bbappend deleted file mode 100644 index 34ad5b8..0000000 --- a/meta-openstack/recipes-support/iproute2/iproute2_3.15.0.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -RRECOMMENDS_${PN} += "kernel-module-veth \ - " diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.16.0.bbappend b/meta-openstack/recipes-support/iproute2/iproute2_3.16.0.bbappend new file mode 100644 index 0000000..8949646 --- /dev/null +++ b/meta-openstack/recipes-support/iproute2/iproute2_3.16.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/libbsd/libbsd_0.6.0.bbappend b/meta-openstack/recipes-support/libbsd/libbsd_0.6.0.bbappend deleted file mode 100644 index 7447c56..0000000 --- a/meta-openstack/recipes-support/libbsd/libbsd_0.6.0.bbappend +++ /dev/null @@ -1 +0,0 @@ -inherit autotools-brokensep diff --git a/meta-openstack/recipes-support/libbsd/libbsd_0.7.0.bbappend b/meta-openstack/recipes-support/libbsd/libbsd_0.7.0.bbappend new file mode 100644 index 0000000..7447c56 --- /dev/null +++ b/meta-openstack/recipes-support/libbsd/libbsd_0.7.0.bbappend @@ -0,0 +1 @@ +inherit autotools-brokensep -- cgit v1.2.3-54-g00ecf