summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorMatthieu Crapet <Matthieu.Crapet@ingenico.com>2014-02-17 17:28:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-20 14:22:19 +0000
commite856e04e6134ce98e89027864f69b2ab48d40dcc (patch)
tree45aaa2131359af57467c8a6e08d4baf3b722d444 /meta
parentf0dcbbdcc37da12f84f730b8235f50be8c150c50 (diff)
downloadopenembedded-core-e856e04e6134ce98e89027864f69b2ab48d40dcc.tar.gz
openembedded-core-e856e04e6134ce98e89027864f69b2ab48d40dcc.tar.bz2
openembedded-core-e856e04e6134ce98e89027864f69b2ab48d40dcc.zip
image_types: minor, inline CPIO_TOUCH_INIT()
Since generic compression solution has been introduced (see revision b7e4ed41ee480f00b7265341e9e2d2c2b9135143), CPIO_TOUCH_INIT() is only called by IMAGE_CMD_cpio. Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/image_types.bbclass10
1 files changed, 3 insertions, 7 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 944e6dbf2d..89749430bc 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -66,14 +66,10 @@ IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAM
IMAGE_CMD_squashfs-xz = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-xz ${EXTRA_IMAGECMD} -noappend -comp xz"
IMAGE_CMD_tar = "tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar -C ${IMAGE_ROOTFS} ."
-CPIO_TOUCH_INIT () {
- if [ ! -L ${IMAGE_ROOTFS}/init ]
- then
- touch ${IMAGE_ROOTFS}/init
- fi
-}
IMAGE_CMD_cpio () {
- ${CPIO_TOUCH_INIT}
+ 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)
}