From patchwork Wed Sep 11 02:53:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 13799611 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 A04EAEE01FB for ; Wed, 11 Sep 2024 02:51:00 +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=KBZI2DbymUpLjk4AmSqUQ2dT20EeeMQzhso/hhiff+4=; b=ItS+qIENzc0n6EqMPCFX3uQtHa UVkpDIWODTwFXN/1pPs/NK5AwbGwp/XpAJIBZ+qI/R6S/4klu5djg4DY7Xa0FyHTAFcgHURUWhdIC lhTBgFylF8OV8hZJXM3bY3e7KZK/GRlwfFlHjhbNqW9/lUFk4fmq+eZQAf9MrQKIf2S31tQjt12kh h+ocs3vpqYm5gTtx2DUhVpEXZKKbBrTmm2aCUk21Rqw1zY8NQsJTLaNPn/PhlNvYMeXM7A69AoV+G JAB9ooSyoPr0dDDwfumd5E4gPQTyT9YWaAWCLb6OWlnAEDt22PrbfgPutNHhBOehl5uzlLO4UTpgs udMRrp5w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1soDRP-00000007sBf-3HVd; Wed, 11 Sep 2024 02:50:48 +0000 Received: from nyc.source.kernel.org ([2604:1380:45d1:ec00::3]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1soDQN-00000007s2C-2IXZ for linux-arm-kernel@lists.infradead.org; Wed, 11 Sep 2024 02:49:45 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id C52DFA4425F; Wed, 11 Sep 2024 02:49:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75EF3C4CEC3; Wed, 11 Sep 2024 02:49:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1726022982; bh=bF4oV0nKbMeRxZj7ImVrHIdlrJsuV8VUv4ujLjPK4c4=; h=From:Date:Subject:To:Cc:From; b=KPsBjSlyKgVbaZFX07Bi6d/goO2GxexzXKLtoMRRmcpeoeXCPzP774XsIFxbpOnP+ PIm7lVZR2HFf+q5k567hrJ5joVwbWCHlAHXBu0A+i0DUOrzmZ0dXyKnbH4IgT4zajH XWgrqUTbOYBCbj0wFDGmgwVS/aBGbb6FBF0+Rw21W5+WP73ac6M2YIN21RdKNX0/Hn xXU2dYmP41WbcSzhM2KWHAmWyDwVNUT0ZOqPvMFZ0qVNcliVKgwqur3c4uvaRspNMQ rDNE22D9nMnuE+A1I+58mEXtAq1H41vt1ZRT74sckWFERkaZ37LP+WUIbW514aE/Fj PWrN9HfZ4BlZA== From: Bjorn Andersson Date: Tue, 10 Sep 2024 19:53:16 -0700 Subject: [PATCH v2] arm64: Allow packing uncompressed images into distro packages MIME-Version: 1.0 Message-Id: <20240910-uncompressed-distro-packages-v2-1-51538434787f@quicinc.com> X-B4-Tracking: v=1; b=H4sIABsG4WYC/42NQQ6CMBBFr0K6dgwlSlpX3sOwqNMRJsYWO0I0h Ls7cgKX7+f/9xcjVJjEnKrFFJpZOCeFZlcZHELqCTgqm6ZuDrWzHqaE+TEWEqEIkeVVMowB76E nARdD64+eYuudUYX2bvze9JdOedB+Lp/tbba/9E/xbMECuoCI7oqewvk5MXLCvY5Mt67rF0hQL fvKAAAA 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=1673; i=quic_bjorande@quicinc.com; h=from:subject:message-id; bh=MrV3DTe1I/Mq8IiG+MCg4vdZxH24zTV3GQvQhnWmX6I=; b=owEBgwJ8/ZANAwAIAQsfOT8Nma3FAcsmYgBm4QYjyua5RITv0VOVy7VAeQ4Aok86nofTge7xL CnkNTtRHQeJAkkEAAEIADMWIQQF3gPMXzXqTwlm1SULHzk/DZmtxQUCZuEGIxUcYW5kZXJzc29u QGtlcm5lbC5vcmcACgkQCx85Pw2ZrcVOrhAAlmP/znChC53rICaPQT5g236Owtvh8FkPrPW1nhY +S6hvWSKBsYPR3TN30uEFnOMCBkLIyumShBKJnYnScJJHVXkOIzllh/haPS+vAiqG58TgQZGBR5 6YTSUEL4l6sK2tfF+9FoHojMpueQfCFInUvfQDu+PXka3/oyy3Q6RZEr8uxYbe9OYj92iPLCSPP YyEJminFv5Sk6DLCe/a02mmvdzkp4/Kcki/+rc2K53Rbv8AVdVRzY+FOmZ1pIg0mfhOFjb2nojQ VYOkKWk3jHtB7IV6enxpg+p5CzJgaePrqD9zfYA2mN1GvUn/sHWtVBJ3miPp3AthbIVm77+6VNV iiaFn+T646l0st2eQlvJjZ2lB3Nt9Tfl6GDm/16+Eagn/1GtGk17993CfEqO7B2PQ+IUhbTTBv5 674gTkJpXoL3QIkGKQjPchTtY9lKnKffKoh+PWKST/EnrkWi9DJGT78jiLAAwLcel0iV1fbP66G EkFSf5wjtEYG1PRv4dIDRv3gNOgwWBrNDcHFWYxP41gu3iZuYAqtcCjqdr+TFOkPAr4FC1Pqivc 63qxzoT8SG2tlSywJ0J/aLwi+3Jv0Nq4CzUBZkdpOBg8OC1wLn6alxr8I4xwBtjwapQFfRDPPbx yhftgCrCWN5BVDQpszOk855IvmYz/RsqzEFRs+Xfiqdk= 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-20240910_194943_743831_E5B0A80E X-CRM114-Status: GOOD ( 12.16 ) 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. Use 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 --- Changes in v2: - Restore the install-specific handling to retain the behavior of installing the uncompressed "Image" under CONFIG_EFI_ZBOOT=y && CONFIG_COMPRESSED_INSTALL=n. - Link to v1: https://lore.kernel.org/r/20240819-uncompressed-distro-packages-v1-1-c8accc8bc9ea@quicinc.com --- arch/arm64/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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..3d9752e56109 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))