initial commit for Enea Linux 4.0-140929daisy-140929

Migrated from the internal git server on the daisy-enea-point-release branch

Signed-off-by: Tudor Florea <tudor.florea@enea.com>

4 files changed, 104 insertions, 0 deletions

diff --git a/recipes-containers/lxc/files/init-lxc-mount b/recipes-containers/lxc/files/init-lxc-mount
new file mode 100755
index 0000000..c4c77df
--- /dev/null
+++ b/recipes-containers/lxc/files/init-lxc-mount
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+
+mkdir -p /sys/fs/cgroup/cpuset
+mkdir -p /sys/fs/cgroup/cpu,cpuacct
+mkdir -p /sys/fs/cgroup/devices
+mkdir -p /sys/fs/cgroup/freezer
+mkdir -p /sys/fs/cgroup/memory
+mount cpuset
+mount cpuacct
+mount devices
+mount freezer
+mount memory
diff --git a/recipes-containers/lxc/files/lxc-busybox-support-enea-linux-init.patch b/recipes-containers/lxc/files/lxc-busybox-support-enea-linux-init.patch
new file mode 100644
index 0000000..4eecfaa
--- /dev/null
+++ b/recipes-containers/lxc/files/lxc-busybox-support-enea-linux-init.patch
@@ -0,0 +1,51 @@
+lxc: Modify  lxc-busybox to support  Enea Linux
+
+In Enea Linux, the busybox commands are split between busybox.nosuid (symlinked
+as /bin/busybox) and busybox.suid. This patch enables  the commands provided by
+the latter and also replaces the busybox init with the SysV counterpart.
+
+Upstream-Status: Pending
+
+Signed-off-by: Petre Pircalabu <petre.pircalabu@enea.com>
+
+--- a/templates/lxc-busybox.in
++++ b/templates/lxc-busybox.in
+@@ -129,6 +129,7 @@ EOF
+     # and propose a shell on the tty, the last one is
+     # not needed
+     cat <<EOF >> $rootfs/etc/inittab
++id:5:initdefault:
+ ::sysinit:/etc/init.d/rcS
+ tty1::respawn:/bin/getty -L tty1 115200 vt100
+ console::askfirst:/bin/sh
+@@ -209,8 +210,28 @@ configure_busybox()
+       xargs -n1 ln -s busybox
+     popd > /dev/null
+ 
+-    # relink /sbin/init
+-    ln $rootfs/bin/busybox $rootfs/sbin/init
++    which busybox.suid >/dev/null 2>&1
++
++    if [ $? -eq 0 ]; then
++       # copy busybox.suid in the rootfs
++       cp $(which busybox.suid) $rootfs/bin
++       if [ $? -ne 0 ]; then
++            echo "failed to copy busybox.suid in the rootfs"
++            return 1
++       fi
++
++       pushd $rootfs/bin > /dev/null || return 1
++       ./busybox.suid --help | grep 'Currently defined functions:' -A300 | \
++           grep -v 'Currently defined functions:' | tr , '\n' | \
++           xargs -n1 ln -s busybox.suid
++       popd > /dev/null
++    fi
++
++    # use SysV init
++    pushd $rootfs/sbin > /dev/null || return 1
++    cp /sbin/init.sysvinit .
++    ln -s init.sysvinit init
++    popd > /dev/null
+ 
+     # passwd exec must be setuid
+     chmod +s $rootfs/bin/passwd
diff --git a/recipes-containers/lxc/files/lxc-test-attach-replace-cmp-with-grep.patch b/recipes-containers/lxc/files/lxc-test-attach-replace-cmp-with-grep.patch
new file mode 100644
index 0000000..88d2450
--- /dev/null
+++ b/recipes-containers/lxc/files/lxc-test-attach-replace-cmp-with-grep.patch
@@ -0,0 +1,24 @@
+lxc: Update lxc-test-attach
+
+For Enea Linux, the SysV init file is different from busybox, causing cmp  to 
+return an error. In order to preserve the test's logic it was replaced with a
+command which succeeds  in every situation: 
+(e.g. search for  root in /etc/passwd using grep).
+
+Upstream-Status: Pending
+
+Signed-off-by: Petre Pircalabu <petre.pircalabu@enea.com>
+
+--- a/src/tests/attach.c
++++ b/src/tests/attach.c
+@@ -237,8 +237,8 @@ static int test_attach_cmd(struct lxc_co
+ {
+        int ret;
+        pid_t pid;
+-       char *argv[] = {"cmp", "-s", "/sbin/init", "/bin/busybox", NULL};
+-       lxc_attach_command_t command = {"cmp", argv};
++       char *argv[] = {"grep", "-q", "root", "/etc/passwd", NULL};
++       lxc_attach_command_t command = {"grep", argv};
+        lxc_attach_options_t attach_options = LXC_ATTACH_OPTIONS_DEFAULT;
+ 
+        TSTOUT("Testing attach with success command...\n");
diff --git a/recipes-containers/lxc/lxc_1.0.1.bbappend b/recipes-containers/lxc/lxc_1.0.1.bbappend
new file mode 100644
index 0000000..c3311d6
--- /dev/null
+++ b/recipes-containers/lxc/lxc_1.0.1.bbappend
@@ -0,0 +1,17 @@
+FILESEXTRAPATHS_append := ":${THISDIR}/files"
+SRC_URI_append = " file://init-lxc-mount"
+SRC_URI_append = " file://lxc-busybox-support-enea-linux-init.patch"
+SRC_URI_append = " file://lxc-test-attach-replace-cmp-with-grep.patch"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "init-lxc-mount"
+
+EXTRA_OEMAKE_append_imx6qsabrelite = " CFLAGS=-D_FILE_OFFSET_BITS=64"
+
+do_install_append() {
+       install -d ${D}${sysconfdir}/init.d
+       install -m 0755 ${WORKDIR}/init-lxc-mount ${D}${sysconfdir}/init.d/init-lxc-mount
+}
+
+FILES_${PN} += "${sysconfdir}/init.d/init-lxc-mount"