diff options
| author |   Jonas Eriksson <jonas.eriksson@enea.com> | 2014-03-24 16:56:05 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-26 12:15:11 +0000 |
| commit | 706055503f493a5af73240c0983c46dbe31d8fe9 (patch) | |
| tree | c1eb6aa3048e47c738962fbf84697dfcb6c7de24 /meta/classes | |
| parent | 46b80c80b0e008820b34f4360054e1697df2650d (diff) | |
| download | openembedded-core-contrib-706055503f493a5af73240c0983c46dbe31d8fe9.tar.gz | |
cpio rootfs build: Avoid modifying rootfs dir
The Linux kernel requires that initrd images contain a /init file for
the image to be used as an initrd, even if it is empty. Adding it into
the rootfs directory creates a race, that can upset tar when building
both a .tar and .cpio image file ("tar: .: file changed as we read it").
Additionally, whether or not the tar file will contain the /init file is
also up to the race condition.
To avoid this problem, move the /init addition out from the rootfs
directory, and thus only include it in the .cpio image.
Signed-off-by: Jonas Eriksson <jonas.eriksson@enea.com>
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
Cc: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/image_types.bbclass | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index b693317a9f..f38e3b6a11 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -66,10 +66,12 @@ IMAGE_CMD_squashfs-xz = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_ IMAGE_CMD_tar = "tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar -C ${IMAGE_ROOTFS} ." IMAGE_CMD_cpio () { - if [ ! -L ${IMAGE_ROOTFS}/init ]; then - touch ${IMAGE_ROOTFS}/init - fi (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 + (cd ${WORKDIR}/cpio_append && echo ./init | cpio -oA -H newc -F ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) + fi } ELF_KERNEL ?= "${STAGING_DIR_HOST}/usr/src/kernel/${KERNEL_IMAGETYPE}" |