Re: [PATCH 02/10] linux-custom: honor KERNEL_FILE setting

[Henning Schild <henning.schild@siemens.com>]

Am Thu, 24 Oct 2019 11:02:16 +0200
schrieb Cedric Hombourger <Cedric_Hombourger@mentor.com>:

> vmlinuz was hard-coded in the postinst script generated by the
> build-kernel.sh script. This really needs to be ${KERNEL_FILE}
> to support architectures where a vmlinux file is used instead
> (mipsel in particular).
> 
> As we now have multiple recipes using KERNEL_FILE (image and
> kernel recipes), its default setting (vmlinuz) was moved to
> bitbake.conf
> 
> Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com>
> ---
>  meta/classes/image.bbclass                      | 1 -
>  meta/conf/bitbake.conf                          | 1 +
>  meta/recipes-kernel/linux/files/build-kernel.sh | 6 +++---
>  meta/recipes-kernel/linux/linux-custom.inc      | 1 +
>  4 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> index 8384b71..7690bc5 100644
> --- a/meta/classes/image.bbclass
> +++ b/meta/classes/image.bbclass
> @@ -16,7 +16,6 @@ IMAGE_INSTALL += "${@ ("linux-image-" +
> d.getVar("KERNEL_NAME", True)) if d.getV IMAGE_FULLNAME =
> "${PN}-${DISTRO}-${MACHINE}" 
>  # These variables are used by wic and start_vm
> -KERNEL_FILE  ?= "vmlinuz"
>  KERNEL_IMAGE ?= "${IMAGE_FULLNAME}-${KERNEL_FILE}"
>  INITRD_IMAGE ?= "${IMAGE_FULLNAME}-initrd.img"
>  
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index bca1114..6377a94 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -56,6 +56,7 @@ BUILDCHROOT_HOST_DIR =
> "${DEPLOY_DIR_BUILDCHROOT}-host/${HOST_DISTRO}-${HOST_ARC
> BUILDCHROOT_TARGET_DIR =
> "${DEPLOY_DIR_BUILDCHROOT}-target/${DISTRO}-${DISTRO_ARCH}"
> SDKCHROOT_DIR = "${DEPLOY_DIR_SDKCHROOT}/${DISTRO}-${DISTRO_ARCH}"
> CACHE = "${TMPDIR}/cache" +KERNEL_FILE ?= "vmlinuz" 
>  OVERRIDES = "${DISTRO_ARCH}:${MACHINE}:${DISTRO}:forcevariable"
>  
> diff --git a/meta/recipes-kernel/linux/files/build-kernel.sh
> b/meta/recipes-kernel/linux/files/build-kernel.sh index
> 7b651af..dcb46f7 100644 ---
> a/meta/recipes-kernel/linux/files/build-kernel.sh +++
> b/meta/recipes-kernel/linux/files/build-kernel.sh @@ -90,7 +90,7 @@
> if [ -f /lib/modules/${PV}/.fresh-install ]; then\\ else\\
>  	change=upgrade\\
>  fi\\
> -linux-update-symlinks \$change ${PV} /boot/vmlinuz-${PV}\\
> +linux-update-symlinks \$change ${PV} /boot/${KERNEL_FILE}-${PV}\\
>  rm -f /lib/modules/${PV}/.fresh-install"
>  
>  # Add Debian-like link removal to postrm
> @@ -100,12 +100,12 @@ sed -i
> "${REPACK_LINUX_IMAGE_DIR}/DEBIAN/postrm" \ rm
> -f /lib/modules/${PV}/.fresh-install\\ \\
>  if [ \"\$1\" != upgrade ] && command -v linux-update-symlinks
> >/dev/null; then\\
> -	linux-update-symlinks remove ${PV}  /boot/vmlinuz-${PV}\\
> +	linux-update-symlinks remove
> ${PV}  /boot/${KERNEL_FILE}-${PV}\\ fi"
>  
>  # Make sure arm64 kernels are decompressed
>  if [ "$target_arch" = "arm64" ]; then
> -	vmlinuz="${REPACK_LINUX_IMAGE_DIR}/boot/vmlinuz-${PV}"
> +	vmlinuz="${REPACK_LINUX_IMAGE_DIR}/boot/${KERNEL_FILE}-${PV}"

Please use another name for that local variable.

Henning

>  	mv "$vmlinuz" "$vmlinuz.gz"
>  	gunzip "$vmlinuz.gz"
>  fi
> diff --git a/meta/recipes-kernel/linux/linux-custom.inc
> b/meta/recipes-kernel/linux/linux-custom.inc index 5a4f5bf..5a34dd1
> 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc
> +++ b/meta/recipes-kernel/linux/linux-custom.inc
> @@ -72,6 +72,7 @@ dpkg_runbuild() {
>  
>  	export KBUILD_DEPENDS="${KBUILD_DEPENDS}"
>  	export KERNEL_DEBIAN_DEPENDS="${KERNEL_DEBIAN_DEPENDS}"
> +	export KERNEL_FILE="${KERNEL_FILE}"
>  	export
> KERNEL_HEADERS_DEBIAN_DEPENDS="${KERNEL_HEADERS_DEBIAN_DEPENDS}" 
>  	sudo -E chroot --userspec=$( id -u ):$( id -g )
> ${BUILDCHROOT_DIR} ${PP}/build-kernel.sh ${PP}/${PPS} ${DISTRO_ARCH}