image_types.bbclass: Populate cpio /init as symlink

For cpio/ramfs the kernel will first attempt to execute /init and will
emit the following error as the file is empty:

    Failed to execute /init (error -13)

If /sbin/init exists symlink to it so the kernel can immediately start
the correct init executable instead of an empty file.

(From OE-Core rev: 3505558e067fdde4ab7aaaf3c50886f292d7c166)

Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 6c3a89eefcc601e703998c435643edcf0beb152a..8e33214955698252937c97d948a6eda01fd10eaa 100644 (file)
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -70,7 +70,11 @@ IMAGE_CMD_cpio () {
        (cd ${IMAGE_ROOTFS} && find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio)
        if [ ! -e ${IMAGE_ROOTFS}/init ]; then
                mkdir -p ${WORKDIR}/cpio_append
-               touch ${WORKDIR}/cpio_append/init
+               if [ -e ${IMAGE_ROOTFS}/sbin/init -o -L ${IMAGE_ROOTFS}/sbin/init ]; then
+                       ln -sf /sbin/init ${WORKDIR}/cpio_append/init
+               else
+                       touch ${WORKDIR}/cpio_append/init
+               fi
                (cd  ${WORKDIR}/cpio_append && echo ./init | cpio -oA -H newc -F ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio)
        fi
 }