From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6751292434813026304 X-Received: by 2002:a50:c90d:: with SMTP id o13mr44636043edh.85.1571939874840; Thu, 24 Oct 2019 10:57:54 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:2d3:: with SMTP id b19ls1505323edx.0.gmail; Thu, 24 Oct 2019 10:57:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqwYnXAMPmuNhBwBnON/0+EqoQt5obFXWBNHdXl3uDaTwTe86yzRGluUBQOLPRzhbfN3xfif X-Received: by 2002:a50:ce06:: with SMTP id y6mr44822877edi.259.1571939874284; Thu, 24 Oct 2019 10:57:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571939874; cv=none; d=google.com; s=arc-20160816; b=vIGTHw6QwQSqXRZcjiPXRqhrPyJPuWdQ03xaZCkr3aFlS/+pxQ3LEU/dgL1zczWarT 2yNa4Znmrj5le0BMmdkderGd31TG3B1Kdv3e6QC7P7fJgs0a0PZnyB1xJx3i00b+Mxmr YI3Ths7HVpcOoiT23jlIIN1nGZKEKyf4sYx5W5Pp243Mknlkl0OMchc5yp3vK0FSeG9j gHeZZ8X060NWjBpb/UKmDGpmxiRwOqlLa34vRIY1+E7pov9jjIGmgpfzpLwBuTCOFOxm 6NmUpi1TirOrwoqCvj34r5EfY4cH5iYB62MKjn1m/3+AT3mWwHNBtYcosq2fQEUxt6OK +cfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=fHTjmHFGLFuQLPPBUuuG8moKtWrRvfjkPSfU9rNxukU=; b=u5B9r9yZ3NPKHjmjQBHRpCypTkWa7hTAImSHX/xgmJ8i93InPjQGt+D3ADAs0xM+Ge yqjHepndQopc+K/G800P4Suy9o5gmk+SnA6t4uaubILkuFx6Pq7AcRYsgv1fGkFGYA2/ 2Q6NuGGqNiPxPliaEu336Gul9+7BfELn+//9yGXFP3KoU8p9Lsv1TBdASZy+RiuBu3+P cNGmS7stRNUciV92AtacK820G6n/wepkPbGhIJJhZ/FuNgfl6Phu0R7jmYMaYtW3/QQJ xZqo28zDz9tCuMfA3gvbbE0/UD3xk+Ukers9shXCFzq/7r8uuRQGyI9RCgkBeDd8EeWm xWvg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id c31si148362edb.0.2019.10.24.10.57.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Oct 2019 10:57:54 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x9OHvrlp003617 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 24 Oct 2019 19:57:53 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.8]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x9OHvr8b024636; Thu, 24 Oct 2019 19:57:53 +0200 Date: Thu, 24 Oct 2019 19:57:53 +0200 From: Henning Schild To: Cedric Hombourger Cc: Subject: Re: [PATCH 02/10] linux-custom: honor KERNEL_FILE setting Message-ID: <20191024195753.5a22218a@md1za8fc.ad001.siemens.net> In-Reply-To: <1571907744-1121-3-git-send-email-Cedric_Hombourger@mentor.com> References: <1571907744-1121-1-git-send-email-Cedric_Hombourger@mentor.com> <1571907744-1121-3-git-send-email-Cedric_Hombourger@mentor.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: 0nfM95NOpAiD Am Thu, 24 Oct 2019 11:02:16 +0200 schrieb Cedric Hombourger : > 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 > --- > 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}