remove lxc since it's now in meta-virt

Signed-off-by: Matthew McClintock <msm@freescale.com>

diff --git a/meta-fsl-ppc/recipes-tools/lxc/files/busybox_remove_dhcp.patch b/meta-fsl-ppc/recipes-tools/lxc/files/busybox_remove_dhcp.patch
deleted file mode 100644 (file)
index d28fda8..0000000
--- a/meta-fsl-ppc/recipes-tools/lxc/files/busybox_remove_dhcp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in
-index a94eaa3..29b87ce 100644
---- a/templates/lxc-busybox.in
-+++ b/templates/lxc-busybox.in
-@@ -80,7 +80,6 @@ EOF
- #!/bin/sh
- /bin/syslogd
- /bin/mount -a
--/bin/udhcpc
- EOF
- 
-     # executable

diff --git a/meta-fsl-ppc/recipes-tools/lxc/files/fix_setns_deps.patch b/meta-fsl-ppc/recipes-tools/lxc/files/fix_setns_deps.patch
deleted file mode 100644 (file)
index 7ec875c..0000000
--- a/meta-fsl-ppc/recipes-tools/lxc/files/fix_setns_deps.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: lxc-0.8.0-rc1/src/lxc/Makefile.am
-===================================================================
---- lxc-0.8.0-rc1.orig/src/lxc/Makefile.am
-+++ lxc-0.8.0-rc1/src/lxc/Makefile.am
-@@ -133,6 +133,7 @@ uninstall-local:
-       $(RM) $(DESTDIR)$(libdir)/liblxc.so*
- 
- namespace.c: setns.h
-+attach.c: setns.h
- 
- setns.h:
-       -$(CC) $(CPPFLAGS) -M -MT$@ $(LINUX_DIR)/arch/$(LINUX_SRCARCH)/include/asm/unistd.h >setns.P

diff --git a/meta-fsl-ppc/recipes-tools/lxc/files/libmounts.patch b/meta-fsl-ppc/recipes-tools/lxc/files/libmounts.patch
deleted file mode 100644 (file)
index 7e092f1..0000000
--- a/meta-fsl-ppc/recipes-tools/lxc/files/libmounts.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From dfef62f0334c65397254215f809a8f25364ea6ef Mon Sep 17 00:00:00 2001
-From: Stuart Yoder <stuart.yoder@freescale.com>
-Date: Wed, 12 Sep 2012 11:05:07 -0500
-Subject: [PATCH] create lib mounts only if the host directories exist
-
-Signed-off-by: Stuart Yoder <stuart.yoder@freescale.com>
----
- templates/lxc-busybox.in |   24 +++++++++++-------------
- 1 file changed, 11 insertions(+), 13 deletions(-)
-
-diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in
-index 720ceef..f6cb1ba 100644
---- a/templates/lxc-busybox.in
-+++ b/templates/lxc-busybox.in
-@@ -235,19 +235,17 @@ lxc.pts = 1
- lxc.rootfs = $rootfs
- EOF
- 
--if [ -d "$rootfs/lib" ]; then
--cat <<EOF >> $path/config
--lxc.mount.entry=/lib $rootfs/lib none ro,bind 0 0
--lxc.mount.entry=/usr/lib $rootfs/usr/lib none ro,bind 0 0
--EOF
--fi
--
--if [ -d "/lib64" ] && [ -d "$rootfs/lib64" ]; then
--cat <<EOF >> $path/config
--lxc.mount.entry=/lib64 $rootfs/lib64 none ro,bind 0 0
--lxc.mount.entry=/usr/lib64 $rootfs/usr/lib64 none ro,bind 0 0
--EOF
--fi
-+    libdirs="\
-+        /lib \
-+        /usr/lib \
-+        /lib64 \
-+        /usr/lib64"
-+
-+    for dir in $libdirs; do
-+        if [ -d $dir ]; then
-+            echo "lxc.mount.entry=$dir $rootfs$dir none ro,bind 0 0" >> $path/config
-+        fi
-+    done
- }
- 
- usage()
--- 
-1.7.9.7
-

diff --git a/meta-fsl-ppc/recipes-tools/lxc/files/noldconfig.patch b/meta-fsl-ppc/recipes-tools/lxc/files/noldconfig.patch
deleted file mode 100644 (file)
index 5edff46..0000000
--- a/meta-fsl-ppc/recipes-tools/lxc/files/noldconfig.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a8aa8d131a7140d5625c24c9f4c28c605213552c Mon Sep 17 00:00:00 2001
-From: Andrey Mazo <ahippo@yandex.ru>
-Date: Fri, 18 May 2012 21:11:22 +0400
-Subject: [PATCH] Avoid ldconfig due to cross-compilation problems.
-
-Make required symlinks manually.
-Otherwise, it cases problems on cbuild endianness != ctarget endianness
-setups because /sbin/ldconfig expects elf header in the wrong endianness.
----
- src/lxc/Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
-index 1c26952..3b84c1a 100644
---- a/src/lxc/Makefile.am
-+++ b/src/lxc/Makefile.am
-@@ -125,8 +125,8 @@ lxc_kill_SOURCES = lxc_kill.c
- 
- install-exec-local: install-soPROGRAMS
-       mv $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
--      /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
-       cd $(DESTDIR)$(libdir); \
-+      ln -sf liblxc.so.$(VERSION) liblxc.so.$(firstword $(subst ., ,$(VERSION))); \
-       ln -sf liblxc.so.$(firstword $(subst ., ,$(VERSION))) liblxc.so
- 
- uninstall-local:
--- 
-1.7.3.4
-

diff --git a/meta-fsl-ppc/recipes-tools/lxc/files/remove_vlan_hwaddr.patch b/meta-fsl-ppc/recipes-tools/lxc/files/remove_vlan_hwaddr.patch
deleted file mode 100644 (file)
index d3883bd..0000000
--- a/meta-fsl-ppc/recipes-tools/lxc/files/remove_vlan_hwaddr.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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

diff --git a/meta-fsl-ppc/recipes-tools/lxc/lxc_0.8.0-rc1.bb b/meta-fsl-ppc/recipes-tools/lxc/lxc_0.8.0-rc1.bb
deleted file mode 100644 (file)
index ee6b09e..0000000
--- a/meta-fsl-ppc/recipes-tools/lxc/lxc_0.8.0-rc1.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-DESCRIPTION = "lxc aims to use these new functionnalities to provide an userspace container object"
-SECTION = "console/utils"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
-PRIORITY = "optional"
-PR = "r7"
-DEPENDS = "libxml2 libcap virtual/kernel"
-RDEPENDS_${PN} = " \
-               rsync \
-               gzip \
-               libcap-bin \
-               perl-module-strict \
-               perl-module-getopt-long \
-               perl-module-vars \
-               perl-module-exporter \
-               perl-module-constant \
-               perl-module-overload \
-               perl-module-exporter-heavy \
-"
-
-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 \
-       file://fix_setns_deps.patch \
-       "
-
-SRC_URI[md5sum] ="06ceecf4dbe1be988fc903ad8dd34d29"
-SRC_URI[sha256sum] = "32bf83902c07387646c55de440d6d12cf61bd54c97417109c2d1ac47d17cb911"
-
-S = "${WORKDIR}/${PN}-${PV}"
-
-EXTRA_OECONF = "--disable-doc --disable-rpath --with-linuxdir=${STAGING_KERNEL_DIR}"
-
-inherit autotools
-
-FILES_${PN}-dbg += "${libexecdir}/lxc/.debug"
-
-# create empty dir needed by lxc
-do_install_append() {
-       install -d ${D}${localstatedir}/lib/lxc
-}