[OE-core] [PATCH] image_types: minor, inline CPIO_TOUCH_INIT()
Matthieu Crapet
Matthieu.Crapet at ingenico.com
Mon Feb 17 16:28:58 UTC 2014
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 at ingenico.com>
---
meta/classes/image_types.bbclass | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 0467abd..27b0796 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 = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ."
-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)
}
--
1.8.5.4
More information about the Openembedded-core
mailing list