From: Kevin Hao Date: Mon, 20 Aug 2018 10:42:25 +0000 (+0800) Subject: wic: bootimg-partition: Select a preferred type if multi kernel images are installed X-Git-Tag: uninative-2.3~619 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=d1d80566681d4cdc00aa3d4b5e4bcf5edb7132b7;p=openembedded-core.git wic: bootimg-partition: Select a preferred type if multi kernel images are installed Automatically select one kernel type image based on a predefined precedence list if there are multi kernel images installed. Signed-off-by: Kevin Hao Signed-off-by: Richard Purdie --- diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg-partition.py index 2e9b9f5ed6..ddc880be36 100644 --- a/scripts/lib/wic/plugins/source/bootimg-partition.py +++ b/scripts/lib/wic/plugins/source/bootimg-partition.py @@ -130,24 +130,28 @@ class BootimgPartitionPlugin(SourcePlugin): if not custom_cfg: # The kernel types supported by the sysboot of u-boot - kernel_types = ["uImage", "zImage", "Image", "vmlinux", "fitImage"] + kernel_types = ["zImage", "Image", "fitImage", "uImage", "vmlinux"] has_dtb = False fdt_dir = '/' kernel_name = None - for task in cls.install_task: - src, dst = task - # Find the kernel image name - for image in kernel_types: + + # Find the kernel image name, from the highest precedence to lowest + for image in kernel_types: + for task in cls.install_task: + src, dst = task if re.match(image, src): - if not kernel_name: - kernel_name = os.path.join('/', dst) - else: - raise WicError('Multi kernel file founded') + kernel_name = os.path.join('/', dst) + break + if kernel_name: + break + for task in cls.install_task: + src, dst = task # We suppose that all the dtb are in the same directory if re.search(r'\.dtb', src) and fdt_dir == '/': has_dtb = True fdt_dir = os.path.join(fdt_dir, os.path.dirname(dst)) + break if not kernel_name: raise WicError('No kernel file founded')