summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Rossi <nathan.rossi@xilinx.com>2014-12-09 15:50:05 +1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-31 10:17:49 +0000
commit40bf6d0d71bd534fadcbc07b6fbba856e50bc534 (patch)
treef2e2e57514c1975eba1a64e962625622f41e2eec
parenta56d726562c3b075d49125d206af56c829b3377b (diff)
downloadopenembedded-core-40bf6d0d71bd534fadcbc07b6fbba856e50bc534.tar.gz
openembedded-core-40bf6d0d71bd534fadcbc07b6fbba856e50bc534.tar.bz2
openembedded-core-40bf6d0d71bd534fadcbc07b6fbba856e50bc534.zip
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>
-rw-r--r--meta/classes/image_types.bbclass6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 6c3a89eefc..8e33214955 100644
--- 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
}