diff options
author | Matthieu Crapet <Matthieu.Crapet@ingenico.com> | 2014-02-17 17:28:58 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-20 14:28:10 +0000 |
commit | bc124dab9ed6dc98ac2dcbaf0d3df35ffaeb37ea (patch) | |
tree | 67c64a2099bfcbb3f47a963ddc7bc3a5f5a1acd8 | |
parent | 4166062ea72fec32cb23b7b67f1e3a8e412a91ba (diff) | |
download | poky-bc124dab9ed6dc98ac2dcbaf0d3df35ffaeb37ea.tar.gz |
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.
(From OE-Core rev: e856e04e6134ce98e89027864f69b2ab48d40dcc)
Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/image_types.bbclass | 10 |
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 | |||
66 | IMAGE_CMD_squashfs-xz = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-xz ${EXTRA_IMAGECMD} -noappend -comp xz" | 66 | IMAGE_CMD_squashfs-xz = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-xz ${EXTRA_IMAGECMD} -noappend -comp xz" |
67 | IMAGE_CMD_tar = "tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar -C ${IMAGE_ROOTFS} ." | 67 | IMAGE_CMD_tar = "tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar -C ${IMAGE_ROOTFS} ." |
68 | 68 | ||
69 | CPIO_TOUCH_INIT () { | ||
70 | if [ ! -L ${IMAGE_ROOTFS}/init ] | ||
71 | then | ||
72 | touch ${IMAGE_ROOTFS}/init | ||
73 | fi | ||
74 | } | ||
75 | IMAGE_CMD_cpio () { | 69 | IMAGE_CMD_cpio () { |
76 | ${CPIO_TOUCH_INIT} | 70 | if [ ! -L ${IMAGE_ROOTFS}/init ]; then |
71 | touch ${IMAGE_ROOTFS}/init | ||
72 | fi | ||
77 | cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) | 73 | cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) |
78 | } | 74 | } |
79 | 75 | ||