From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6751292434813026304 X-Received: by 2002:a25:5542:: with SMTP id j63mr9756027ybb.76.1571907782583; Thu, 24 Oct 2019 02:03:02 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a81:5986:: with SMTP id n128ls259328ywb.7.gmail; Thu, 24 Oct 2019 02:03:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqxV1Ycg1snZwFEkMlZ8RcQFWMXcJCc3ik8gXlemzU0NN2WJnCxeWXcq0wqwbgCCCStboYA8 X-Received: by 2002:a0d:d4c5:: with SMTP id w188mr6192926ywd.232.1571907782005; Thu, 24 Oct 2019 02:03:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571907782; cv=none; d=google.com; s=arc-20160816; b=Sxc45hgeg3mmKqzwuiQpoJEGvYT8yFOZQw3GtBatfN1riTdxwYlp+TflugrypHoYap sRfnN/H6VRmVPjXYojHKKrLXngJW0F33TDXGdcRHfPDpAnhFlwDqkrXxUOXgeKtSbdha 7Jr8pTwtTArpPAfRzoE1ehEhQvIHkt1E8YpCQFSU20xUmwls9jHw78OoevNzOkyBw5Lv 13ja/jEYkPxKglgUarnms+sziq0ce+fGgUYc4D2tGB5ANdKNgbMTs6y4fyLTuohHsNeE RJEGxeNDn2ZcVyNnUmpQ7fbvNN9QgptvuH277CQ8lPHNwH/T+HzTini+TBgRtWdaqms+ 2nsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:ironport-sdr:ironport-sdr; bh=7AgfIwExDfeDhzZYZm+8YDS2fTzOu8EmK96M0sSM6R8=; b=T3GQY9TQK0yUNMkylabnIPm2xXuJDcCxuSW1Ide1h0Tt7IG5+RbJCsPWQaXf6G1TvC F+1gFSvmJmJjUJLjQlnpu1Mxy5x7DugsWjZbpBC/eCMBOwpwUxkgA9Ue97Mez8PDsOGi 7lv0JfdDkeFE/Kh8bSn1r9Sx5WN1s+LfnYi2oI4vSICYWDF4lcdzpfyNwiEj0ckhH4Ep W7HNCoCn6mMm900lC8mmCXcO5wRHio52M1ENzU5Y4AYRTmXf1PZe50L2oJeUg+6l/0/A x2y5BJJ5T6LkEtiDM/6HUDe4hEbRDRiTt3AJ8Z95FdI+pQrGZ1ZsdFpjm+JP8PDbDyN5 vFPQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com Return-Path: Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com. [68.232.129.153]) by gmr-mx.google.com with ESMTPS id u8si168881ybc.2.2019.10.24.02.03.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Oct 2019 02:03:01 -0700 (PDT) Received-SPF: pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.129.153 as permitted sender) client-ip=68.232.129.153; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com IronPort-SDR: fKcjxghWQiWWh80jK48pda2NuuF68Wvw2CslglYSLSBn/eQb/PMwxmGgBam0kANxEiifUjlfMU h3ll1YQk5N+YJyrTooHjMezvnDpcswh4q79zB3n16xY6wog9c9N2SR/aLuwsrtxdFU8mD34NCv Nvzfq1+qHNeevZX1ClPuB5AfufdO8DL/Oce3BehmLOyM/jCAKlVBvJZMIybVgin37QPnfYwK7V fNf3ZOnGoq7NiO6KE9XyKbchnfJxgt6ObmgkwK8kc05oKBkiGGkXnvVAPx72xWcrivxRVy9EqO 4Sg= X-IronPort-AV: E=Sophos;i="5.68,224,1569312000"; d="scan'208";a="44388581" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa1.mentor.iphmx.com with ESMTP; 24 Oct 2019 01:03:01 -0800 IronPort-SDR: DZqesUa5fCRG1lcXNTXb23+vGDUtMTIlU+JN1iFLszMyH/LH2WRXrw0aWO2Qb3jtXodNSOoiSs kL4bVtnw88ERuRlt5D+8nqrR4uPL+iGygg+C0Bj4Lsikq4qkixCT5p23RtO3Xm4mvxPZLg/gIA m98z05WU3ZigAiScaxcRC9KjbCNWWOUXpIIimlQtlCs425HIt3a5PgNFYBUdoq2yT7/sC0sBjm 4rehgEE7RIK08V+RgfdkT02pXHI9rhe1bG1OXfiaOU7P+hEWk+hdKtaCjtXsJsuE4yDnMNLdB2 WxI= From: Cedric Hombourger To: CC: Cedric Hombourger Subject: [PATCH 02/10] linux-custom: honor KERNEL_FILE setting Date: Thu, 24 Oct 2019 11:02:16 +0200 Message-ID: <1571907744-1121-3-git-send-email-Cedric_Hombourger@mentor.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571907744-1121-1-git-send-email-Cedric_Hombourger@mentor.com> References: <1571907744-1121-1-git-send-email-Cedric_Hombourger@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Cedric_Hombourger@mentor.com X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-08.mgc.mentorg.com (139.181.222.8) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-TUID: k7MlvRS1heK0 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}" 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} -- 2.20.1