| Message ID | 20210125143128.88428-1-amikan@ilbers.de |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [v2] linux-custom: Fix decompressed kernel name for arm64 | expand |
25.01.2021 17:31, Anton Mikanovich wrote: > We are performing gunzip from vmlinuz on arm64, so output should have > correct naming. > > Signed-off-by: Anton Mikanovich <amikan@ilbers.de> Applied to next.
Turns out this is wrong. debian itself would use vmlinuz for arm64 and in fact also does that i.e in "linux-update-symlinks" which takes its "stem" from https://salsa.debian.org/kernel-team/linux-base/-/blob/master/lib/DebianLinux.pm#L79 And on the other side of the story ... debians kernel build sets the arm64 stem https://salsa.debian.org/kernel-team/linux/-/blob/master/debian/config/arm64/defines#L14 I will send patches. Henning Am Mon, 25 Jan 2021 17:31:28 +0300 schrieb Anton Mikanovich <amikan@ilbers.de>: > 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. > --- > RECIPE-API-CHANGELOG.md | 5 +++++ > meta/conf/bitbake.conf | 1 + > meta/recipes-kernel/linux/files/debian/isar/install.tmpl | 6 +++--- > 3 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md > index cc45f3f..bd8a204 100644 > --- a/RECIPE-API-CHANGELOG.md > +++ b/RECIPE-API-CHANGELOG.md > @@ -282,3 +282,8 @@ like /boot/efi to avoid such issues. > ### Deprecate BUILD_DEPENDS in u-boot-custom.inc > > Use DEBIAN_BUILD_DEPENDS instead, to align with deb_debianize. > + > +### 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. diff --git a/meta/conf/bitbake.conf > b/meta/conf/bitbake.conf index acce55d..9859456 100644 > --- a/meta/conf/bitbake.conf > +++ b/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}" diff --git > a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl > b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl index > 8eca4c7..69fb88d 100644 --- > a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl +++ > b/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
On Friday, September 3, 2021 at 8:51:52 PM UTC+5:30 Henning Schild wrote: > Turns out this is wrong. debian itself would use vmlinuz for arm64 and > in fact also does that i.e in "linux-update-symlinks" which takes its > "stem" from > > > https://salsa.debian.org/kernel-team/linux-base/-/blob/master/lib/DebianLinux.pm#L79 > > And on the other side of the story ... debians kernel build sets the > arm64 stem > > > https://salsa.debian.org/kernel-team/linux/-/blob/master/debian/config/arm64/defines#L14 > > I will send patches. Can you please confirm kernel name for arm64 machine, Need to adjust in downstream layer. thanks, Srinuvasan.A > > > Henning > > Am Mon, 25 Jan 2021 17:31:28 +0300 > schrieb Anton Mikanovich <ami...@ilbers.de>: > > > We are performing gunzip from vmlinuz on arm64, so output should have > > correct naming. > > > > Signed-off-by: Anton Mikanovich <ami...@ilbers.de> > > --- > > Changes since v1: > > - Add RECIPE-API-CHANGELOG entry. > > --- > > RECIPE-API-CHANGELOG.md | 5 +++++ > > meta/conf/bitbake.conf | 1 + > > meta/recipes-kernel/linux/files/debian/isar/install.tmpl | 6 +++--- > > 3 files changed, 9 insertions(+), 3 deletions(-) > > > > diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md > > index cc45f3f..bd8a204 100644 > > --- a/RECIPE-API-CHANGELOG.md > > +++ b/RECIPE-API-CHANGELOG.md > > @@ -282,3 +282,8 @@ like /boot/efi to avoid such issues. > > ### Deprecate BUILD_DEPENDS in u-boot-custom.inc > > > > Use DEBIAN_BUILD_DEPENDS instead, to align with deb_debianize. > > + > > +### 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. diff --git a/meta/conf/bitbake.conf > > b/meta/conf/bitbake.conf index acce55d..9859456 100644 > > --- a/meta/conf/bitbake.conf > > +++ b/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}" diff --git > > a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl > > b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl index > > 8eca4c7..69fb88d 100644 --- > > a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl +++ > > b/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 > >
diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index cc45f3f..bd8a204 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -282,3 +282,8 @@ like /boot/efi to avoid such issues. ### Deprecate BUILD_DEPENDS in u-boot-custom.inc Use DEBIAN_BUILD_DEPENDS instead, to align with deb_debianize. + +### 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. diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index acce55d..9859456 100644 --- a/meta/conf/bitbake.conf +++ b/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}" diff --git a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl index 8eca4c7..69fb88d 100644 --- a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl +++ b/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
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. --- RECIPE-API-CHANGELOG.md | 5 +++++ meta/conf/bitbake.conf | 1 + meta/recipes-kernel/linux/files/debian/isar/install.tmpl | 6 +++--- 3 files changed, 9 insertions(+), 3 deletions(-)