diff options
author | Chee Yang Lee <chee.yang.lee@intel.com> | 2019-07-17 10:02:42 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-17 19:25:02 +0100 |
commit | b697aba61e55b93aa1ebf59a369d182c7a14c313 (patch) | |
tree | 3571d932f7001b5a27be66e1a59d8f112aaed359 /scripts/lib/wic/plugins/source/bootimg-pcbios.py | |
parent | 28688a277050f248d6cee73e3b77f791606e59b3 (diff) | |
download | poky-b697aba61e55b93aa1ebf59a369d182c7a14c313.tar.gz |
wic: add support for kernel with initramfs bundled
when INITRAMFS_IMAGE_BUNDLE and INITRAMFS_IMAGE are set, wic should
look for kernel with initramfs image bundled.
Include required variable MACHINE, INITRAMFS_IMAGE_BUNDLE,
INITRAMFS_IMAGE, INITRAMFS_LINK_NAME and KERNEL_IMAGETYPE in WICVARS.
No longer require default value for variable kernel as KERNEL_IMAGETYPE
is not optional variable and included in WICVARS.
image_types_wic to inherit kernel-artifact-names to obtain default
INITRAMFS_LINK_NAME when INITRAMFS_IMAGE_BUNDLE are set.
update wic.Wic2.test_image_env test case to filter optional
variable INITRAMFS_LINK_NAME, INITRAMFS_IMAGE and INITRAMFS_IMAGE_BUNDLE.
(From OE-Core rev: bac984fbb2d5ad5d13ba3275c8a3e878d8753c58)
Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/plugins/source/bootimg-pcbios.py')
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-pcbios.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index 670d347747..f2639e7004 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py | |||
@@ -150,8 +150,10 @@ class BootimgPcbiosPlugin(SourcePlugin): | |||
150 | hdddir = "%s/hdd/boot" % cr_workdir | 150 | hdddir = "%s/hdd/boot" % cr_workdir |
151 | 151 | ||
152 | kernel = get_bitbake_var("KERNEL_IMAGETYPE") | 152 | kernel = get_bitbake_var("KERNEL_IMAGETYPE") |
153 | if not kernel: | 153 | if get_bitbake_var("INITRAMFS_IMAGE_BUNDLE") == "1": |
154 | kernel = "bzImage" | 154 | if get_bitbake_var("INITRAMFS_IMAGE"): |
155 | kernel = "%s-%s.bin" % \ | ||
156 | (get_bitbake_var("KERNEL_IMAGETYPE"), get_bitbake_var("INITRAMFS_LINK_NAME")) | ||
155 | 157 | ||
156 | cmds = ("install -m 0644 %s/%s %s/vmlinuz" % | 158 | cmds = ("install -m 0644 %s/%s %s/vmlinuz" % |
157 | (staging_kernel_dir, kernel, hdddir), | 159 | (staging_kernel_dir, kernel, hdddir), |