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>

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 944e6dbf2d31491da5156710f1bff3c8b95fe3cb..89749430bc0f253c7f771c13bf11319af389668d 100644 (file)
--- 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)
 }