From patchwork Fri Feb 10 18:18:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 55518 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1106689wrn; Fri, 10 Feb 2023 10:22:57 -0800 (PST) X-Google-Smtp-Source: AK7set9JcFWGow4NY3XulEsxdPff70z7Nslg4TG5HSj1+S3cTI+EV4ayIOH8KBVeYH9oz2NDzhPv X-Received: by 2002:a17:907:9714:b0:8ab:7b03:9a03 with SMTP id jg20-20020a170907971400b008ab7b039a03mr14568483ejc.16.1676053377601; Fri, 10 Feb 2023 10:22:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676053377; cv=none; d=google.com; s=arc-20160816; b=EZi3j6Q8wGdDEmAjnTJYhkshiV+aEZ4pjSitTI939FLhp5IIfyGbnD8uNP4viIu5Bv mXFgHSuRm5CbTIuHvI0kfLrlKCOCWSfd2ZOAph7yKSb904oQXhs/V2hXn641qtfFmjoF WQct+rIhubKeekBmjNX1CBZbEy/YPYMX6u/RU8tL2HWFbEgQYcIpt46ykJQ9HaAlg5tq yE9z3zQQq1EwkqdDxGmeVXJUuyD6VbFckm9YrUqIbtHvDXkqPd4OjMgjZx7zE2jdJK0O 9y4FjImkDiuDM4BKKHuFTnO+nZMqt5KvcJpwrFgqat6WiOdWkvb/jF7V6XaddDq/MPf3 1gIQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=EzAEttIIDKk9P3Bk4BoIooUajOFpowPo4R+4kmwrBok=; b=DQrFH1eRTyGmsv7udEJSEZLepbZcdt5OBo/G9g0M07XI6m9asvfS5vhgcJiVL864Ja qMjd0JiMYBBT1grxee5M3ukaz61FRlfohKCw1BJkAQaeGqQz97cmdy6Y2e4MJeTjnF6x 5PDeXmnapgX2fZId97fQm/oAkMMWYwnCvskJp43PE8KQOz7lYNMWg32p/AwfxuS3giZN hsS340enNAJjS8zvqfs9GBVKlmmaZu3fOkLpowC5T/UMILW86zv3GUD306sw0IgCIG7i Ayj1GOiS+9z1nYtOCKkiZASYHdN7sRkIqWbn8D1FtIpGMIiSgNE1iD+cl4XBKkGNEbAZ tRBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ou+H9jRT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jr18-20020a170906515200b008718874c66asi5175548ejc.626.2023.02.10.10.22.33; Fri, 10 Feb 2023 10:22:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ou+H9jRT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233054AbjBJSTM (ORCPT + 99 others); Fri, 10 Feb 2023 13:19:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232974AbjBJSS5 (ORCPT ); Fri, 10 Feb 2023 13:18:57 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CC646F22C; Fri, 10 Feb 2023 10:18:51 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 778AEB80C8B; Fri, 10 Feb 2023 18:18:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ECC0DC4339E; Fri, 10 Feb 2023 18:18:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676053128; bh=fhbDbBrH4mf4Re3SJLCSFDHbs63IuiydRRp3WHTmHEw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ou+H9jRTWeKPlIqO+aRnnrKWsqXNrzAEbaFgslSmdUmkuPhfkKUc3/oktTS3yLMnQ vxtfo9MUzckjZFxThqwLTZUrnW0kPafvX6AJ6ihqvu0NGT10ZHzDd+xto+ulqnFYOC LLX00JcPf3WlFUFg6rYth2cBR7ABCPGBXuff9izRjsAb7arE+i+K1n6+GThvZmxjaS cP6OLmUglcnaSjPQLZ0VQQvmggth55bxWmKtkZ7GuBl1DZEXq9Qwz5Mum6cKGANHQ/ vLDhkzGN9EkwOaHRNC/cetIc/uL6ueBJ2bdTjOSRGlnkMY+0fElMhemK6Yj4R+jA/e EotUqLWd1kSDA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Nathan Chancellor , Nick Desaulniers , Nicolas Schier , Ben Hutchings , Masahiro Yamada Subject: [PATCH v5 7/7] kbuild: make perf-tar*-src-pkg work without relying on git Date: Sat, 11 Feb 2023 03:18:28 +0900 Message-Id: <20230210181828.124765-7-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230210181828.124765-1-masahiroy@kernel.org> References: <20230210181828.124765-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757469346807711432?= X-GMAIL-MSGID: =?utf-8?q?1757469346807711432?= Currently, perf-tar*-src-pkg only uses 'git archive', but it is better to make it work without relying on git. The file, HEAD, which saves the commit hash, will be included in the tarball only when the source tree is managed by git. The git tree is more precisely checked; it has been copied from scripts/setlocalversion. Signed-off-by: Masahiro Yamada --- Changes in v5: - New patch scripts/Makefile.package | 67 ++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 27 deletions(-) diff --git a/scripts/Makefile.package b/scripts/Makefile.package index 55be31d0e040..e676d14fef23 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -122,40 +122,53 @@ quiet_cmd_tar = TAR $@ tar-rootdir := $(srctree) +%.tar: compress-opt := +%.tar: .tmp_filelist + $(call cmd,tar) + %.tar.gz: compress-opt := -I $(KGZIP) %.tar.gz: .tmp_filelist $(call cmd,tar) +%.tar.bz2: compress-opt := -I $(KBZIP2) +%.tar.bz2: .tmp_filelist + $(call cmd,tar) + +%.tar.xz: compress-opt := -I $(XZ) +%.tar.xz: .tmp_filelist + $(call cmd,tar) + +%.tar.zst: compress-opt := -I $(ZSTD) +%.tar.zst: .tmp_filelist + $(call cmd,tar) + # perf-pkg - generate a source tarball with perf source # --------------------------------------------------------------------------- -perf-tar=perf-$(KERNELVERSION) - -quiet_cmd_perf_tar = TAR - cmd_perf_tar = \ -git --git-dir=$(srctree)/.git archive --prefix=$(perf-tar)/ \ - HEAD^{tree} $$(cd $(srctree); \ - echo $$(cat tools/perf/MANIFEST)) \ - -o $(perf-tar).tar; \ -mkdir -p $(perf-tar); \ -git --git-dir=$(srctree)/.git rev-parse HEAD > $(perf-tar)/HEAD; \ -(cd $(srctree)/tools/perf; \ -util/PERF-VERSION-GEN $(CURDIR)/$(perf-tar)/); \ -tar rf $(perf-tar).tar $(perf-tar)/HEAD $(perf-tar)/PERF-VERSION-FILE; \ -rm -r $(perf-tar); \ -$(if $(findstring tar-src,$@),, \ -$(if $(findstring bz2,$@),$(KBZIP2), \ -$(if $(findstring gz,$@),$(KGZIP), \ -$(if $(findstring xz,$@),$(XZ), \ -$(if $(findstring zst,$@),$(ZSTD), \ -$(error unknown target $@))))) \ - -f -9 $(perf-tar).tar) - -perf-tar-pkgs := perf-tar-src-pkg perf-targz-src-pkg perf-tarbz2-src-pkg \ - perf-tarxz-src-pkg perf-tarzst-src-pkg -PHONY += $(perf-tar-pkgs) -$(perf-tar-pkgs): - $(call cmd,perf_tar) +perf-tar = perf-$(KERNELVERSION) + +perf-tar-phony = perf-$(subst .,,$(1))-src-pkg + +.tmp_perf: FORCE + $(Q)rm -rf $@ + $(Q)mkdir $@ + $(Q)tar -c -f - -C $(srctree) --files-from=$(srctree)/tools/perf/MANIFEST | tar -x -f - -C $@ + $(Q)if test -z "$(git -C $(srctree) rev-parse --show-cdup 2>/dev/null)" && \ + head=$$(git -C $(srctree) rev-parse --verify HEAD 2>/dev/null); then \ + echo $$head > $@/HEAD; \ + fi + $(Q)cd $(srctree)/tools/perf; util/PERF-VERSION-GEN $(abspath $@)/ + +define perf-pkg-rule +PHONY += $(perf-tar-phony) +$(perf-tar-phony): $(perf-tar).$(1) + @: + +$(perf-tar).$(1): private tar-rootdir := .tmp_perf +$(perf-tar).$(1): | .tmp_perf +endef + +$(foreach x, tar tar.gz tar.bz2 tar.xz tar.zst, $(eval $(call perf-pkg-rule,$(x)))) # Help text displayed when executing 'make help' # ---------------------------------------------------------------------------