summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnrico Scholz <enrico.scholz@sigma-chemnitz.de>2015-01-22 17:13:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-29 15:36:48 +0000
commite598bd52eff8bf85cfe3b0d719c97c5ed25f8ebb (patch)
treee863187e5af0d2dd5319cbb61a32f3614b8577d0
parent579aa720a4d40670de02d9a9840e8f6cf1c6078d (diff)
downloadpoky-e598bd52eff8bf85cfe3b0d719c97c5ed25f8ebb.tar.gz
image_types.bbclass: fixed 'init' creation for cpio images
When /init is a dangling symlink or a symlink to a file which can not be stated on the build system (e.g. due to SELinux restrictions), the '[ ! -e .../init ]' test will succeed which causes the manual creation of /init. E.g. here: | $ ls -la cpio_append/init | lrwxrwxrwx. 1 ensc ensc 10 22. Jan 16:26 cpio_append/init -> /sbin/init | | $ strace /bin/test -e cpio_append/init | stat("cpio_append/init", 0x7fff374a9db0) = -1 EACCES (Permission denied) | exit_group(1) = ? To test for the existence of a file, both '-L' and '-e' checks must be executed and to prevent SELinux noise, the '-L' should happen before '-e'. (From OE-Core rev: 2aa5d2880ee3578f4965f245addd365fb7b1c1ca) Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image_types.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 02b107c7c1..80a67bae47 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -70,9 +70,9 @@ IMAGE_CMD_tar = "tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar -C ${IMAG
70 70
71IMAGE_CMD_cpio () { 71IMAGE_CMD_cpio () {
72 (cd ${IMAGE_ROOTFS} && find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) 72 (cd ${IMAGE_ROOTFS} && find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio)
73 if [ ! -e ${IMAGE_ROOTFS}/init ]; then 73 if [ ! -L ${IMAGE_ROOTFS}/init -a ! -e ${IMAGE_ROOTFS}/init ]; then
74 mkdir -p ${WORKDIR}/cpio_append 74 mkdir -p ${WORKDIR}/cpio_append
75 if [ -e ${IMAGE_ROOTFS}/sbin/init -o -L ${IMAGE_ROOTFS}/sbin/init ]; then 75 if [ -L ${IMAGE_ROOTFS}/sbin/init -o -e ${IMAGE_ROOTFS}/sbin/init ]; then
76 ln -sf /sbin/init ${WORKDIR}/cpio_append/init 76 ln -sf /sbin/init ${WORKDIR}/cpio_append/init
77 else 77 else
78 touch ${WORKDIR}/cpio_append/init 78 touch ${WORKDIR}/cpio_append/init