From 8574faf4ca824c07c0b185a2758e725fce94a773 Mon Sep 17 00:00:00 2001 From: Stuart Yoder Date: Wed, 10 Oct 2012 03:28:28 +0000 Subject: lxc: remove hwaddr from vlan config -to get vlan working with the FSL SDK we need to remove the hwaddr. This was found by trial and error. Upstream discussion is started as to when the hwaddr might be needed, but for now remove it Signed-off-by: Stuart Yoder --- recipes-tools/lxc/lxc_0.8.0-rc1.bb | 3 ++- recipes-tools/lxc/remove_vlan_hwaddr.patch | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 recipes-tools/lxc/remove_vlan_hwaddr.patch diff --git a/recipes-tools/lxc/lxc_0.8.0-rc1.bb b/recipes-tools/lxc/lxc_0.8.0-rc1.bb index e6ed2d6..c8d90ae 100644 --- a/recipes-tools/lxc/lxc_0.8.0-rc1.bb +++ b/recipes-tools/lxc/lxc_0.8.0-rc1.bb @@ -3,7 +3,7 @@ SECTION = "console/utils" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" PRIORITY = "optional" -PR = "r2" +PR = "r3" DEPENDS = "libxml2 libcap" RDEPENDS_${PN} = " \ rsync \ @@ -23,6 +23,7 @@ SRC_URI = "http://lxc.sourceforge.net/download/lxc/${PN}-${PV}.tar.gz \ file://noldconfig.patch \ file://libmounts.patch \ file://busybox_remove_dhcp.patch \ + file://remove_vlan_hwaddr.patch \ " SRC_URI[md5sum] ="06ceecf4dbe1be988fc903ad8dd34d29" diff --git a/recipes-tools/lxc/remove_vlan_hwaddr.patch b/recipes-tools/lxc/remove_vlan_hwaddr.patch new file mode 100644 index 0000000..d3883bd --- /dev/null +++ b/recipes-tools/lxc/remove_vlan_hwaddr.patch @@ -0,0 +1,11 @@ +diff --git a/doc/examples/lxc-vlan.conf.in b/doc/examples/lxc-vlan.conf.in +index 4404439..231d618 100644 +--- a/doc/examples/lxc-vlan.conf.in ++++ b/doc/examples/lxc-vlan.conf.in +@@ -4,6 +4,5 @@ lxc.network.type = vlan + lxc.network.vlan.id = 1234 + lxc.network.flags = up + lxc.network.link = eth0 +-lxc.network.hwaddr = 4a:49:43:49:79:bd + lxc.network.ipv4 = 1.2.3.4/24 + lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596 -- cgit v1.2.3-54-g00ecf