diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-06 22:57:49 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-11 23:26:29 +0000 |
commit | 3341f3fbee818a0bd62620b8bc34230b03c0689c (patch) | |
tree | 40b07685cb19f5afb62066f837689d24e55cfbce /meta/classes/image_types.bbclass | |
parent | 0a4e1f968ada5099e3270ed06404d2827e9729aa (diff) | |
download | poky-3341f3fbee818a0bd62620b8bc34230b03c0689c.tar.gz |
classes: Fix do_rootfs references
After the separation of do_rootfs, some rootfs references need changing
to image_complete.
(From OE-Core rev: 59a5f596ca29b1eb8283706e3c60fbb39f9c2c23)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image_types.bbclass')
-rw-r--r-- | meta/classes/image_types.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index dea3bb0ede..0bf48c0202 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass | |||
@@ -93,7 +93,7 @@ IMAGE_CMD_squashfs-lzo = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE | |||
93 | IMAGE_CMD_TAR ?= "tar" | 93 | IMAGE_CMD_TAR ?= "tar" |
94 | IMAGE_CMD_tar = "${IMAGE_CMD_TAR} -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar -C ${IMAGE_ROOTFS} ." | 94 | IMAGE_CMD_tar = "${IMAGE_CMD_TAR} -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar -C ${IMAGE_ROOTFS} ." |
95 | 95 | ||
96 | do_rootfs[cleandirs] += "${WORKDIR}/cpio_append" | 96 | do_image_cpio[cleandirs] += "${WORKDIR}/cpio_append" |
97 | IMAGE_CMD_cpio () { | 97 | IMAGE_CMD_cpio () { |
98 | (cd ${IMAGE_ROOTFS} && find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) | 98 | (cd ${IMAGE_ROOTFS} && find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) |
99 | if [ ! -L ${IMAGE_ROOTFS}/init -a ! -e ${IMAGE_ROOTFS}/init ]; then | 99 | if [ ! -L ${IMAGE_ROOTFS}/init -a ! -e ${IMAGE_ROOTFS}/init ]; then |
@@ -200,8 +200,8 @@ IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES" | |||
200 | 200 | ||
201 | # Rebuild when the wks file or vars in WICVARS change | 201 | # Rebuild when the wks file or vars in WICVARS change |
202 | USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${COMPRESSIONTYPES}'.split()), '1', '', d)}" | 202 | USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${COMPRESSIONTYPES}'.split()), '1', '', d)}" |
203 | do_rootfs[file-checksums] += "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}" | 203 | do_image_wic[file-checksums] += "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}" |
204 | do_rootfs[vardeps] += "${@bb.utils.contains("USING_WIC", "1", "${WICVARS}", "", d)}" | 204 | do_image_wic[vardeps] += "${@bb.utils.contains("USING_WIC", "1", "${WICVARS}", "", d)}" |
205 | 205 | ||
206 | EXTRA_IMAGECMD = "" | 206 | EXTRA_IMAGECMD = "" |
207 | 207 | ||