summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-06 22:57:49 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-11 23:26:29 +0000
commit3341f3fbee818a0bd62620b8bc34230b03c0689c (patch)
tree40b07685cb19f5afb62066f837689d24e55cfbce
parent0a4e1f968ada5099e3270ed06404d2827e9729aa (diff)
downloadpoky-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>
-rw-r--r--meta/classes/image-live.bbclass4
-rw-r--r--meta/classes/image-vm.bbclass4
-rw-r--r--meta/classes/image.bbclass4
-rw-r--r--meta/classes/image_types.bbclass6
-rw-r--r--meta/classes/kernel-fitimage.bbclass2
-rw-r--r--meta/classes/kernel.bbclass2
-rw-r--r--meta/classes/rm_work.bbclass6
-rw-r--r--meta/classes/testimage-auto.bbclass2
8 files changed, 17 insertions, 13 deletions
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index 4a7e2b7557..624ff38dc2 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -9,8 +9,8 @@ LABELS_append = " ${SYSLINUX_LABELS} "
9 9
10ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4" 10ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4"
11 11
12do_bootimg[depends] += "${INITRD_IMAGE}:do_rootfs" 12do_bootimg[depends] += "${INITRD_IMAGE}:do_image_complete"
13do_bootimg[depends] += "${PN}:do_rootfs" 13do_bootimg[depends] += "${PN}:do_image_complete"
14 14
15inherit bootimg 15inherit bootimg
16 16
diff --git a/meta/classes/image-vm.bbclass b/meta/classes/image-vm.bbclass
index 575a4b7ffe..d214bf8862 100644
--- a/meta/classes/image-vm.bbclass
+++ b/meta/classes/image-vm.bbclass
@@ -6,10 +6,10 @@ LABELS_append = " ${SYSLINUX_LABELS} "
6# Using an initramfs is optional. Enable it by setting INITRD_IMAGE. 6# Using an initramfs is optional. Enable it by setting INITRD_IMAGE.
7INITRD_IMAGE ?= "" 7INITRD_IMAGE ?= ""
8INITRD ?= "${@'${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz' if '${INITRD_IMAGE}' else ''}" 8INITRD ?= "${@'${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz' if '${INITRD_IMAGE}' else ''}"
9do_bootdirectdisk[depends] += "${@'${INITRD_IMAGE}:do_rootfs' if '${INITRD_IMAGE}' else ''}" 9do_bootdirectdisk[depends] += "${@'${INITRD_IMAGE}:do_image_complete' if '${INITRD_IMAGE}' else ''}"
10 10
11# need to define the dependency and the ROOTFS for directdisk 11# need to define the dependency and the ROOTFS for directdisk
12do_bootdirectdisk[depends] += "${PN}:do_rootfs" 12do_bootdirectdisk[depends] += "${PN}:do_image_complete"
13ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4" 13ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4"
14 14
15# creating VM images relies on having a hddimg so ensure we inherit it here. 15# creating VM images relies on having a hddimg so ensure we inherit it here.
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 5003dacc1c..48505c8d6c 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -167,7 +167,7 @@ python () {
167 initramfs_image = d.getVar('INITRAMFS_IMAGE', True) or "" 167 initramfs_image = d.getVar('INITRAMFS_IMAGE', True) or ""
168 if initramfs_image != "": 168 if initramfs_image != "":
169 d.appendVarFlag('do_build', 'depends', " %s:do_bundle_initramfs" % d.getVar('PN', True)) 169 d.appendVarFlag('do_build', 'depends', " %s:do_bundle_initramfs" % d.getVar('PN', True))
170 d.appendVarFlag('do_bundle_initramfs', 'depends', " %s:do_rootfs" % initramfs_image) 170 d.appendVarFlag('do_bundle_initramfs', 'depends', " %s:do_image_complete" % initramfs_image)
171} 171}
172 172
173IMAGE_CLASSES += "image_types" 173IMAGE_CLASSES += "image_types"
@@ -486,4 +486,4 @@ do_bundle_initramfs[noexec] = "1"
486do_bundle_initramfs () { 486do_bundle_initramfs () {
487 : 487 :
488} 488}
489addtask bundle_initramfs after do_rootfs 489addtask bundle_initramfs after do_image_complete
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
93IMAGE_CMD_TAR ?= "tar" 93IMAGE_CMD_TAR ?= "tar"
94IMAGE_CMD_tar = "${IMAGE_CMD_TAR} -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar -C ${IMAGE_ROOTFS} ." 94IMAGE_CMD_tar = "${IMAGE_CMD_TAR} -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar -C ${IMAGE_ROOTFS} ."
95 95
96do_rootfs[cleandirs] += "${WORKDIR}/cpio_append" 96do_image_cpio[cleandirs] += "${WORKDIR}/cpio_append"
97IMAGE_CMD_cpio () { 97IMAGE_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
202USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${COMPRESSIONTYPES}'.split()), '1', '', d)}" 202USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${COMPRESSIONTYPES}'.split()), '1', '', d)}"
203do_rootfs[file-checksums] += "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}" 203do_image_wic[file-checksums] += "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}"
204do_rootfs[vardeps] += "${@bb.utils.contains("USING_WIC", "1", "${WICVARS}", "", d)}" 204do_image_wic[vardeps] += "${@bb.utils.contains("USING_WIC", "1", "${WICVARS}", "", d)}"
205 205
206EXTRA_IMAGECMD = "" 206EXTRA_IMAGECMD = ""
207 207
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 2a56a54516..f1b409cf11 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -14,7 +14,7 @@ python __anonymous () {
14 14
15 image = d.getVar('INITRAMFS_IMAGE', True) 15 image = d.getVar('INITRAMFS_IMAGE', True)
16 if image: 16 if image:
17 d.appendVarFlag('do_assemble_fitimage', 'depends', ' ${INITRAMFS_IMAGE}:do_rootfs') 17 d.appendVarFlag('do_assemble_fitimage', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
18} 18}
19 19
20# 20#
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 4ce1611d7f..997376d126 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -25,7 +25,7 @@ python __anonymous () {
25 25
26 image = d.getVar('INITRAMFS_IMAGE', True) 26 image = d.getVar('INITRAMFS_IMAGE', True)
27 if image: 27 if image:
28 d.appendVarFlag('do_bundle_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_rootfs') 28 d.appendVarFlag('do_bundle_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
29 29
30 # NOTE: setting INITRAMFS_TASK is for backward compatibility 30 # NOTE: setting INITRAMFS_TASK is for backward compatibility
31 # The preferred method is to set INITRAMFS_IMAGE, because 31 # The preferred method is to set INITRAMFS_IMAGE, because
diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
index 0012e8c48f..c647d88d26 100644
--- a/meta/classes/rm_work.bbclass
+++ b/meta/classes/rm_work.bbclass
@@ -67,6 +67,10 @@ do_rm_work () {
67 i=dummy 67 i=dummy
68 break 68 break
69 ;; 69 ;;
70 *do_image*)
71 i=dummy
72 break
73 ;;
70 *do_build*) 74 *do_build*)
71 i=dummy 75 i=dummy
72 break 76 break
@@ -108,7 +112,7 @@ rm_work_populatesdk () {
108} 112}
109rm_work_populatesdk[cleandirs] = "${WORKDIR}/sdk" 113rm_work_populatesdk[cleandirs] = "${WORKDIR}/sdk"
110 114
111do_rootfs[postfuncs] += "rm_work_rootfs" 115do_image_complete[postfuncs] += "rm_work_rootfs"
112rm_work_rootfs () { 116rm_work_rootfs () {
113 : 117 :
114} 118}
diff --git a/meta/classes/testimage-auto.bbclass b/meta/classes/testimage-auto.bbclass
index 860599d2b5..e0a22b773c 100644
--- a/meta/classes/testimage-auto.bbclass
+++ b/meta/classes/testimage-auto.bbclass
@@ -18,6 +18,6 @@ inherit testimage
18python do_testimage_auto() { 18python do_testimage_auto() {
19 testimage_main(d) 19 testimage_main(d)
20} 20}
21addtask testimage_auto before do_build after do_rootfs 21addtask testimage_auto before do_build after do_image_complete
22do_testimage_auto[depends] += "${TESTIMAGEDEPENDS}" 22do_testimage_auto[depends] += "${TESTIMAGEDEPENDS}"
23do_testimage_auto[lockfiles] += "${TESTIMAGELOCK}" 23do_testimage_auto[lockfiles] += "${TESTIMAGELOCK}"