From patchwork Tue Jan 31 16:26:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 50959 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp961wrn; Tue, 31 Jan 2023 08:30:43 -0800 (PST) X-Google-Smtp-Source: AK7set+Ea7eUURybzInskZyKyT5G/1d+SvuLCjlBfLD2akRhORhCo3Pg9UScZVwb1TYN+Y9wBOPT X-Received: by 2002:a17:902:e892:b0:198:981d:1805 with SMTP id w18-20020a170902e89200b00198981d1805mr4188043plg.9.1675182643092; Tue, 31 Jan 2023 08:30:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675182643; cv=none; d=google.com; s=arc-20160816; b=Oyx5USBWBFAMgHokih0X/qtNt0ZEE8hyuwHvZ3Hc06rklnNn3NDBcxMjqUOKLkiEFZ oz9zrTRNqZyb98clLEeN5NHCM9gAGandcaZcRVI0WKPuKXZIRzhZQV8TcmAoZxLeqoJZ 2nJursj8sTsHYGJ7NtUe48HIZk7kwm8uMa7d47NKvtXqOghLoNRcSOoHd/OiugRuB9pE r9GYfqeVZAvuRTD1eDJ9wCN+7MAqJ3zkLcC9M2d2ZudgS372x36c3tZjY5cfl/3kJX0v rxyvIz2MHRA+SIjpVtZXwB3T84nKtnj6C04uFLpJoKyRn8+gzvtnDiGQhMZkviWrmu65 tR2w== 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=WviyiVM3gPlM7qMG/c89Wnn1nH4kUzjAQuFMnBHTrek=; b=EqUVvI+npguyGmpl/lOe8brYLoKrXeqT8v6Eo8FegNSWXB2FW3CcnM5uzAhZhbdwC2 QlhW4kgXDKX4Fus85DofJVnQZrfbMcLSSbFb0X66M3X4nsAfpkScmE32bvjhjSnWAc8H hRSIlYfVhLzk5CwKnvZNMasBZhWSmnti/+T4xMcza/VQHeOiBvN4K7O89aGvof+haaHM 4aw7fVSafoKTGp4MC2YpTyQABfw4xbYcMHAMVxLJdpuGm2SHlXi2CcZbfSfogagOoLGF HQLPZDzPYCk2PH9zKwY9oYxj+KULHYEon8+O9VRt1aixQYvwNpMHlokrb7VphvSkxRqF vYUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="F102/jP5"; 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 q12-20020a170902dacc00b00194a6e1b334si18755388plx.327.2023.01.31.08.30.29; Tue, 31 Jan 2023 08:30:43 -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="F102/jP5"; 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 S231234AbjAaQ1c (ORCPT + 99 others); Tue, 31 Jan 2023 11:27:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229468AbjAaQ12 (ORCPT ); Tue, 31 Jan 2023 11:27:28 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0443813538; Tue, 31 Jan 2023 08:27:27 -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 A7D63B81DA9; Tue, 31 Jan 2023 16:27:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9F44BC4339E; Tue, 31 Jan 2023 16:27:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675182444; bh=MEVJM+cYgJvnZYTgb2e5vWc4TqT9kt49CgVxTgaytkY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F102/jP5YNrcj7VmXmt+0OjraxeVoKQGKofrtpcQrhgbUGHLl2MtfVJhOdRQcETQQ 5vXqcNpyDECjp91nzUddGRuGxkyL2jVMNvWEKnmGsII6pVM37ta90d/cSS4NMKHBR6 BCzgi9wR14I8rZK68YHz7nwnJDTF0A+uZwarmjPDcy6Mw6Omlhrsp0If8uF5zDWxSE c9M9JjiWrkYi9CMfPZg0/iLXIphQ/p8wfJw93CY2Syiy39v4zPK4tV0ciiMoseNAmE 3m1CwnekBV6iBFpNaDfq4tc2acLHNSSkg4Aro2h7+ncSSpcGpXGKqWn0aSRh0ImTvz MjIcKBlrEuLgg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier , Tom Rix , llvm@lists.linux.dev Subject: [PATCH v3 2/5] kbuild: deb-pkg: create source package without cleaning Date: Wed, 1 Feb 2023 01:26:12 +0900 Message-Id: <20230131162615.1575215-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230131162615.1575215-1-masahiroy@kernel.org> References: <20230131162615.1575215-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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?1756556315170361503?= X-GMAIL-MSGID: =?utf-8?q?1756556315170361503?= If you run 'make deb-pkg', all objects are lost due to 'make clean', which makes the incremental builds impossible. Instead of cleaning, pass the exclude list to tar's --exclude-from option. Previously, *.diff.gz contained some check-in files such as .clang-format, .cocciconfig. With this commit, *.diff.gz will only contain the .config and debian/. The other source files will go into the tarball. Signed-off-by: Masahiro Yamada --- Changes in v3: - Add --extra-pattern='*.rej' - Exclude symlinks at the toplevel - Add --sort=name tar option scripts/Makefile.package | 38 +++++++++++++++++++++++++++++++++----- scripts/package/mkdebian | 25 +++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 5 deletions(-) diff --git a/scripts/Makefile.package b/scripts/Makefile.package index dfbf40454a99..f4f44f01deb3 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -50,6 +50,32 @@ fi ; \ tar -I $(KGZIP) -c $(RCS_TAR_IGNORE) -f $(2).tar.gz \ --transform 's:^:$(2)/:S' $(TAR_CONTENT) $(3) +# Source Tarball +# --------------------------------------------------------------------------- + +PHONY += gen-exclude +gen-exclude: + $(Q)$(MAKE) -f $(srctree)/Makefile scripts_exclude + +# - Commit 1f5d3a6b6532e25a5cdf1f311956b2b03d343a48 removed '*.rej' from +# .gitignoredoes, but it is definitely a generated file. +# - The kernel tree has no symlink at the toplevel. If there exists one, it is +# a generated one. +quiet_cmd_exclude_list = GEN $@ + cmd_exclude_list = \ + scripts/gen-exclude --extra-pattern='*.rej' --prefix=./ --rootdir=$(srctree) > $@; \ + find . -maxdepth 1 -type l >> $@; \ + echo "./$@" >> $@ + +.exclude-list: gen-exclude + $(call cmd,exclude_list) + +quiet_cmd_tar = TAR $@ + cmd_tar = tar -I $(KGZIP) -c -f $@ -C $(srctree) --exclude-from=$< --exclude=./$@ --sort=name --transform 's:^\.:linux:S' . + +%.tar.gz: .exclude-list + $(call cmd,tar) + # rpm-pkg # --------------------------------------------------------------------------- PHONY += rpm-pkg @@ -81,12 +107,11 @@ binrpm-pkg: PHONY += deb-pkg deb-pkg: - $(MAKE) clean $(CONFIG_SHELL) $(srctree)/scripts/package/mkdebian - $(call cmd,src_tar,$(KDEB_SOURCENAME)) - origversion=$$(dpkg-parsechangelog -SVersion |sed 's/-[^-]*$$//');\ - mv $(KDEB_SOURCENAME).tar.gz ../$(KDEB_SOURCENAME)_$${origversion}.orig.tar.gz - +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) --source-option=-sP -i.git -us -uc + $(Q)origversion=$$(dpkg-parsechangelog -SVersion |sed 's/-[^-]*$$//');\ + $(MAKE) -f $(srctree)/scripts/Makefile.package ../$(KDEB_SOURCENAME)_$${origversion}.orig.tar.gz + +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) \ + --build=source,binary --source-option=-sP -nc -us -uc PHONY += bindeb-pkg bindeb-pkg: @@ -174,4 +199,7 @@ help: @echo ' perf-tarxz-src-pkg - Build $(perf-tar).tar.xz source tarball' @echo ' perf-tarzst-src-pkg - Build $(perf-tar).tar.zst source tarball' +PHONY += FORCE +FORCE: + .PHONY: $(PHONY) diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index c3bbef7a6754..2f612617cbcf 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -84,6 +84,8 @@ set_debarch() { fi } +rm -rf debian + # Some variables and settings used throughout the script version=$KERNELRELEASE if [ -n "$KDEB_PKGVERSION" ]; then @@ -135,6 +137,29 @@ fi mkdir -p debian/source/ echo "1.0" > debian/source/format +# Ugly: ignore anything except .config or debian/ +# (is there a cleaner way to do this?) +cat<<'EOF' > debian/source/local-options +diff-ignore + +extend-diff-ignore = ^[^.d] + +extend-diff-ignore = ^\.[^c] +extend-diff-ignore = ^\.c($|[^o]) +extend-diff-ignore = ^\.co($|[^n]) +extend-diff-ignore = ^\.con($|[^f]) +extend-diff-ignore = ^\.conf($|[^i]) +extend-diff-ignore = ^\.confi($|[^g]) +extend-diff-ignore = ^\.config. + +extend-diff-ignore = ^d($|[^e]) +extend-diff-ignore = ^de($|[^b]) +extend-diff-ignore = ^deb($|[^i]) +extend-diff-ignore = ^debi($|[^a]) +extend-diff-ignore = ^debia($|[^n]) +extend-diff-ignore = ^debian[^/] +EOF + echo $debarch > debian/arch extra_build_depends=", $(if_enabled_echo CONFIG_UNWINDER_ORC libelf-dev:native)" extra_build_depends="$extra_build_depends, $(if_enabled_echo CONFIG_SYSTEM_TRUSTED_KEYRING libssl-dev:native)"