diff options
author | Ming Liu <peter.x.liu@external.atlascopco.com> | 2017-08-16 06:34:08 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-17 00:21:15 +0100 |
commit | 45d7f5485a67c7bc2b13b84b3d7d882c898b35c3 (patch) | |
tree | dfa6fc4a938f3caa57602e3008fb2ad749d86db0 /meta/classes/image.bbclass | |
parent | 7f45ea5083b845490bc3db2a449b6e8b71eab6ba (diff) | |
download | poky-45d7f5485a67c7bc2b13b84b3d7d882c898b35c3.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 rev: eca501aeb4f2cc9255fabab14c68f6910367aaf9)
Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r-- | meta/classes/image.bbclass | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 35624870f7..3639aa44f4 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -171,10 +171,6 @@ python () { | |||
171 | d.setVar('IMAGE_FEATURES', ' '.join(sorted(list(remain_features)))) | 171 | d.setVar('IMAGE_FEATURES', ' '.join(sorted(list(remain_features)))) |
172 | 172 | ||
173 | check_image_features(d) | 173 | check_image_features(d) |
174 | initramfs_image = d.getVar('INITRAMFS_IMAGE') or "" | ||
175 | if initramfs_image != "": | ||
176 | d.appendVarFlag('do_build', 'depends', " %s:do_bundle_initramfs" % d.getVar('PN')) | ||
177 | d.appendVarFlag('do_bundle_initramfs', 'depends', " %s:do_image_complete" % initramfs_image) | ||
178 | } | 174 | } |
179 | 175 | ||
180 | IMAGE_CLASSES += "image_types" | 176 | IMAGE_CLASSES += "image_types" |
@@ -613,15 +609,6 @@ do_package_write_ipk[noexec] = "1" | |||
613 | do_package_write_deb[noexec] = "1" | 609 | do_package_write_deb[noexec] = "1" |
614 | do_package_write_rpm[noexec] = "1" | 610 | do_package_write_rpm[noexec] = "1" |
615 | 611 | ||
616 | # Allow the kernel to be repacked with the initramfs and boot image file as a single file | ||
617 | do_bundle_initramfs[depends] += "virtual/kernel:do_bundle_initramfs" | ||
618 | do_bundle_initramfs[nostamp] = "1" | ||
619 | do_bundle_initramfs[noexec] = "1" | ||
620 | do_bundle_initramfs () { | ||
621 | : | ||
622 | } | ||
623 | addtask bundle_initramfs after do_image_complete | ||
624 | |||
625 | # Prepare the root links to point to the /usr counterparts. | 612 | # Prepare the root links to point to the /usr counterparts. |
626 | create_merged_usr_symlinks() { | 613 | create_merged_usr_symlinks() { |
627 | root="$1" | 614 | root="$1" |