From patchwork Tue Aug 20 03:11:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 13769274 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 80EA4C3DA4A for ; Tue, 20 Aug 2024 03:08:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=g8wxrWy2emY2JWfmPP/0epkNuJmE5fx9gx4BQRfsKbg=; b=e4knnTMPHW7iFVcTMpbbWcfSiK vrb2GZ75yxo4HCTKSkkD33Vi7kDO3Yz9fl167NoSW3etrrNt2e4ORCtPUjk9R6+MlNTdkMdCQfxtd G/rBSLBJYmsbc2I4mGVjdTIHKBHAI+/BVDzLYXlI8takyRi+HmT5/zHROtaFsTkKCpmTBYb6vydA4 23ailT/aFpMpmdsUvn7H5Vfounac1kcnuQ7vgJQXxql5Xo/Q8fmA0y0eSiSoJyeuu/taQuIDvjqeS l4IpiO2APkwMVksNHM0+y9MM/KtO+bV5+pkI1otXaSLaU5AJfn/3bGRuLgMJOprzC4KN7WRU5n3sh sA4ORTGA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sgFEX-00000003ciy-2dMZ; Tue, 20 Aug 2024 03:08:33 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sgFDr-00000003cds-0mMn for linux-arm-kernel@lists.infradead.org; Tue, 20 Aug 2024 03:07:53 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id D99E8CE0B69; Tue, 20 Aug 2024 03:07:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8A54FC32782; Tue, 20 Aug 2024 03:07:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1724123268; bh=/Axwd6v4J3R0M1uVLGMjdtdRPmKmwT6RQHIPaUGm6QU=; h=From:Date:Subject:To:Cc:From; b=aUNMnkThZD3ifTu04whxjYzNoBqMuoAOZk48Zc6g3AUtYWEG6IOK4k7vKA4iXjI6c 0ci8rWdBsQhT5E2pHPbz9RlaG1/VvUamv1vZjsiHQO3eE73nBjTlWpgCOVsk/GkNVZ Xq9nzllGtKPg19CjmRM0WmsiiD8mLWlFxN5BjdVvl5D1PaWh5C2HjiBVnDy4lNalo2 MX0uEXx5R/r2MzRecnF5nSdI69AL3Cdhsn4b73uYxtCuDxWM/c1r4NFdGzhhYsXOF3 GFe9RcMTCgmWQFeFJIs0osXk7WCMCLA+k/26lK30Dkn6AWM+ULdHCoKxFxqAuiR5jl SUxXPlbRI6ftQ== From: Bjorn Andersson Date: Mon, 19 Aug 2024 20:11:58 -0700 Subject: [PATCH] arm64: Allow packing uncompressed images into distro packages MIME-Version: 1.0 Message-Id: <20240819-uncompressed-distro-packages-v1-1-c8accc8bc9ea@quicinc.com> X-B4-Tracking: v=1; b=H4sIAH0JxGYC/x3MQQqEMAxA0atI1hNQUWm9isyiNFGD2EqjIoh3t 7h88Pk3KCdhhb64IfEpKjFkVL8C/OzCxCiUDXVZN6WpLB7Bx3VLrMqEJLqniJvzi5tY0ZDrbGu ZOmsgL3I3yvXth//zvLMIoxhuAAAA To: Catalin Marinas , Will Deacon , Linus Torvalds Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Bjorn Andersson X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1735; i=quic_bjorande@quicinc.com; h=from:subject:message-id; bh=bvOxw2747Tbs7BVukVhYfFrC+fslcUhZqtC3yXHe77M=; b=owEBgwJ8/ZANAwAIAQsfOT8Nma3FAcsmYgBmxAl/EUyFFWtnQPr+MYx58NwUKEYRipWXWoHYJ jU3fk1xmBCJAkkEAAEIADMWIQQF3gPMXzXqTwlm1SULHzk/DZmtxQUCZsQJfxUcYW5kZXJzc29u QGtlcm5lbC5vcmcACgkQCx85Pw2ZrcVd0Q/+NZm/hJzfpYFRs7ON4nGrPu9frFuWNqoVujZuLU2 xUmAfCMZb+rXSmIYf/o//afVDa+X8AWrsZX4Hzph5hAaY97fJKd73D1Bol7z75p+5nhKSn/88f/ DnI6LwBNyhZrgsJOStEKAkM00kvXyaX6/tDe9nXNG6F/121ODeaQ/sNaF+PKpm0lXU26mp1z1BG E2iYk4csGk4YO8PGMh+DQA7GHL2uvHnM5H3yyZNaPlVHtVda5x1/Cy+Z8z+2FBsdzDF4Uccd27A NKrp01mhcIJQR93TQPHODLE1Unh5BlkgPQlq97fZ+mQSyzFoDM8kqTsOIQKIlNltUepJHYc00mU aVX31BAotTlafbjIht3lpGyIOOmOaOOUj5HeOB/sRSGE1kehlGLiWzIANvDf40+DT9hwl0zNKQ2 CTs+t5aJn1SkKtKel7YSg6F7RdcDJcZ2q+Fo0j8+5hwdi9bc008IYHihSkYI6oU4tiX4CNZ6bxT u/uiJ5Bvo6nYIivYGlhnZeFpbX5T7qC59t276GOXkyYKSTeD+D62QLFX1AO00cDVGAYlEN3evy8 HdJkz4Ugt/gdS/yQ0rcUZp+08GOCKWZh3NWHdJAh3knn4EsPr/nMCJdymbgkUhxrbbKjGTDo/az scBt644e+/NP3uPNTw22QmUtnCV+vso3WmrkW117aFak= X-Developer-Key: i=quic_bjorande@quicinc.com; a=openpgp; fpr=05DE03CC5F35EA4F0966D5250B1F393F0D99ADC5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240819_200751_611175_18D9892B X-CRM114-Status: GOOD ( 10.84 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Bjorn Andersson The distro packages (deb-pkg, pacman-pkg, rpm-pkg) are generated using the compressed kernel image, which means that the kernel once installed can not be booted with systemd-boot. This differs from the packages generated by the distros themselves, which uses the uncompressed image. Expand the newly introduced CONFIG_COMPRESSED_INSTALL option to allow selection of which version of the kernel image should be packaged into the distro packages. Signed-off-by: Bjorn Andersson Reviewed-by: Konrad Dybcio --- arch/arm64/Makefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) --- base-commit: 469f1bad3c1c6e268059f78c0eec7e9552b3894c change-id: 20240819-uncompressed-distro-packages-8da6959ed698 Best regards, diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index f6bc3da1ef11..7bb9a0a5500a 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -166,9 +166,13 @@ BOOT_TARGETS := Image vmlinuz.efi image.fit PHONY += $(BOOT_TARGETS) ifeq ($(CONFIG_EFI_ZBOOT),) -KBUILD_IMAGE := $(boot)/Image.gz + ifeq ($(CONFIG_COMPRESSED_INSTALL),y) + KBUILD_IMAGE := $(boot)/Image.gz + else + KBUILD_IMAGE := $(boot)/Image + endif else -KBUILD_IMAGE := $(boot)/vmlinuz.efi + KBUILD_IMAGE := $(boot)/vmlinuz.efi endif all: $(notdir $(KBUILD_IMAGE)) @@ -182,13 +186,6 @@ $(BOOT_TARGETS): vmlinux Image.%: Image $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ -ifeq ($(CONFIG_COMPRESSED_INSTALL),y) - DEFAULT_KBUILD_IMAGE = $(KBUILD_IMAGE) -else - DEFAULT_KBUILD_IMAGE = $(boot)/Image -endif - -install: KBUILD_IMAGE := $(DEFAULT_KBUILD_IMAGE) install zinstall: $(call cmd,install)