From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6750187537661165568 X-Received: by 2002:a02:b792:: with SMTP id f18mr7718208jam.32.1572958473746; Tue, 05 Nov 2019 04:54:33 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a6b:b6c1:: with SMTP id g184ls1291288iof.15.gmail; Tue, 05 Nov 2019 04:54:33 -0800 (PST) X-Google-Smtp-Source: APXvYqz3XFWgAgqncqmZ0ZlSyVVthJJSCRvgYnbe0VhH4JjlMODLYOe9FPtR8QnOQa2N5UME8gBL X-Received: by 2002:a05:6602:187:: with SMTP id m7mr308113ioo.16.1572958473390; Tue, 05 Nov 2019 04:54:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1572958473; cv=none; d=google.com; s=arc-20160816; b=MPN4UP2dbKI1ibeLdCNCwsPF1UJs/Niml3ckRwPmSOCDuW266uwIhGxOMtytO+IX/7 Pe+wguhngmKwoWBDSpibFjXSBnjRo5RWjblcQNgghHySdHYBa4WX1FbiEtxGckDR+CwZ kI3gA/xHfLcZfC3aZC69lX/YclZzRzvRFTudKdLJmTFsFyK7AjK0a0x+N/yCLclh0wQK 9de7+G0eGmySVevSOBmTA+fZZVIGo5ZfJx+YTgTNAw60Qa1eDmxkDwsV4GcMxG1TOIVo zruEFOrv9rGiuZHjx2L0EYCL+F+CwdhwWrpN23G6weFmTTM1JOGuPKKKwj8fPFquEISZ D00Q== 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=kh/LaDh/nLr5Igv4YXVzKnzR3EnyV7+w6b4PID0OnSU=; b=VF9fh/DU7KrKfGozkIsadUdb86D5wgH4weiA8ceZCaoQzquT950u88dD9KcH7qQODg hPILQnuW3z9p/Z2hcbdF64qI4j+DxfM+5cWsbQ9uJ8BNvBpZu1PhE5Y8OSwujphQbmta KEz3RX4utiNIRcr05bPzKz5M7stysfJKzjnPhQSulDt08OCtr/Za5w/lTQVrzAsquSZd YEmjiRvlMobJqDUwNNzD+8gU97h8k0Ysf6FqmTDaAY5x1yJLCCATmWAnjt6S5951Xnep dq7hUTvpUBbfa2r3wwZ3gkS7+qT4J54bAXOmGQiBgfG+bMziK3Czl7xN4ndB8AcqbcOG enlQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.141.98 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com Return-Path: Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com. [68.232.141.98]) by gmr-mx.google.com with ESMTPS id 75si1252801ilw.3.2019.11.05.04.54.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Nov 2019 04:54:33 -0800 (PST) Received-SPF: pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.141.98 as permitted sender) client-ip=68.232.141.98; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.141.98 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com IronPort-SDR: 6q/QahtaFDrd7ilumqfj9B8Jlbr/bjx3r/FcsoUr9U2OfyNz9H89v/fquP+ngQ8kGwjP2vmkTR 0m/taJrzimF8c1NsReLNECQsCHsgPqQrC9W7nEDZ91SXQ7IW+iWX3CK4UF0vTYgu0JxyUENTXZ 7GoG4A+6rEsbWN8Oi7KxXFMhfDs8aiwIW/2DIG/WAnXq1bfRnzGbIv35KMM5Y3wvWdwzzevGNU XuG0zX3tVbD/T2fgrMWA4LvPAZPD0ym4cMdwV8DEgeSSXk4tplP/AwSZlDcQIv635FSSZVDBVK RNU= X-IronPort-AV: E=Sophos;i="5.68,271,1569312000"; d="scan'208";a="42815821" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa2.mentor.iphmx.com with ESMTP; 05 Nov 2019 04:54:32 -0800 IronPort-SDR: bELdzBUl6BsRFu/Yt1KMrWbDxmmkhcuGlUOXa+gqJO9Qgv/OLD1ZpWPW/lxll42BMWSGJpGdBI PKuU2sL1xdpFGVIcqF2Udns/oTbN+Tjsy8eyw6WsVrf4f93uQwkzyobDsFuAVi3mNbwJA9U4JY 3/SQb2ye5RxIS3RpFOTlBnLiaO67w2yDnBBVIq/XiLQHd5X3HjzpB2GfPSpdJRmYyqzsQ73drN mqcnGDV31UhbajAZmjNvEXvBXiwmG3NF3oXCs9qOUDVi1wJ7j+0Ue3FZHk7MiGeYgz2qWph7r7 rUc= From: Cedric Hombourger To: CC: Cedric Hombourger Subject: [PATCH v3 5/6] linux-custom: honor KERNEL_FILE setting Date: Tue, 5 Nov 2019 13:53:04 +0100 Message-ID: <1572958385-246-6-git-send-email-Cedric_Hombourger@mentor.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1572958385-246-1-git-send-email-Cedric_Hombourger@mentor.com> References: <205b23d6-c598-eb03-f38d-0693bc4344a6@mentor.com> <1572958385-246-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-09.mgc.mentorg.com (139.181.222.9) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-TUID: OUSCW/Adz/fM 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). Rename the "vmlinuz" local variable to kernel_file so that it is clear it is derived from KERNEL_FILE. 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 | 10 +++++----- meta/recipes-kernel/linux/linux-custom.inc | 1 + 4 files changed, 7 insertions(+), 6 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 1f20c98..d6329b3 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" FILESOVERRIDES = "${DISTRO_ARCH}:${MACHINE}" diff --git a/meta/recipes-kernel/linux/files/build-kernel.sh b/meta/recipes-kernel/linux/files/build-kernel.sh index 7b651af..b46cefa 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,14 +100,14 @@ 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}" - mv "$vmlinuz" "$vmlinuz.gz" - gunzip "$vmlinuz.gz" + kernel_file="${REPACK_LINUX_IMAGE_DIR}/boot/${KERNEL_FILE}-${PV}" + mv "${kernel_file}" "${kernel_file}.gz" + gunzip "${kernel_file}.gz" fi dpkg-gencontrol -crepack/debian/control \ diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index dc2af1a..b597e25 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