[meta-freescale] [PATCH 5/5] lxc: move patches to default search path
Liu Ting-B28495
B28495 at freescale.com
Thu Dec 27 23:50:19 PST 2012
Moved to meta-virtualization:
http://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/commit/?id=7a62620ea09f01c1f2a730cbb1264202276f2b87
-Ting
> -----Original Message-----
> From: McClintock Matthew-B29882
> Sent: Wednesday, December 05, 2012 12:18 AM
> To: Liu Ting-B28495; Yoder Stuart-B08248
> Cc: meta-freescale at yoctoproject.org
> Subject: Re: [meta-freescale] [PATCH 5/5] lxc: move patches to default
> search path
>
> On Tue, Dec 4, 2012 at 2:22 AM, <b28495 at freescale.com> wrote:
> > From: Ting Liu <b28495 at freescale.com>
>
> Just a comment here, we should probably move lxc to the new metal-
> virtualization layer soon.
>
> -M
>
> > Signed-off-by: Ting Liu <b28495 at freescale.com>
> > ---
> > recipes-tools/lxc/busybox_remove_dhcp.patch | 12 -----
> > recipes-tools/lxc/files/busybox_remove_dhcp.patch | 12 +++++
> > recipes-tools/lxc/files/libmounts.patch | 48
> +++++++++++++++++++++
> > recipes-tools/lxc/files/noldconfig.patch | 29 ++++++++++++
> > recipes-tools/lxc/files/remove_vlan_hwaddr.patch | 11 +++++
> > recipes-tools/lxc/libmounts.patch | 48 -------------
> --------
> > recipes-tools/lxc/noldconfig.patch | 29 ------------
> > recipes-tools/lxc/remove_vlan_hwaddr.patch | 11 -----
> > 8 files changed, 100 insertions(+), 100 deletions(-) delete mode
> > 100644 recipes-tools/lxc/busybox_remove_dhcp.patch
> > create mode 100644 recipes-tools/lxc/files/busybox_remove_dhcp.patch
> > create mode 100644 recipes-tools/lxc/files/libmounts.patch
> > create mode 100644 recipes-tools/lxc/files/noldconfig.patch
> > create mode 100644 recipes-tools/lxc/files/remove_vlan_hwaddr.patch
> > delete mode 100644 recipes-tools/lxc/libmounts.patch delete mode
> > 100644 recipes-tools/lxc/noldconfig.patch
> > delete mode 100644 recipes-tools/lxc/remove_vlan_hwaddr.patch
> >
> > diff --git a/recipes-tools/lxc/busybox_remove_dhcp.patch
> > b/recipes-tools/lxc/busybox_remove_dhcp.patch
> > deleted file mode 100644
> > index d28fda8..0000000
> > --- a/recipes-tools/lxc/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/recipes-tools/lxc/files/busybox_remove_dhcp.patch
> > b/recipes-tools/lxc/files/busybox_remove_dhcp.patch
> > new file mode 100644
> > index 0000000..d28fda8
> > --- /dev/null
> > +++ b/recipes-tools/lxc/files/busybox_remove_dhcp.patch
> > @@ -0,0 +1,12 @@
> > +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/recipes-tools/lxc/files/libmounts.patch
> > b/recipes-tools/lxc/files/libmounts.patch
> > new file mode 100644
> > index 0000000..7e092f1
> > --- /dev/null
> > +++ b/recipes-tools/lxc/files/libmounts.patch
> > @@ -0,0 +1,48 @@
> > +From dfef62f0334c65397254215f809a8f25364ea6ef Mon Sep 17 00:00:00
> > +2001
> > +From: Stuart Yoder <stuart.yoder at 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 at 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/recipes-tools/lxc/files/noldconfig.patch
> > b/recipes-tools/lxc/files/noldconfig.patch
> > new file mode 100644
> > index 0000000..5edff46
> > --- /dev/null
> > +++ b/recipes-tools/lxc/files/noldconfig.patch
> > @@ -0,0 +1,29 @@
> > +From a8aa8d131a7140d5625c24c9f4c28c605213552c Mon Sep 17 00:00:00
> > +2001
> > +From: Andrey Mazo <ahippo at 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/recipes-tools/lxc/files/remove_vlan_hwaddr.patch
> > b/recipes-tools/lxc/files/remove_vlan_hwaddr.patch
> > new file mode 100644
> > index 0000000..d3883bd
> > --- /dev/null
> > +++ b/recipes-tools/lxc/files/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
> > diff --git a/recipes-tools/lxc/libmounts.patch
> > b/recipes-tools/lxc/libmounts.patch
> > deleted file mode 100644
> > index 7e092f1..0000000
> > --- a/recipes-tools/lxc/libmounts.patch
> > +++ /dev/null
> > @@ -1,48 +0,0 @@
> > -From dfef62f0334c65397254215f809a8f25364ea6ef Mon Sep 17 00:00:00
> > 2001
> > -From: Stuart Yoder <stuart.yoder at 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 at 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/recipes-tools/lxc/noldconfig.patch
> > b/recipes-tools/lxc/noldconfig.patch
> > deleted file mode 100644
> > index 5edff46..0000000
> > --- a/recipes-tools/lxc/noldconfig.patch
> > +++ /dev/null
> > @@ -1,29 +0,0 @@
> > -From a8aa8d131a7140d5625c24c9f4c28c605213552c Mon Sep 17 00:00:00
> > 2001
> > -From: Andrey Mazo <ahippo at 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/recipes-tools/lxc/remove_vlan_hwaddr.patch
> > b/recipes-tools/lxc/remove_vlan_hwaddr.patch
> > deleted file mode 100644
> > index d3883bd..0000000
> > --- a/recipes-tools/lxc/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
> > --
> > 1.7.3.4
> >
> >
> > _______________________________________________
> > meta-freescale mailing list
> > meta-freescale at yoctoproject.org
> > https://lists.yoctoproject.org/listinfo/meta-freescale
More information about the meta-freescale
mailing list