From patchwork Thu Nov 23 07:18:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 168750 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp270563vqx; Wed, 22 Nov 2023 23:18:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IGpFXRMhUomiDuQm/phuDviS9t3/820hV5jyzT5cKFQ/rlIRsvXq0pI0uczPGYu2qq3z8PM X-Received: by 2002:a05:6a21:a590:b0:187:b995:fb5d with SMTP id gd16-20020a056a21a59000b00187b995fb5dmr6632598pzc.9.1700723934422; Wed, 22 Nov 2023 23:18:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700723934; cv=none; d=google.com; s=arc-20160816; b=OkHaTxsL6SNHEB/entdrsIpDnjx8+OmWmYaySdk/h5/pV18LclQevaizodryCZY1Sk apV1kx5iFo780CCTaAK8GiQ3vLUVGgOUKoH/4EqtmskGZ1t1YliEc4pF0bhleYsNN64w DB4IYH1kKCXvtvJKNrfwSsa8qNFhOZTF9rhXxTwkNvd+oL/gn+LGZ2VPmmdM+AP6and+ stukSZDJuFwKgGyHiD9ODMnaQ6HwMjNrhXoKRnn9+thz5zqHz1gnIEY9beGdNKSowCiX S0+5hor1R41/5+Ir2XNQ+5BZwK8welY94L4ZPH7+zyugqHpwBIGQ6WUalOlsJs6HYHBi W32Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=4eBEMp9sG46TYnEtLfA1ZxjxNIbKrNgvFZrw5u5w5sQ=; fh=z6zlbrdwEBYihHOg8AEGoiJIDU/YloHY3rJZbZfmluM=; b=waYGkhm0P/6MGAS3lMvteqbmPtIpG5WOnSnlS6Q7J8kmgoJ+D8+LaK8/OnbqhBAiUa auzQabCTXB4+3cLaCyZnV8qiDrBmKHrvQGRtnv+Qx1AD4Jkd1kOhCW2ijNU6bx3YptOt tbZmpDoHElyLFnUunBvtTpLecih+5iig7MYjG3OCihHInHidcwuqypPRSVaQp7hK/a7/ 06Vk/FDCyaOHEx5E4jdROf1bO6NjMdixQUeJ4j3EAS83bubY3FzH2Jbucuc7uDaKGu+h VHybuwNFoG4pVF9QhFhGIB7tEcwZi+hBYRQ4tL4p+yt4RvPglVFQ1M+JGuCrzvsNRgwt P/gA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=vJANAcqJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id q10-20020a65684a000000b005c277c45b97si750729pgt.132.2023.11.22.23.18.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Nov 2023 23:18:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=vJANAcqJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 87C0F8263764; Wed, 22 Nov 2023 23:18:49 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231744AbjKWHSk (ORCPT + 99 others); Thu, 23 Nov 2023 02:18:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229995AbjKWHSi (ORCPT ); Thu, 23 Nov 2023 02:18:38 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B205F9 for ; Wed, 22 Nov 2023 23:18:45 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5023C433C7; Thu, 23 Nov 2023 07:18:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700723924; bh=o6yyNvYxe2T/DPjfVyBDtP8DgRNYyj26Jx6smGQqn2I=; h=From:To:Cc:Subject:Date:From; b=vJANAcqJEEQVLC091ZNgaWwnguY6ty3nlnqE5ETGJKtClUWUO0ueZPqjvx6xmUm2V Y5VAL4r6R2bSM8YrVylCsHqIjv6c6SCWsZaLEDjvnZDglb+e9dr0ZDuU9MIVAbilNg xKg+WRZbymzVLe7QR1TmFBb8mBsoA9l8lbzVegWWZWKIjf9iRW0+qu3Z6HDqMRPlz8 U3eaDVbvzd/+DiFgr01Uj2CHqxDTfEPhT4/iuh/tkda9D9Il5DAhubZ4hd9RB41+2e MjI5zOKD+YxtJNvOlKeQmzZA4ErWls4KLYsx0mg9reE/vsfc7RvOBrd9lyrnwlyi5M xzTgK+/p9fh2g== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Nathan Chancellor , Nick Desaulniers , Nicolas Schier , linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH] kbuild: remove the last use of old cmd_src_tar rule in packaging Date: Thu, 23 Nov 2023 16:18:24 +0900 Message-Id: <20231123071824.476845-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.3 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Wed, 22 Nov 2023 23:18:49 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783338300563832603 X-GMAIL-MSGID: 1783338300563832603 The rpm-pkg and deb-pkg targets have transitioned to using 'git archive' for tarball creation. Although the old cmd_src_tar is still used by snap-pkg, there is no need to create a tarball solely for passing the source to snapcraft. Instead, you can use 'source-type: local' to tell the source location to snapcraft. Signed-off-by: Masahiro Yamada --- Note for reviewers/testers: You cannot run 'make snap-pkg' on recent distributions, but you can use Ubuntu 18.04, at least. To test this, you can run the ubuntu:18.04 Docker image, and excecute 'apt-get install snapcraft', and then 'make snap-pkg'. The generated kernel snap can be used for Ubuntu Core 18. Makefile | 2 -- scripts/Makefile.package | 24 +----------------------- scripts/package/snapcraft.template | 2 +- 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index 724c79bebe72..f128a1a1b1a0 100644 --- a/Makefile +++ b/Makefile @@ -609,8 +609,6 @@ export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL KBUILD_RUSTFLAGS_KERNEL export RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o \ -name CVS -o -name .pc -o -name .hg -o -name .git \) \ -prune -o -export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \ - --exclude CVS --exclude .pc --exclude .hg --exclude .git # =========================================================================== # Rules shared between *config targets and build targets diff --git a/scripts/Makefile.package b/scripts/Makefile.package index 3addd1c0b989..3c38be77acf0 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -4,27 +4,6 @@ include $(srctree)/scripts/Kbuild.include include $(srctree)/scripts/Makefile.lib -KERNELPATH := kernel-$(subst -,_,$(KERNELRELEASE)) -# Include only those top-level files that are needed by make, plus the GPL copy -TAR_CONTENT := Documentation LICENSES arch block certs crypto drivers fs \ - include init io_uring ipc kernel lib mm net rust \ - samples scripts security sound tools usr virt \ - .config Makefile \ - Kbuild Kconfig COPYING $(wildcard localversion*) - -quiet_cmd_src_tar = TAR $(2).tar.gz - cmd_src_tar = \ -if test "$(objtree)" != "$(srctree)"; then \ - echo >&2; \ - echo >&2 " ERROR:"; \ - echo >&2 " Building source tarball is not possible outside the"; \ - echo >&2 " kernel source tree. Don't set KBUILD_OUTPUT"; \ - echo >&2; \ - false; \ -fi ; \ -tar -I $(KGZIP) -c $(RCS_TAR_IGNORE) -f $(2).tar.gz \ - --transform 's:^:$(2)/:S' $(TAR_CONTENT) $(3) - # Git # --------------------------------------------------------------------------- @@ -157,9 +136,8 @@ snap-pkg: rm -rf $(objtree)/snap mkdir $(objtree)/snap $(MAKE) clean - $(call cmd,src_tar,$(KERNELPATH)) sed "s@KERNELRELEASE@$(KERNELRELEASE)@; \ - s@SRCTREE@$(shell realpath $(KERNELPATH).tar.gz)@" \ + s@SRCTREE@$(abs_srctree)@" \ $(srctree)/scripts/package/snapcraft.template > \ $(objtree)/snap/snapcraft.yaml cd $(objtree)/snap && \ diff --git a/scripts/package/snapcraft.template b/scripts/package/snapcraft.template index 626d278e4a5a..85d5e07d1b40 100644 --- a/scripts/package/snapcraft.template +++ b/scripts/package/snapcraft.template @@ -10,5 +10,5 @@ parts: kernel: plugin: kernel source: SRCTREE - source-type: tar + source-type: local kernel-with-firmware: false