From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6751292434813026304 X-Received: by 2002:a25:d84:: with SMTP id 126mr4170202ybn.426.1572025179277; Fri, 25 Oct 2019 10:39:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a81:c442:: with SMTP id s2ls1532831ywj.9.gmail; Fri, 25 Oct 2019 10:39:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqzGQR7LVxdWVeNcKsThL+V6nhCwivRwQjFMxb04nknmiu+PKKQCS2xOl9+Z7MCOWGqnfQ42 X-Received: by 2002:a0d:ce03:: with SMTP id q3mr3426001ywd.158.1572025178827; Fri, 25 Oct 2019 10:39:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572025178; cv=none; d=google.com; s=arc-20160816; b=vIm1HTAM1DFo5A86b5KoLI8gffhlqzbduiOQIfrtheqS7br5mBFxNW3O6nFJ29w4RS R+SozYAiKHt44AUEDy60QGL7P/0DoChg0xmDmnyi6TEVy+SBevfRzcpu9twTu6u88Hy9 F8Xq9N2iEJucgGPXW2apSatKT1zxPMuTsG/PCzX7GsGbkYH5H3CjGQ/VMzasdj8X2w2m lctUs8gtYfipjqYTLktaVYDxEq1ZnqSkEI5fPS2GfJI1eDyXBD2Wf9HvgE191AfvDWSi q3kIurmQPAcTXgz6C0s+sAvULp/VPp9r62zeZKn5pud4Gu0FuZ8NNC9fkNz/WEtOyEO1 CwZg== 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=mZF8LBnLGWpTwm0jNpDMzQ59lf+k4tZrmunc6Lt7oog=; b=D27sC4P8oGHiP8DH9lttPdnXSlLhOVHEkvmmfymQP3do5OIkNuZ72Qtg7rTpP9a897 VF+6ji36+R06KZOuAicZSrkqJi5ZquoxcnB5FKmTXC0Kanvm6nawezr+Ug5laN7UKtpM eVhC+gdTGC+ccxpxNULTUGeAd+1teNLnvswQI2Y+SjKDlYaGgr1b4fOR+qqkDQAZcRyp zPRMP0j5VrJAd68u38F/GklTckp/alcQ4w8mVEZ8iX3yU3E55vnnIFw784po2JVE0vdP t6+UF6JYhAIxQLYly51a99OhBEjS+F2NifXkgHoyxqxwkMj4wpOMCG1DZDPGcIzhL2jt wltA== 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 l3si224828ybj.5.2019.10.25.10.39.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Oct 2019 10:39:38 -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: UfpVS8CirPIYKm1NxYntxH2TlvWtq27Q3hxl8NNaCwPE/t/Ee4saKPRGorQX/imINlaik5f1H8 yeos1ReHbwuKnKb30mFBejaJQJ2sX2T7/eVdRVNgeIO0Bocr90siewx1HfHVYiYMf6o1t82q0m ReeYAygchaDks57e2/X5Fx0iYKd96J9PG/f5Ul1UdDs96Z+TZ94N2t9knFUswPcThb49SQbaop i7vyf5dMoaCbo0B+2Aljykny0s7vz4YCfKD4H4+vwSsk4a1KY5tIqyvfRu3FJMjbLFFbDjvr/I 7uI= X-IronPort-AV: E=Sophos;i="5.68,229,1569312000"; d="scan'208";a="44445565" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa1.mentor.iphmx.com with ESMTP; 25 Oct 2019 09:39:37 -0800 IronPort-SDR: GTc23BbTHpNm+JgHK5WH5mDHZRlAm7CuZf7wXpUtb9jouiq3UWXXG9DULJryqGWodxyA+4vv3Y VagBtftEQtBaHS24ayH/4QyH4C2gBQwrqQR/KSjQ1o/QOQS6PABBSSQc/O1no8TFtFmA8JvE1D NZgpqGVHkIzw0t3aK3Ck5XwpTBqbiKRogKumNH9tos8vLEZjp5KLAQ/K0EdSXUiZAq57VOnBgW gJ8iTeGmGuL08l/qG4w86a900AQtvmki640svkqaFluTuVuzoPqGXZmqGagqXXwq8xwpdUT7ez Gf4= From: Cedric Hombourger To: CC: Cedric Hombourger Subject: [PATCH v2 1/7] linux-custom: honor KERNEL_FILE setting Date: Fri, 25 Oct 2019 19:39:08 +0200 Message-ID: <1572025154-1312-2-git-send-email-Cedric_Hombourger@mentor.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1572025154-1312-1-git-send-email-Cedric_Hombourger@mentor.com> References: <1571907744-1121-1-git-send-email-Cedric_Hombourger@mentor.com> <1572025154-1312-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-01.mgc.mentorg.com (139.181.222.1) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-TUID: XF59e8lwc8w0 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 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..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 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