Browse Source

linux-custom: Fix decompressed kernel name for arm64

We are performing gunzip from vmlinuz on arm64, so output should have
correct naming.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
Changes since v1:
- Add RECIPE-API-CHANGELOG entry.
Anton Mikanovich 4 years ago
parent
commit
d6954739fe

+ 5 - 0
RECIPE-API-CHANGELOG.md

@@ -287,3 +287,8 @@ Use DEBIAN_BUILD_DEPENDS instead, to align with deb_debianize.
 
 Migrate your patches so they can be applied with "git am", or
 "unset PATCHTOOL" to get old behaviour.
+
+### Change kernel image name for arm64
+
+Kernel image name for arm64 platforms is vmlinux now. Image format was
+not changed (uncompressed executable) but now it is named correctly.

+ 1 - 0
meta/conf/bitbake.conf

@@ -61,6 +61,7 @@ CACHE = "${TMPDIR}/cache"
 KERNEL_FILE ?= "vmlinuz"
 KERNEL_FILE_mipsel ?= "vmlinux"
 KERNEL_FILE_riscv64 ?= "vmlinux"
+KERNEL_FILE_arm64 ?= "vmlinux"
 
 OVERRIDES = "${DISTRO_ARCH}:${COMPAT_OVERRIDE}:${MACHINE}:${DISTRO}:forcevariable"
 FILESOVERRIDES = "${DISTRO_ARCH}:${MACHINE}"

+ 3 - 3
meta/recipes-kernel/linux/files/debian/isar/install.tmpl

@@ -26,9 +26,9 @@ do_install() {
     fi
     krel="$(${MAKE} O=${O} -s --no-print-directory kernelrelease)"
     case "${ARCH}" in
-        mips|powerpc|riscv) kimage_path="boot/vmlinux-${krel}"    ;;
-                        um) kimage_path="usr/bin/vmlinux-${krel}" ;;
-                         *) kimage_path="boot/vmlinuz-${krel}"    ;;
+        mips|powerpc|riscv|arm64) kimage_path="boot/vmlinux-${krel}"    ;;
+                              um) kimage_path="usr/bin/vmlinux-${krel}" ;;
+                               *) kimage_path="boot/vmlinuz-${krel}"    ;;
     esac
 
     print_settings