[oe-commits] Matthieu Crapet : image_types: minor, inline CPIO_TOUCH_INIT()

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: e856e04e6134ce98e89027864f69b2ab48d40dcc
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e856e04e6134ce98e89027864f69b2ab48d40dcc

Author: Matthieu Crapet <Matthieu.Crapet at ingenico.com>
Date:   Mon Feb 17 17:28:58 2014 +0100

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 at ingenico.com>
Signed-off-by: Saul Wold <sgw at linux.intel.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 944e6db..8974943 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)
 }