diff options
| author |   Chong Yi Chai <chong.yi.chai@intel.com> | 2018-09-06 11:29:08 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-10 13:23:45 +0100 |
| commit | a702a5efdaece4197ceefec2a3b4c1e872e82f11 (patch) | |
| tree | 4ffc08fb0a83e5b93306ced69db9dad8ac9e47df /scripts | |
| parent | 80b6a08f55e322bfc41f69476509dc5a62ada83f (diff) | |
| download | openembedded-core-contrib-a702a5efdaece4197ceefec2a3b4c1e872e82f11.tar.gz | |
mkefidisk: fix installation of kernel image
Kernel image can be 'vmlinuz' for 'bzImage' but the script is written to
support 'vmlinuz' only. When building with meta-intel on sumo branch, the
kernel image is now bzImage and the installation will fail. Add option to
install bzImage as well.
Signed-off-by: Chong Yi Chai <chong.yi.chai@intel.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/contrib/mkefidisk.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh index ac4ec9c7fb..39e4bcf08a 100755 --- a/scripts/contrib/mkefidisk.sh +++ b/scripts/contrib/mkefidisk.sh @@ -381,7 +381,15 @@ mount $BOOTFS $BOOTFS_MNT >$OUT 2>&1 || error "Failed to mount $BOOTFS on $BOOTF info "Preparing boot partition" EFIDIR="$BOOTFS_MNT/EFI/BOOT" -cp $HDDIMG_MNT/vmlinuz $BOOTFS_MNT >$OUT 2>&1 || error "Failed to copy vmlinuz" +# Get kernel image name +if [ -e "$HDDIMG_MNT/vmlinuz" ]; then + kernel_image="vmlinuz" +elif [ "$HDDIMG_MNT/bzImage" ]; then + kernel_image="bzImage" +else + die "No kernel image found" +fi +cp $HDDIMG_MNT/${kernel_image} $BOOTFS_MNT >$OUT 2>&1 || error "Failed to copy ${kernel_image}" # Copy the efi loader and configs (booti*.efi and grub.cfg if it exists) cp -r $HDDIMG_MNT/EFI $BOOTFS_MNT >$OUT 2>&1 || error "Failed to copy EFI dir" # Silently ignore a missing systemd-boot loader dir (we might just be a GRUB image) @@ -407,7 +415,7 @@ if [ -e "$GRUB_CFG" ]; then sed -i "s/ LABEL=[^ ]*/ /" $GRUB_CFG sed -i "s@ root=[^ ]*@ @" $GRUB_CFG - sed -i "s@vmlinuz @vmlinuz root=$TARGET_ROOTFS ro rootwait console=ttyS0 console=tty0 @" $GRUB_CFG + sed -i "s@${kernel_image} @${kernel_image} root=$TARGET_ROOTFS ro rootwait console=ttyS0 console=tty0 @" $GRUB_CFG fi # Look for a systemd-boot installation |