From patchwork Wed Dec 14 13:20:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Veronika Kabatova X-Patchwork-Id: 13073144 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 EF891C4332F for ; Wed, 14 Dec 2022 13:33:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To: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=RG0FGLXk/Qh+gXY/Ny/RIKIXpB2gIVgUMPReH+r0Bo0=; b=2mWCmLYu+Mbf12 1UzJs9DGI5fCOwKyV+M8iCN4wgYTNOoCRZU8Vb0M2oqypJ1pb9zoR/9O1HeXuwt4lrUbWrfeBVlP3 wiLyiELEfWs0p0X6ccbo4UloF6AHx4H0A0Iz28y5xOr7t5tEfHTNhodMXFBYnB6r515lKYdo1xVkq zlI1BGnh3SkN3z9LCL9YyvFAozHQUv4kU/kQQW7sA3EP2/b2RfYmMtzegq9+48RF0hxlfOYGqjVfO tCyU8cr6+x74KAFa35BARP5mCEqnnoiRk5hRfJPJh/bBp8ca2t1U8jIBsa4MQAQu5hTgua2hox4TY PqYxx0ZaRYSPvtVuqQhw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p5RrX-00Gmy2-5T; Wed, 14 Dec 2022 13:31:55 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1p5RgX-00GgHQ-DV for linux-arm-kernel@lists.infradead.org; Wed, 14 Dec 2022 13:20:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671024030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Bmga69YxkLBLEgiPdQiTljNZS1P5tv9l9U0MAYxynq8=; b=GJbcy2whuNc1UGoQ03HuOj36fO75VIrw2mljbbZ0z01SAA7ImarjcwMAIbrBLcBioTRs6f TT42a/1QRs1JBmfT9p79ry6f+gIcbS4uYD36ADq2WKoxEaIUoAYm+7KLYRJ3Ft7m7UP+h9 gLJBBHfeD737O1WY2mpu6dJ3iha4NII= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-528-AInqc5VfNrWNIG6tX6P52Q-1; Wed, 14 Dec 2022 08:20:25 -0500 X-MC-Unique: AInqc5VfNrWNIG6tX6P52Q-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 38B55857F82; Wed, 14 Dec 2022 13:20:25 +0000 (UTC) Received: from boop.brq.unsha.net (unknown [10.39.194.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 14F2F492C14; Wed, 14 Dec 2022 13:20:22 +0000 (UTC) From: Veronika Kabatova To: linux-kbuild@vger.kernel.org, linux-arm-kernel@lists.infradead.org, ardb@kernel.org, catalin.marinas@arm.com, jeremy.linton@arm.com, will@kernel.org, masahiroy@kernel.org Cc: Veronika Kabatova , CKI Project Subject: [PATCH] buildtar: fix tarballs with EFI_ZBOOT enabled Date: Wed, 14 Dec 2022 14:20:02 +0100 Message-Id: <20221214132002.2547357-1-vkabatov@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221214_052033_556536_0E3BA538 X-CRM114-Status: GOOD ( 12.94 ) 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 When CONFIG_EFI_ZBOOT is enabled, the binary name is not Image.gz anymore but vmlinuz.efi. No vmlinuz gets put into the tarball as the buildtar script doesn't recognize this name. Remedy this by adding the binary name to the list of acceptable files to package. Reported-by: CKI Project Signed-off-by: Veronika Kabatova Acked-by: Ard Biesheuvel --- scripts/package/buildtar | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/package/buildtar b/scripts/package/buildtar index cb54c7f1aa80..4d6f0b128efd 100755 --- a/scripts/package/buildtar +++ b/scripts/package/buildtar @@ -122,7 +122,7 @@ case "${ARCH}" in fi ;; arm64) - for i in Image.bz2 Image.gz Image.lz4 Image.lzma Image.lzo ; do + for i in Image.bz2 Image.gz Image.lz4 Image.lzma Image.lzo vmlinuz.efi ; do if [ -f "${objtree}/arch/arm64/boot/${i}" ] ; then cp -v -- "${objtree}/arch/arm64/boot/${i}" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}" break