summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Liu <peter.x.liu@external.atlascopco.com>2017-08-16 06:34:08 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-07 17:07:56 +0000
commit9a5e6dae054ef54e0da9837eb47f99a03eddf97e (patch)
tree8c05ec8640fb797c585e978556c826d9fc8c36fc
parent4da54e74f4a8676017255ace54d6e5482e512b1d (diff)
downloadpoky-9a5e6dae054ef54e0da9837eb47f99a03eddf97e.tar.gz
image.bbclass: drop initramfs bundle related code
The original purpose of this code snippet was to repackage initramfs bundled kernel images before do_image_complete, to be able to be included by rootfs, but it's not going to achieve that since the initramfs bundled kernel images are not even installed to ${D}/boot after commit a49569e3a7534779bbe3f01a0647fd076c95798d: [ kernel.bbclass: do not copy bundled initramfs to /boot ] So there is not a initramfs bundled kernel package at all, we should drop the code, because it is leading kernel do_initramfs_bundle unnecessarily rerun and it's very time consuming and hence is impacting the performance a lot. (From OE-Core master rev: eca501aeb4f2cc9255fabab14c68f6910367aaf9) (From OE-Core rev: 22fd010b71b6ce79f3ede31e4e7da9dbc72de70e) (From OE-Core rev: f549338b0ed4d53dedac84c86e70ea9ffd12a17e) Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image.bbclass12
1 files changed, 0 insertions, 12 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 18564204af..d10d0a0e5e 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -175,10 +175,6 @@ python () {
175 d.setVar('IMAGE_FEATURES', ' '.join(sorted(list(remain_features)))) 175 d.setVar('IMAGE_FEATURES', ' '.join(sorted(list(remain_features))))
176 176
177 check_image_features(d) 177 check_image_features(d)
178 initramfs_image = d.getVar('INITRAMFS_IMAGE') or ""
179 if initramfs_image != "":
180 d.appendVarFlag('do_build', 'depends', " %s:do_bundle_initramfs" % d.getVar('PN'))
181 d.appendVarFlag('do_bundle_initramfs', 'depends', " %s:do_image_complete" % initramfs_image)
182} 178}
183 179
184IMAGE_CLASSES += "image_types" 180IMAGE_CLASSES += "image_types"
@@ -600,11 +596,3 @@ do_package_write_ipk[noexec] = "1"
600do_package_write_deb[noexec] = "1" 596do_package_write_deb[noexec] = "1"
601do_package_write_rpm[noexec] = "1" 597do_package_write_rpm[noexec] = "1"
602 598
603# Allow the kernel to be repacked with the initramfs and boot image file as a single file
604do_bundle_initramfs[depends] += "virtual/kernel:do_bundle_initramfs"
605do_bundle_initramfs[nostamp] = "1"
606do_bundle_initramfs[noexec] = "1"
607do_bundle_initramfs () {
608 :
609}
610addtask bundle_initramfs after do_image_complete