From patchwork Mon Dec 5 08:56:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1712170 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=mkPgk8zs; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NQcqB3t41z23p1 for ; Mon, 5 Dec 2022 19:56:38 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1p27H5-0006KR-6D; Mon, 05 Dec 2022 08:56:31 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1p27H0-0006Hz-MT for kernel-team@lists.ubuntu.com; Mon, 05 Dec 2022 08:56:26 +0000 Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 4E6BD3F120 for ; Mon, 5 Dec 2022 08:56:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1670230586; bh=m1QQ/2BJSQvRz1UbTRYyUC2Q3nBjOppf5WP2mdrBggQ=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mkPgk8zsz+UqZzVe0adzwmyYaprKYtzixwmE5LeErOv8xtNwdLGlD7Yi+T43xPy3l zXLeIDTucbLrTadaDQMggwxtM7cqhFgyHd5xQx9zIxAYI1Y7CbwYLbaL8T2e9XGwSt FVYXl9eT5GcJNjptMQBEaSuMAlCt8WnTiMBEoB/b5/OYVfHYFe+vivZ15syAv6xZvh Ju9N//IW7yxl1Tb+s9wdPUcV7l6gyJchVBhg+M4x+rAMors43wkHgAQm62hwWqWFoZ gSbSEBSmRFKOSg0XMKgW0R2MhVbso41f55UVdkXDQaP7CbhYdvMzpqZXcqtJssBhzO e4TcDlPFIF9xQ== Received: by mail-pg1-f198.google.com with SMTP id r126-20020a632b84000000b004393806c06eso9602533pgr.4 for ; Mon, 05 Dec 2022 00:56:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m1QQ/2BJSQvRz1UbTRYyUC2Q3nBjOppf5WP2mdrBggQ=; b=VCZ/yi7rh6YBdRLLIJRs8bsR4IpLpxg/ZRw/t5Eg5vET7iX4hw4vAsO/gZAi5SB6bk DxJbr4dQISPVGkEvjxBdNbwsaPlMvn2XtstZ7HqkeD12tLHMpXKV8NYjnst04KnE2lhB VEvDxH39ivsMEw5J5d+cxZqu1QvjmfqwQIS9cqmJRRExSsPpaYBseECeU+DdbhJlD9Nu XVrh8EvxEsh+1saDyrWM0npaGHeQ51kj9CjN/t2ROmXYdE448N3RlzGDycGBQKChvd7R WAS0VpRmyypxD0Fp8gbUmHCeelO2BEthST0Ld7FufDi3MDs7OTJ1tc3znlcbrv9PRBmc kK2A== X-Gm-Message-State: ANoB5pk5+NX31vZXB8vh6HvcpRtAEa4iNJmadpVrmW1DK+xaKMTNt1hx JtQx9zxgGeI04cxGjZ00AjtT2fhN63AdCFK6jyKcv8NQX8zOXI7JB0LkRBCW6H7ztX4B7ahXJoa Zp1+nDQNBratiN5o8lODtTSbGn8NZbGs8jwo+CiAleA== X-Received: by 2002:a17:90a:ac04:b0:219:455a:f232 with SMTP id o4-20020a17090aac0400b00219455af232mr34285639pjq.140.1670230584385; Mon, 05 Dec 2022 00:56:24 -0800 (PST) X-Google-Smtp-Source: AA0mqf4Igc52qQHjy1AEKh0GRE9HUA3C4G1Bk8E5eK2wXUuHVk8mHKk7NTu5lL06PdvU8C+f2GGYBw== X-Received: by 2002:a17:90a:ac04:b0:219:455a:f232 with SMTP id o4-20020a17090aac0400b00219455af232mr34285627pjq.140.1670230584041; Mon, 05 Dec 2022 00:56:24 -0800 (PST) Received: from zoe.. ([2001:f74:8f00:c00:6aff::1005]) by smtp.gmail.com with ESMTPSA id q6-20020a170902a3c600b00178b77b7e71sm10018133plb.188.2022.12.05.00.56.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Dec 2022 00:56:23 -0800 (PST) From: Masahiro Yamada To: kernel-team@lists.ubuntu.com Subject: [L/unstable 01/13] UBUNTU: [Packaging] mark phony targets Date: Mon, 5 Dec 2022 17:56:07 +0900 Message-Id: <20221205085619.257813-2-masahiro.yamada@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221205085619.257813-1-masahiro.yamada@canonical.com> References: <20221205085619.257813-1-masahiro.yamada@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" I added the .PHONY before each of the target rules. If we add multiple phony targets to .PHONY in a single line, as in debian/rules.d/0-common-vars.mk, it is difficult to parse which target is missing the .PHONY marker. Signed-off-by: Masahiro Yamada --- debian/rules | 4 ++++ debian/rules.d/1-maintainer.mk | 8 +++++++- debian/rules.d/2-binary-arch.mk | 9 +++++++++ debian/rules.d/3-binary-indep.mk | 5 +++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 3cb6e8f2ea89..b5358727a901 100755 --- a/debian/rules +++ b/debian/rules @@ -122,10 +122,13 @@ nvidia_desktop_series=$(shell sed -n -e 's/^nvidia-graphics-drivers-\([0-9][0-9] nvidia_server_series=$(shell sed -n -e 's/^nvidia-graphics-drivers-\([0-9][0-9]*-server\) .*/\1/p' debian/dkms-versions) # Debian Build System targets +.PHONY: binary binary: binary-indep binary-arch +.PHONY: build build: build-arch build-indep +.PHONY: clean clean: debian/control debian/canonical-certs.pem debian/canonical-revoked-certs.pem dh_testdir dh_testroot @@ -152,6 +155,7 @@ clean: debian/control debian/canonical-certs.pem debian/canonical-revoked-certs. rm -f $(DROOT)/control.stub $(DEBIAN)/control.stub rm -f $(DROOT)/scripts/fix-filenames +.PHONY: distclean distclean: clean rm -rf $(DROOT)/control debian/changelog \ debian/control debian/control.stub debian/copyright \ diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index bcc3e4db3645..f20409ce6a72 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -42,6 +42,7 @@ help: @echo " : Use -jX for kernel compile" @echo " PRINTSHAS : Include SHAs for commits in changelog" +.PHONY: printdebian printdebian: @echo "$(DEBIAN)" @@ -60,7 +61,10 @@ migrateconfigs: fi rm -rf build -updateconfigs defaultconfigs genconfigs listnewconfigs importconfigs: +configs-targets := updateconfigs defaultconfigs genconfigs listnewconfigs importconfigs + +.PHONY: $(configs-targets) +$(configs-targets): dh_testdir; if [ -e "$(DEBIAN)/config/config.common.ubuntu" ]; then \ conc_level=$(conc_level) $(SHELL) $(DROOT)/scripts/misc/old-kernelconfig $@; \ @@ -189,11 +193,13 @@ startnewrelease: cat $(DEBIAN)/changelog >> $(DEBIAN)/changelog.new; \ mv $(DEBIAN)/changelog.new $(DEBIAN)/changelog +.PHONY: compileselftests compileselftests: # a loop is needed here to fail on errors for test in $(ubuntu_selftests); do \ $(kmake) -C tools/testing/selftests TARGETS="$$test"; \ done; +.PHONY: runselftests runselftests: $(kmake) -C tools/testing/selftests TARGETS="$(ubuntu_selftests)" run_tests diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 1ea051e9b5e7..9d2ded9cdee1 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -545,6 +545,7 @@ hmake := $(MAKE) -C $(CURDIR) O=$(headers_tmp) \ KERNELVERSION=$(abi_release) INSTALL_HDR_PATH=$(headers_tmp)/install \ SHELL="$(SHELL)" ARCH=$(header_arch) +.PHONY: install-arch-headers install-arch-headers: @echo Debug: $@ dh_testdir @@ -593,6 +594,7 @@ define dh_all_inline $(subst ${newline},; \${newline},$(call dh_all,$(1),$(2))) endef +.PHONY: binary-arch-headers binary-arch-headers: install-arch-headers @echo Debug: $@ dh_testdir @@ -757,6 +759,7 @@ endif endif @touch $@ +.PHONY: install-perarch install-perarch: toolspkgdir = $(CURDIR)/debian/$(tools_pkg_name) install-perarch: cloudpkgdir = $(CURDIR)/debian/$(cloud_pkg_name) install-perarch: $(stampdir)/stamp-build-perarch @@ -814,6 +817,7 @@ ifeq ($(do_tools_hyperv),true) endif endif +.PHONY: binary-perarch binary-perarch: toolspkg = $(tools_pkg_name) binary-perarch: cloudpkg = $(cloud_pkg_name) binary-perarch: install-perarch @@ -825,6 +829,7 @@ ifeq ($(do_cloud_tools),true) $(call dh_all,$(cloudpkg)) endif +.PHONY: binary-debs binary-debs: signing = $(CURDIR)/debian/$(bin_pkg_name)-signing binary-debs: signingv = $(CURDIR)/debian/$(bin_pkg_name)-signing/$(release)-$(revision) binary-debs: signing_tar = $(src_pkg_name)_$(release)-$(revision)_$(arch).tar.gz @@ -838,6 +843,8 @@ ifeq ($(any_signed),true) endif build-arch-deps-$(do_flavour_image_package) += $(addprefix $(stampdir)/stamp-install-,$(flavours)) + +.PHONY: build-arch build-arch: $(build-arch-deps-true) @echo Debug: $@ @@ -850,6 +857,8 @@ binary-arch-deps-$(do_libc_dev_package) += binary-arch-headers ifneq ($(do_common_headers_indep),true) binary-arch-deps-$(do_flavour_header_package) += binary-headers endif + +.PHONY: binary-arch binary-arch: $(binary-arch-deps-true) @echo Debug: $@ diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk index 95ad7056459b..520a6c03bbe7 100644 --- a/debian/rules.d/3-binary-indep.mk +++ b/debian/rules.d/3-binary-indep.mk @@ -1,3 +1,4 @@ +.PHONY: build-indep build-indep: @echo Debug: $@ @@ -29,6 +30,7 @@ endif docpkg = $(doc_pkg_name) docdir = $(CURDIR)/debian/$(docpkg)/usr/share/doc/$(docpkg) +.PHONY: install-doc install-doc: $(stampdir)/stamp-prepare-indep @echo Debug: $@ ifeq ($(do_doc_package),true) @@ -81,6 +83,7 @@ ifeq ($(do_source_package_content),true) endif endif +.PHONY: install-tools install-tools: toolspkg = $(tools_common_pkg_name) install-tools: toolsbin = $(CURDIR)/debian/$(toolspkg)/usr/bin install-tools: toolssbin = $(CURDIR)/debian/$(toolspkg)/usr/sbin @@ -177,11 +180,13 @@ $(stampdir)/stamp-prepare-indep: dh_prep -i @touch $@ +.PHONY: install-indep install-indep: $(stampdir)/stamp-install-headers install-doc install-source install-tools @echo Debug: $@ # This is just to make it easy to call manually. Normally done in # binary-indep target during builds. +.PHONY: binary-headers binary-headers: $(stampdir)/stamp-prepare-indep $(stampdir)/stamp-install-headers @echo Debug: $@ dh_installchangelogs -p$(indep_hdrpkg) From patchwork Mon Dec 5 08:56:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1712169 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=SrpnP14y; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NQcq750xPz23yl for ; Mon, 5 Dec 2022 19:56:35 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1p27H2-0006Ip-Ul; Mon, 05 Dec 2022 08:56:28 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1p27H1-0006IQ-Of for kernel-team@lists.ubuntu.com; Mon, 05 Dec 2022 08:56:27 +0000 Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 290193F0E9 for ; Mon, 5 Dec 2022 08:56:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1670230587; bh=uAxoU97Fg0fVn1YAW33oN6kLQ9VZ+Q7IeIAI8XjmjTE=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=SrpnP14yeilyfWvieMjnQO25dfEhC4OMFncT/ckCcIwYWWawFXVUY7aIZnOjl7wlK wBiVLBy9dFlugb8pJOM3IvjkvaowQy98VZ3MSDNzQVLxS5Jz4gC7+bbrlSX2HLaUhP owWcHYFbwE6EJsv3Wg5+Xo2shMg+dBHXCVgyoDx4n02dkgEdg4az02hkaJZhikqnJs NFWSACn3YBWLDXOS418VqHPJ58jwE1gs8I9TfkWYAu/qlJzlwchCqXF57ACqRP5hzP WaHnxHkGcdfmwIqryIH/XWwoeGqTnbbkrt2HFA7DGo8P1O/bx/05NExJIMHRHH7XKt 3Y45aXS58C7Kw== Received: by mail-pg1-f200.google.com with SMTP id f132-20020a636a8a000000b00473d0b600ebso9701305pgc.14 for ; Mon, 05 Dec 2022 00:56:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uAxoU97Fg0fVn1YAW33oN6kLQ9VZ+Q7IeIAI8XjmjTE=; b=J9JCbr1xrVYUUA2Fe4EzLpK0hWSi4Lb+4ZqqJMlm21kD/iEU39hs8Ap1oYS+v5Z3op s3Naa8P9wA6V3iOILR5HcangF0vELExjBaCm3vcJLgZ0xMklir/NNFdX11Z7yEGqC3qG 3pZuJ1q1fyy+sv0rQD/Z+7ojrW6TG9uTUbRm4NRwnadX3e1Xrdn4wTJEGQLKqU6jZx5d 37aM1+1/A03KlOVMKijpgmQIdxexKxyTx9t2EQNkl6iwBvZQpz6yu/3eY7vYciiaFPfp gVKiKvwYDgyQ0xHWFChtZEwVXz0s2KApWxO/SlFjM14rIcwKueKY5H5immJ484F1Fodg e89A== X-Gm-Message-State: ANoB5pkYoTkuNHGFGO9/t3+zA6P2i1tGiMTo7zvzuSeK/yYeLAlsjsxI YB3YRySfpX6moQ23MuoCgBSjqqhG5LtNh/pt5NKMYn4yIj6JUDA8nX7aBsxyLcUKOMy9/r3uRyJ leLRQR+5aAkS7n0jtGNRJAUfyRhu6tOb+AD6HYka0lQ== X-Received: by 2002:a17:902:708a:b0:189:7372:1451 with SMTP id z10-20020a170902708a00b0018973721451mr44588922plk.122.1670230585584; Mon, 05 Dec 2022 00:56:25 -0800 (PST) X-Google-Smtp-Source: AA0mqf7KsTlN+IxhFX15ozttj6L1KeQsRPRh7lxZHTnIT66aXiXajX/Ox4g7Q62WXgRYO0TOxOQzRg== X-Received: by 2002:a17:902:708a:b0:189:7372:1451 with SMTP id z10-20020a170902708a00b0018973721451mr44588912plk.122.1670230585286; Mon, 05 Dec 2022 00:56:25 -0800 (PST) Received: from zoe.. ([2001:f74:8f00:c00:6aff::1005]) by smtp.gmail.com with ESMTPSA id q6-20020a170902a3c600b00178b77b7e71sm10018133plb.188.2022.12.05.00.56.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Dec 2022 00:56:25 -0800 (PST) From: Masahiro Yamada To: kernel-team@lists.ubuntu.com Subject: [L/unstable 02/13] UBUNTU: [Packaging] Make the compiler for fix-filenames explicit Date: Mon, 5 Dec 2022 17:56:08 +0900 Message-Id: <20221205085619.257813-3-masahiro.yamada@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221205085619.257813-1-masahiro.yamada@canonical.com> References: <20221205085619.257813-1-masahiro.yamada@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" The rule for debian/scripts/fix-filenames: $(CC) -o $@ $^ is fragile because 'CC' is not set anywhere in our Makefiles. We rely on GNU Make using 'CC' in its internal database. This assumption would break if the -R option is given. In this case, the line above would expand to: -o $@ $^ What is worse, GNU Make ignores errors if the recipe line starts with '-'. (See the note below) Then, GNU Make would proceed without building fix-filenames. $ debian/rules -R debian/scripts/fix-filenames o debian/scripts/fix-filenames debian/scripts/fix-filenames.c /bin/bash: line 1: o: command not found make: [debian/rules.d/2-binary-arch.mk:17: debian/scripts/fix-filenames] Error 127 (ignored) Make the compiler explicit, and change the posion of -o to make it even robust. [Note] Make manual "5.5 Errors in Recipes" [1] says: To ignore errors in a recipe line, write a ‘-’ at the beginning of the line’s text (after the initial tab). The ‘-’ is discarded before the line is passed to the shell for execution. [1]: https://www.gnu.org/software/make/manual/make.html#Errors Signed-off-by: Masahiro Yamada --- debian/rules.d/0-common-vars.mk | 4 +++- debian/rules.d/2-binary-arch.mk | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index 1d8f8b85772f..c0910d46670a 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -251,10 +251,12 @@ conc_level = -j$(CONCURRENCY_LEVEL) PYTHON ?= $(firstword $(wildcard /usr/bin/python3) $(wildcard /usr/bin/python2) $(wildcard /usr/bin/python)) +HOSTCC ?= $(DEB_BUILD_GNU_TYPE)-$(gcc) + # target_flavour is filled in for each step kmake = make ARCH=$(build_arch) \ CROSS_COMPILE=$(CROSS_COMPILE) \ - HOSTCC=$(DEB_BUILD_GNU_TYPE)-$(gcc) \ + HOSTCC=$(HOSTCC) \ CC=$(CROSS_COMPILE)$(gcc) \ KERNELVERSION=$(abi_release)-$(target_flavour) \ CONFIG_DEBUG_SECTION_MISMATCH=y \ diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 9d2ded9cdee1..56353ff6165f 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -14,7 +14,7 @@ endif shlibdeps_opts = $(if $(CROSS_COMPILE),-- -l$(CROSS_COMPILE:%-=/usr/%)/lib) debian/scripts/fix-filenames: debian/scripts/fix-filenames.c - $(CC) -o $@ $^ + $(HOSTCC) $^ -o $@ $(stampdir)/stamp-prepare-%: config-prepare-check-% @echo Debug: $@ From patchwork Mon Dec 5 08:56:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1712172 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=UWFf/0T6; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NQcqG03q0z23p1 for ; Mon, 5 Dec 2022 19:56:42 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1p27H6-0006N5-VH; Mon, 05 Dec 2022 08:56:33 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1p27H3-0006JA-Ph for kernel-team@lists.ubuntu.com; Mon, 05 Dec 2022 08:56:29 +0000 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 46FBD3F0E9 for ; Mon, 5 Dec 2022 08:56:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1670230588; bh=loWr694RzH1V6TCT1lCDXKC2YLYaiXJp4v5M6RvpFA4=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UWFf/0T67br7eFBXgttHv6q5pDb63kWYQNzLfsO5tejQYobFkiDgTkaS0g+QdaZBq YvzPGBr4XRwzXLDuwRpUvcm3sFhioCK03sQw2GWpHsLmqSH+JhYnJQYNAZ8Y3krBHF aXIyiR6hlrRRd3N9+EeCtIPx7vZiRITzGV9Q3n1HQFc56Y4fMro5BC8IzOTdoysnz3 dhJwS00PEiq8JJ1TjL+qBBXy2geBIwF9tlhqOBXxwqfm1HcW1STPElrHsQmVDrrbNH Sll9I3Xj+8PgLK/mg8mxI7dSezBaNPgF6VciGgJdrwO7srMibNf71XvBtMbSFNDFS2 YWTeSUBVezufA== Received: by mail-pl1-f197.google.com with SMTP id b17-20020a170903229100b00189da3b178bso1669850plh.7 for ; Mon, 05 Dec 2022 00:56:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=loWr694RzH1V6TCT1lCDXKC2YLYaiXJp4v5M6RvpFA4=; b=NUoMlsb+oVHtMCl6cAn+6skW5PNsKf1/El6CaahImkRFUx02J7UcZoUCRIIAujVsMf etxNhzQlG2p4F/OumHJ+YtVoZmMDyJLtMzqBAKzgqNAlNz/GcZbnmjSm8m+U23Vr8nse s0MMpsm/F0Bfjg9iwxTOVKhC9GJegC/jQ6coDpTsPLcFsSbTUYX4OewJ7CkTL1yWLtIA 5lSpgXycT8r4P9OeCgHrYwSylcq0q2G+fTuASWL8geOVLYNJc3uFICsRHmUJ4CFB9RJ2 WtQ9fwRQKk++LWjnZOLY71pYuIR5GzAkS1g2gk2W+YDY7bMoGZJmwGZvpgy3xvO2jY1s LGPQ== X-Gm-Message-State: ANoB5pk4a7ht2iSUSqZnxDu/FR+EeO5M6SVfpEtqQhQDX+meXwVCza5k 0jLJXJkLcM6VrAheQcAkqH/SGVL/NHJB0LgureLDGk6eSNNuueu9tRYhmgyg0DsH9OmDibjI+2r DQIC7XA3+NVbh4TDdK0SECPZv8Ry8vfYeenCfieE3Zw== X-Received: by 2002:a17:90b:1095:b0:219:237c:7986 with SMTP id gj21-20020a17090b109500b00219237c7986mr42473441pjb.220.1670230586828; Mon, 05 Dec 2022 00:56:26 -0800 (PST) X-Google-Smtp-Source: AA0mqf6qxES6CeOQ+gBiu2SdVyIz8nUpmglNyBx85pVzR3a+/JUeTSIhzcGlTUxPHoJzQ1841M34NQ== X-Received: by 2002:a17:90b:1095:b0:219:237c:7986 with SMTP id gj21-20020a17090b109500b00219237c7986mr42473424pjb.220.1670230586560; Mon, 05 Dec 2022 00:56:26 -0800 (PST) Received: from zoe.. ([2001:f74:8f00:c00:6aff::1005]) by smtp.gmail.com with ESMTPSA id q6-20020a170902a3c600b00178b77b7e71sm10018133plb.188.2022.12.05.00.56.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Dec 2022 00:56:26 -0800 (PST) From: Masahiro Yamada To: kernel-team@lists.ubuntu.com Subject: [L/unstable 03/13] UBUNTU: [Packaging] add -rR MAKEFLAGS to clear implicit rules Date: Mon, 5 Dec 2022 17:56:09 +0900 Message-Id: <20221205085619.257813-4-masahiro.yamada@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221205085619.257813-1-masahiro.yamada@canonical.com> References: <20221205085619.257813-1-masahiro.yamada@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Cancel implicit rules, otherwise GNU Make will try to examine a lot of internal rules to update makefiles. Add -rR, as the Kbuild does. [1] If you want to see what is happening behind the scene: $ dpkg-buildpackage --rules-file="debian/rules -d" [Before] Updating makefiles.... Considering target file 'debian/rules.d/4-checks.mk'. Looking for an implicit rule for 'debian/rules.d/4-checks.mk'. Trying pattern rule with stem '4-checks.mk'. Trying implicit prerequisite 'debian/rules.d/4-checks.mk.o'. Trying pattern rule with stem '4-checks.mk'. Trying implicit prerequisite 'debian/rules.d/4-checks.mk.c'. Trying pattern rule with stem '4-checks.mk'. Trying implicit prerequisite 'debian/rules.d/4-checks.mk.cc'. Trying pattern rule with stem '4-checks.mk'. Trying implicit prerequisite 'debian/rules.d/4-checks.mk.C'. Trying pattern rule with stem '4-checks.mk'. Trying implicit prerequisite 'debian/rules.d/4-checks.mk.cpp'. Trying pattern rule with stem '4-checks.mk'. Trying implicit prerequisite 'debian/rules.d/4-checks.mk.p'. Trying pattern rule with stem '4-checks.mk'. Trying implicit prerequisite 'debian/rules.d/4-checks.mk.f'. [ snip a tons of examinations for implicit rules ] No implicit rule found for 'debian/rules.d/4-checks.mk'. Finished prerequisites of target file 'debian/rules.d/4-checks.mk'. No need to remake target 'debian/rules.d/4-checks.mk'. [After] Updating makefiles.... Considering target file 'debian/rules.d/4-checks.mk'. Looking for an implicit rule for 'debian/rules.d/4-checks.mk'. No implicit rule found for 'debian/rules.d/4-checks.mk'. Finished prerequisites of target file 'debian/rules.d/4-checks.mk'. [1]: https://github.com/torvalds/linux/blob/v6.0/Makefile#L41 Signed-off-by: Masahiro Yamada --- debian/rules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index b5358727a901..f2b460354f6c 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,10 @@ # Copyright (c) 2007 Ben Collins # +# Do not use make's built-in rules and variables +# (this increases performance and avoids hard-to-debug behaviour) +MAKEFLAGS += -rR + DEBIAN=$(shell awk -F= '($$1 == "DEBIAN") { print $$2 }' X-Patchwork-Id: 1712171 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=ClHPA9Ek; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NQcqB6gZbz23yl for ; Mon, 5 Dec 2022 19:56:38 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1p27H5-0006Ku-Hc; Mon, 05 Dec 2022 08:56:31 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1p27H3-0006JP-Pb for kernel-team@lists.ubuntu.com; Mon, 05 Dec 2022 08:56:29 +0000 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 91B3B3F120 for ; Mon, 5 Dec 2022 08:56:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1670230589; bh=4pADmsO+tvM8X1suu1HeOE7FE6cvJ4+cK9wZ16/Nnoc=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ClHPA9Ek+nSSHD3iPE6OBsBJp/8MXBkWrVrDDGoRULGZmhgbngOzX7R/O2OUx3pub a/EolCDjXdJdBJ5z0kDcXaxN4YXSld9huIRN7rl1EFMTXRw9GmgNobROTe/4LLi7jS yCd9+F5oJtdoZMNIBVyhMQnos81aLbiO9B7CX1pj37QB+Hu2kyhMJBgkaZaCVfPyt3 feRLoE+UGliDRexZBfDwDdqsWhwxqiNpBoBK9moijRVkJu5EM+yTkP+3T9EfQS48WJ Ud8CDpFpW/Llr0XEwHrmYZa75Oj7QoV7/SujXxRvaGwMcqtJWc0V5+14X/YT5HsEDW e0qPMZd9A3K/A== Received: by mail-pl1-f199.google.com with SMTP id t1-20020a170902b20100b001893ac9f0feso13072037plr.4 for ; Mon, 05 Dec 2022 00:56:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4pADmsO+tvM8X1suu1HeOE7FE6cvJ4+cK9wZ16/Nnoc=; b=mq7irx4rYCsXk6UfspDDVEP7Hgj31xGe0vDtuc6XnkLiE3kNTwjwDxQAzlIF1jOzkB YN5gQOOu3lm7IPnYVUN+AXmn3O4mMS/sUlpMrcvd9n+ymdcymX12JbkTCpBk47PNFBSs rTDHbPPfkIP6f7NofnUY8zxJBEOt9MK98cvmhX0FMpCt1PgeZ+Ntd/Qeyfggd7QV6+dx CFydyVj4LB9xPD9FPU1kQaAL0Mq2JaIE+z36fM4n+3KKvq5TZybYmryxUFBF9zv8l6S9 SU3TzWYaNasny1orc3JBGkJsT1oc26CpR9NQCTs5Cn8ssfZfRKQyjQidh/Du1hoN+oP6 Ov9Q== X-Gm-Message-State: ANoB5pm7xNTJPPpXxhmQ/Odsb7rOAixfrUfeV4bjk7hpN7+/EJ9xbis7 na5DUIODkpDZRMSV4yJwp4hYKonabnygyIH3uLLe2NRMhvmOTAljrp4VFhqTkS32pkv53WRErex 78eYLssA3w89agUW7pnis96zAYqtpDXsmRs71N6/KTA== X-Received: by 2002:a17:902:f092:b0:189:9b43:a082 with SMTP id p18-20020a170902f09200b001899b43a082mr30787146pla.95.1670230588126; Mon, 05 Dec 2022 00:56:28 -0800 (PST) X-Google-Smtp-Source: AA0mqf47FTbXVj/IvAkxLTVrLGfTqVKu+y0r4u2Osv9JvZeFK5Pv42WXivTVr1fx6Gx24uFskmFiGg== X-Received: by 2002:a17:902:f092:b0:189:9b43:a082 with SMTP id p18-20020a170902f09200b001899b43a082mr30787134pla.95.1670230587806; Mon, 05 Dec 2022 00:56:27 -0800 (PST) Received: from zoe.. ([2001:f74:8f00:c00:6aff::1005]) by smtp.gmail.com with ESMTPSA id q6-20020a170902a3c600b00178b77b7e71sm10018133plb.188.2022.12.05.00.56.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Dec 2022 00:56:27 -0800 (PST) From: Masahiro Yamada To: kernel-team@lists.ubuntu.com Subject: [L/unstable 04/13] UBUNTU: [Packaging] use dpkg-parsechangelog to get package name and series Date: Mon, 5 Dec 2022 17:56:10 +0900 Message-Id: <20221205085619.257813-5-masahiro.yamada@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221205085619.257813-1-masahiro.yamada@canonical.com> References: <20221205085619.257813-1-masahiro.yamada@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" dpkg-parsechangelog is more readable than the complex regex matching. Also, use the simple variables (:=) instead of recursive variables (=) since these are used over and over again. Invoking the shell every time is not efficient. Signed-off-by: Masahiro Yamada --- debian/rules.d/0-common-vars.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index c0910d46670a..104029dc0a8e 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -4,10 +4,10 @@ comma = , # # The source package name will be the first token from $(DEBIAN)/changelog # -src_pkg_name=$(shell sed -n '1s/^\(.*\) (.*).*$$/\1/p' $(DEBIAN)/changelog) +src_pkg_name := $(shell dpkg-parsechangelog -l$(DEBIAN)/changelog -S source) # Get the series -series=$(shell dpkg-parsechangelog -l$(DEBIAN)/changelog | sed -ne 's/^Distribution: *//p' | sed -e 's/-\(security\|updates\|proposed\)$$//') +series := $(shell dpkg-parsechangelog -l$(DEBIAN)/changelog -S distribution | sed -e 's/-\(security\|updates\|proposed\)$$//') # Get some version info release := $(shell sed -n '1s/^$(src_pkg_name).*(\(.*\)-.*).*$$/\1/p' $(DEBIAN)/changelog) From patchwork Mon Dec 5 08:56:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1712173 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=FkXoWGW7; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NQcqG5XG9z23yl for ; Mon, 5 Dec 2022 19:56:42 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1p27H8-0006Oy-8g; Mon, 05 Dec 2022 08:56:34 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1p27H5-0006KW-8Y for kernel-team@lists.ubuntu.com; Mon, 05 Dec 2022 08:56:31 +0000 Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 037103F0E9 for ; Mon, 5 Dec 2022 08:56:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1670230591; bh=LTEvg10MzHjJKn+HSzDRG1o2WljBHJP/U/NTLsAjI8s=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=FkXoWGW7ZxB9BB/yiDBHSzzD9AYsry1AlzexXkRBqAouxJWEd0TfS7jUxiWkqx/iW jQDSIk8mKk+a+JZZbgR3v2YkqsQazG5bWxOonEd2cSh0YjnfpOv+ym8ZtOr3HQ36Xq giTakyFD0izBkBRU0dWeB6grHig29TOtMD+DBImmfgXTLAIA2oKjiqvlv3cRYI1GqW aIKZGGgUhwAy68rHRJ9gktwFL4hNBNvVw0psrL9xClMxnCxa2wjiR8EY58NjlJvwX9 deWY0ZAVClsWFtdM3Yy6I785uQzS/njNsBtMM1YfSaYEEDfQYBcH7lJHIy5LIICoAA zWWoORXl0gtOw== Received: by mail-pj1-f69.google.com with SMTP id v16-20020a17090a899000b00219b1f0ddebso4523764pjn.5 for ; Mon, 05 Dec 2022 00:56:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LTEvg10MzHjJKn+HSzDRG1o2WljBHJP/U/NTLsAjI8s=; b=XtfN0dFkkegM0ncNmbpMD7KBf/I37RXjBtjNASHAGakn9A9WmhctOM1jk/AFAkGAhI UTPD5gJVCwkIrqOBv0oRztfrwbCG3wjk/Ldvy5946H+ekC5AngnDpPuOsNbxAKA0VZ9p BYf9/nHKO3Ce6T2KKtvsAiaHbKwiN/ypc0RqcAAL/iQZwKHp41fj4Itlk6+S9cujQv9V fYqi0WILXAP5RjgUIRr1pYVr2tGHetP2MYtnshCF00gHzeekRpO3xi8Q/pgx/WqqdbHY smgR8fsLGRuJ/QUTgqaNBnrPZET9NyC5mNDc2a06CoW3uf7sTNr/nBy5z3ucjDcnGT2a iY6w== X-Gm-Message-State: ANoB5pkTH7MMAJGvpMAJyZ6Hx9H6nViPyqPmkLZmP3RgZo6GVK+1ZD1t WZ5r7m8Bc2UD2Hfdht3zX3To15hDFA14ngK88xKoe6PqFFNq48xOe0xulN/vDU1wRKCLgbUfO9Y i6nzykqiHsLvdYFx8dimq243w0gLMxix5kZBMPP+Pzw== X-Received: by 2002:a17:902:8a90:b0:189:680e:ac3a with SMTP id p16-20020a1709028a9000b00189680eac3amr47825516plo.77.1670230589508; Mon, 05 Dec 2022 00:56:29 -0800 (PST) X-Google-Smtp-Source: AA0mqf6i8SJaYo4aVXsAhF9Z7kuxu9jj38UdBz77hp6Gee5V4HhhLNc/uuLrxSL7x2TW5wXiEmCyvw== X-Received: by 2002:a17:902:8a90:b0:189:680e:ac3a with SMTP id p16-20020a1709028a9000b00189680eac3amr47825503plo.77.1670230589149; Mon, 05 Dec 2022 00:56:29 -0800 (PST) Received: from zoe.. ([2001:f74:8f00:c00:6aff::1005]) by smtp.gmail.com with ESMTPSA id q6-20020a170902a3c600b00178b77b7e71sm10018133plb.188.2022.12.05.00.56.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Dec 2022 00:56:28 -0800 (PST) From: Masahiro Yamada To: kernel-team@lists.ubuntu.com Subject: [L/unstable 05/13] UBUNTU: [Packaging] simplify revision/release Date: Mon, 5 Dec 2022 17:56:11 +0900 Message-Id: <20221205085619.257813-6-masahiro.yamada@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221205085619.257813-1-masahiro.yamada@canonical.com> References: <20221205085619.257813-1-masahiro.yamada@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Use "dpkg-parsepackage -S version" to get the version, and use Make's built-in functions to split it into the upsteam-version and the debian revision. This is more readable and works more efficiently. BTW, GNU Make >= 3.81 supports $(lastword x) as a shorthand of $(word $(words x), x). Drop "revisions" and "prev_revisions", which are unused anywhere except "printenv". I did not get the use of "?=" for revision and prev_revison, but I am keeping them in case I am missing something here. Signed-off-by: Masahiro Yamada --- debian/rules.d/0-common-vars.mk | 15 +++++++-------- debian/rules.d/1-maintainer.mk | 2 -- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index 104029dc0a8e..a54b83dd943b 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -1,5 +1,7 @@ # Used when you need to 'escape' a comma. comma = , +empty := +space := $(empty) $(empty) # # The source package name will be the first token from $(DEBIAN)/changelog @@ -10,15 +12,12 @@ src_pkg_name := $(shell dpkg-parsechangelog -l$(DEBIAN)/changelog -S source) series := $(shell dpkg-parsechangelog -l$(DEBIAN)/changelog -S distribution | sed -e 's/-\(security\|updates\|proposed\)$$//') # Get some version info -release := $(shell sed -n '1s/^$(src_pkg_name).*(\(.*\)-.*).*$$/\1/p' $(DEBIAN)/changelog) -revisions := $(shell sed -n 's/^$(src_pkg_name)\ .*($(release)-\(.*\)).*$$/\1/p' $(DEBIAN)/changelog | tac) -revision ?= $(word $(words $(revisions)),$(revisions)) -prev_revisions := $(filter-out $(revision),0.0 $(revisions)) -ifneq (,$(prev_revisions)) -prev_revision := $(word $(words $(prev_revisions)),$(prev_revisions)) -endif +version := $(shell dpkg-parsechangelog -l$(DEBIAN)/changelog -S version) +revision ?= $(lastword $(subst -,$(space),$(version))) +release := $(patsubst %-$(revision),%,$(version)) -prev_fullver ?= $(shell dpkg-parsechangelog -l$(DEBIAN)/changelog -o1 -c1 | sed -ne 's/^Version: *//p') +prev_fullver ?= $(shell dpkg-parsechangelog -l$(DEBIAN)/changelog -o1 -c1 -S version) +prev_revision := $(lastword 0.0 $(subst -,$(space),$(prev_fullver))) # Get variants. Assume primary if debian/variants is not present. variants = -- diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index f20409ce6a72..1eb84f6b1943 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -78,10 +78,8 @@ printenv: @echo "src package name = $(src_pkg_name)" @echo "series = $(series)" @echo "release = $(release)" - @echo "revisions = $(revisions)" @echo "revision = $(revision)" @echo "uploadnum = $(uploadnum)" - @echo "prev_revisions = $(prev_revisions)" @echo "prev_revision = $(prev_revision)" @echo "abinum = $(abinum)" @echo "upstream_tag = $(upstream_tag)" From patchwork Mon Dec 5 08:56:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1712174 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=gfH+V7Aq; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NQcqK5rPyz23p1 for ; Mon, 5 Dec 2022 19:56:45 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1p27H9-0006Qr-9V; Mon, 05 Dec 2022 08:56:35 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1p27H6-0006MZ-Om for kernel-team@lists.ubuntu.com; Mon, 05 Dec 2022 08:56:32 +0000 Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 5AEBF3F120 for ; Mon, 5 Dec 2022 08:56:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1670230592; bh=6czmO4QqGzrQS06mJJw5yjeurK7K8SqENQbmOMfTJG8=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gfH+V7AqGK+rOCG21+j9OHwV9ZMtGNzG2zqRqlDcaa8p9aUvOmd0km6TryZ+wf7sp rif2erh79xpUJEh43e9OEiJAkWcGGtAc8Kz2qjeQ2RpUEv8FGFUXnFH8HzRcjXbOYi nQ1j04wFrhkXgNdougIyJht1eXVrxX7F3RxeLRWddj2nVqOIckNCPQlXXtXWyW4Gay /tnTibA1rED9XMU/l3sQHONsImujeczly7YZW5+JP7/RemidJXozUYoCJYDwj9TfKB 9EhEJP1RqfwXC/Bcw2QdNan7RZ2FZWMNdWSAkUi8azPswZ/0fIAkMbbcj2Z1wvL1f2 bQo42d/0RgC+Q== Received: by mail-pf1-f199.google.com with SMTP id e6-20020aa78c46000000b005772151d489so235968pfd.15 for ; Mon, 05 Dec 2022 00:56:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6czmO4QqGzrQS06mJJw5yjeurK7K8SqENQbmOMfTJG8=; b=sLg4+VuXIA9n6twlJ85azbdV18YTl3RdeB31hQNLFfbYZWV1Up45+TsG67C2gihVIv 8DmrRzuEept76aru5mdAwYd5tF33S5fEug9wInx5VeT8wGMO4lJwUBkmUzjAaz/BJWuo EFVvtpv43YubqBfvB9+I4XFEKyHmpif/tUPu/akAFKgsQ/3cNec+lZo4CIhu0qe44kbI tVlBl9TVUveFCKcYZ/NYhokrebjMWFe7sKGgD4/TmMJKHnxfPrIeTLYaJxyzKTo/fMfC tyvo8tDQg/3WIQzmDRte69Izt4JK/TkTDUO3xNvXYzwNEKruYJ6PrjXvGQYAWVkG8U8D 7CIA== X-Gm-Message-State: ANoB5pnP64JvMrW9lrW78+y7p0u3U3UQpSgytM9JvlJdZUI7NXvUxSF+ FEPE1NGptrE27BOrTvXwG9c55U9TunCxM2nurZTim1F66BJrM6By1YR869J+yTWpJ33eXcF6Unj XUa/kqxXa7IOfr8CGchJ5ix4vMs+cFFTsUc1kR2faJA== X-Received: by 2002:a63:ff62:0:b0:476:898c:ded8 with SMTP id s34-20020a63ff62000000b00476898cded8mr64358839pgk.251.1670230590758; Mon, 05 Dec 2022 00:56:30 -0800 (PST) X-Google-Smtp-Source: AA0mqf7Ck0K/5ScJm0+RL7bWMTAfGlE/ftvCC1KeWsSM/TdmQ7P1vZC4Dk3Ut6i4A9o75/Vj9nvleg== X-Received: by 2002:a63:ff62:0:b0:476:898c:ded8 with SMTP id s34-20020a63ff62000000b00476898cded8mr64358823pgk.251.1670230590473; Mon, 05 Dec 2022 00:56:30 -0800 (PST) Received: from zoe.. ([2001:f74:8f00:c00:6aff::1005]) by smtp.gmail.com with ESMTPSA id q6-20020a170902a3c600b00178b77b7e71sm10018133plb.188.2022.12.05.00.56.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Dec 2022 00:56:30 -0800 (PST) From: Masahiro Yamada To: kernel-team@lists.ubuntu.com Subject: [L/unstable 06/13] UBUNTU: [Packaging] simplify custom_override Date: Mon, 5 Dec 2022 17:56:12 +0900 Message-Id: <20221205085619.257813-7-masahiro.yamada@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221205085619.257813-1-masahiro.yamada@canonical.com> References: <20221205085619.257813-1-masahiro.yamada@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" You do not need to invoke the shell for if/else choice. You can do it by using the $(if ...) built-in function. $(if $($(1)_$(2)),$($(1)_$(2)),$($(1))) GNU Make >= 3.81 supports $(or ...), so the code can be even simpler: $(or $($(1)_$(2)),$($(1))) No functional change is intended. Signed-off-by: Masahiro Yamada --- debian/rules.d/0-common-vars.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index a54b83dd943b..ec9c5680493b 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -278,8 +278,7 @@ LN = ln -sf # Checks if a var is overriden by the custom rules. Called with var and # flavour as arguments. -custom_override = \ - $(shell if [ -n "$($(1)_$(2))" ]; then echo "$($(1)_$(2))"; else echo "$($(1))"; fi) +custom_override = $(or $($(1)_$(2)),$($(1))) # selftests that Ubuntu cares about ubuntu_selftests = breakpoints cpu-hotplug efivarfs memfd memory-hotplug mount net ptrace seccomp timers powerpc user ftrace From patchwork Mon Dec 5 08:56:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1712175 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=TskIvLHF; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NQcqR5PSjz23p1 for ; Mon, 5 Dec 2022 19:56:51 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1p27HD-0006Vz-67; Mon, 05 Dec 2022 08:56:39 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1p27H8-0006Pf-Vh for kernel-team@lists.ubuntu.com; Mon, 05 Dec 2022 08:56:35 +0000 Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 19E173F120 for ; Mon, 5 Dec 2022 08:56:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1670230594; bh=585jsg4PD5jgMcspyRnKtmwSkxHmGbDw74CgD+pkzxs=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TskIvLHF/VfknwWit8EXCLtzQqQgZdIashNWg+vvZPBrii63awDGkDeHmNzwKrfwX CBxkz8jGV7PuuARlYpLoJ3GAx79Ti2MiJRC+rT6Dj81OO+em2H2unFJ5H+1iksf6Qk sHjD52V8f+oIn5KJzPZN2H2xSS9YYKD7xE+IPY0qGw5Jh/kH7Uz+hg4KgZr89Ga3RC 8LKysU70E1gASPyyR0vZM6GEmMl8805EA0ak92feyG+J9dWjw4Lgcowt6cLXWtTK7/ 6RXj5U3qwdufx4yQG/GHk43/Jo8EBx0qezD7iphX/63vot1rZny95kbGCOA6mwsRX7 cNvlq4hyvlbqg== Received: by mail-pf1-f200.google.com with SMTP id n16-20020a056a000d5000b005764608bb24so8527496pfv.12 for ; Mon, 05 Dec 2022 00:56:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=585jsg4PD5jgMcspyRnKtmwSkxHmGbDw74CgD+pkzxs=; b=nTvVQR/po3eYaUXfCuOt3SusDwIcegWfXJ1ciKgzYs0yY24BChbKYQiBawDNjE3HjP IXek4fCdX+aqmGVo/y+G6Z7uQk7zskRZ2OsoP2AdXnaUOjZ45yN5wFPFXe20fMrfvwaz GFaZLU14uSCfOCq6pEOFMxHLXnZHklgPuIXWRQ50grt/pzuviO9fHbXh6ceIT8LdOAeV sBxb1Fy44EcwfkScNJYDRguk4RbsKb2HvoCSk8MW1Rv3Z/A6H/1AmVc16nbGdcT3OctM +eN8sw4hvUEA/4xDvgRFSvF8rOv91ScUNA+oueWjXvXaAOANZGfkFbcyeQB7M5nqayKS zF0A== X-Gm-Message-State: ANoB5pkhxKDbWEVCNgm3445x7VnHsWgsHLRqjt1Ib42lGt3CS6+PVUdv yjaNB/iUuKgwS6yyaLiZwP7VbmOcqPzu2JmrvrxURtZ/Ug/m+etDhfDPuoeifs3VkSa1LnOrGod erSJ4T2t0JM4uFyjQEJMSoUMKzXEydgFdjdESodf8Sw== X-Received: by 2002:a65:5c4b:0:b0:477:2aac:56bb with SMTP id v11-20020a655c4b000000b004772aac56bbmr71156053pgr.570.1670230592121; Mon, 05 Dec 2022 00:56:32 -0800 (PST) X-Google-Smtp-Source: AA0mqf61dxz9h5UffTlFzRZp08mtw0X7XfKgdPh2Npa6Z53l9NkzF7rB+vdtHTvYosWPrI5zTlSizA== X-Received: by 2002:a65:5c4b:0:b0:477:2aac:56bb with SMTP id v11-20020a655c4b000000b004772aac56bbmr71156038pgr.570.1670230591792; Mon, 05 Dec 2022 00:56:31 -0800 (PST) Received: from zoe.. ([2001:f74:8f00:c00:6aff::1005]) by smtp.gmail.com with ESMTPSA id q6-20020a170902a3c600b00178b77b7e71sm10018133plb.188.2022.12.05.00.56.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Dec 2022 00:56:31 -0800 (PST) From: Masahiro Yamada To: kernel-team@lists.ubuntu.com Subject: [L/unstable 07/13] UBUNTU: [Packaging] Remove meaningless code in install-arch-headers Date: Mon, 5 Dec 2022 17:56:13 +0900 Message-Id: <20221205085619.257813-8-masahiro.yamada@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221205085619.257813-1-masahiro.yamada@canonical.com> References: <20221205085619.257813-1-masahiro.yamada@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" install-arch-headers pointlessly constructs the .config before running 'make headers_install'. The kernel promises the stable interface to userspace; this is backward-compatible and of course, independent of the kernel configuration. Kbuild does not include include/config/auto.conf for 'make headers*' targets in the first place. [1] [1]: https://github.com/torvalds/linux/blob/v6.0/Makefile#L271 Signed-off-by: Masahiro Yamada --- debian/rules.d/2-binary-arch.mk | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 56353ff6165f..2737638d1134 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -542,7 +542,7 @@ headers_tmp := $(CURDIR)/debian/tmp-headers headers_dir := $(CURDIR)/debian/linux-libc-dev hmake := $(MAKE) -C $(CURDIR) O=$(headers_tmp) \ - KERNELVERSION=$(abi_release) INSTALL_HDR_PATH=$(headers_tmp)/install \ + INSTALL_HDR_PATH=$(headers_tmp)/install \ SHELL="$(SHELL)" ARCH=$(header_arch) .PHONY: install-arch-headers @@ -553,25 +553,15 @@ install-arch-headers: ifeq ($(do_libc_dev_package),true) dh_prep -plinux-libc-dev endif - rm -rf $(headers_tmp) install -d $(headers_tmp) $(headers_dir)/usr/include/ - - $(hmake) $(defconfig) - mv $(headers_tmp)/.config $(headers_tmp)/.config.old - sed -e 's/^# \(CONFIG_MODVERSIONS\) is not set$$/\1=y/' \ - -e 's/.*CONFIG_LOCALVERSION_AUTO.*/# CONFIG_LOCALVERSION_AUTO is not set/' \ - $(headers_tmp)/.config.old > $(headers_tmp)/.config - $(hmake) syncconfig $(hmake) headers_install - ( cd $(headers_tmp)/install/include/ && \ find . -name '.' -o -name '.*' -prune -o -print | \ cpio -pvd --preserve-modification-time \ $(headers_dir)/usr/include/ ) mkdir $(headers_dir)/usr/include/$(DEB_HOST_MULTIARCH) mv $(headers_dir)/usr/include/asm $(headers_dir)/usr/include/$(DEB_HOST_MULTIARCH)/ - rm -rf $(headers_tmp) define dh_all From patchwork Mon Dec 5 08:56:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1712177 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=s2y3LM9U; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NQcqc4npBz23yl for ; Mon, 5 Dec 2022 19:57:00 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1p27HO-0006px-It; Mon, 05 Dec 2022 08:56:50 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1p27HC-0006T1-JC for kernel-team@lists.ubuntu.com; Mon, 05 Dec 2022 08:56:38 +0000 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id E242F3F133 for ; Mon, 5 Dec 2022 08:56:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1670230594; bh=kVSCRQyJAsFx4cR06RbLRKFs4CbKGWZ8GKeLBvjBxgo=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=s2y3LM9UbfQdX7EhSX3ETc3JF1hxkjdm4t78GtXJQdKmZeKDs3m4PG8B6xpXUeb5z o6d/i/9qcx48uRyfk6t/Ss38ghmU6p5Mdu584GC+PfYYLPOdGFQgLSO7ANoxJn5dre 5JvU/fNKKWoT+pD8Yevbqnw6vxf4jc8eg1XbV6jUwHgtQ6U376XPhdTry+MvejfEXI UuGutXsPG2d548MYA4dtMDg7wVexgfxrxyEYcWGZcHJhF18zc3yxwelKED8o9l7Khh +dUsc+jyDy7fzO9yDdr8P19bBYko+AV3tr3GEgtcUJi9xyS6BsIjaog+EBvdgMshBH /RWodets6KonA== Received: by mail-pl1-f200.google.com with SMTP id jc4-20020a17090325c400b00189ceee4049so3656321plb.3 for ; Mon, 05 Dec 2022 00:56:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kVSCRQyJAsFx4cR06RbLRKFs4CbKGWZ8GKeLBvjBxgo=; b=uRO+YlrD0u/5v+kX6xTykmnO6dMtYuakNQzJ+QcIxmpUTS3LhFWlblPB+/9KWHf5bX vK6f3qhMSd1Nh2GzCe+ncuL2QWWOQCbFJb7rdSJmmcSuXVt7BBD6ZNFOHEXEMGqBDh10 WnLDbxJkmKi2T9P0uyz0z7NTf++SSUUUhZpMncy4sleSjKh5565JsM5wm6uJV8zYsmWi 5QFDkBEHO2rnNxBOxLZGxEI7o2r7o8g81rtAlXWlW7Xh3ucRAKKwppdVWeGTIk0dYON2 gD5RuEQHBWySQdobSMSzwvURAHqzwjIAqsaQYELg76ok0cX5rGq8vEQO6urQ3kq2ftRD g0hw== X-Gm-Message-State: ANoB5pmJOhO/6yqvSu4Lsa0BuoWH29ei3X/5cEhdLRRg7PFiiJF1YQ5g 6z4bx119w2+aUQkiYEYx9ERj3x2pNhAhkJugnSSlPg+csWS0rxA9/IcxKnqLXCoZf1VvbRbSUNW iiLgLpGvzLeSw+jwP7H3iqPS918RBhM+QwF0hJEe0kw== X-Received: by 2002:a17:902:d4c5:b0:189:5e92:d457 with SMTP id o5-20020a170902d4c500b001895e92d457mr49569128plg.166.1670230593428; Mon, 05 Dec 2022 00:56:33 -0800 (PST) X-Google-Smtp-Source: AA0mqf4PKx60jKsOj1oAIgiR8Ymm1hI3znegSs18N8vXoPyEFwdznBLhk/ATJ3/YBWOlEgaQQyHD/A== X-Received: by 2002:a17:902:d4c5:b0:189:5e92:d457 with SMTP id o5-20020a170902d4c500b001895e92d457mr49569111plg.166.1670230593119; Mon, 05 Dec 2022 00:56:33 -0800 (PST) Received: from zoe.. ([2001:f74:8f00:c00:6aff::1005]) by smtp.gmail.com with ESMTPSA id q6-20020a170902a3c600b00178b77b7e71sm10018133plb.188.2022.12.05.00.56.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Dec 2022 00:56:32 -0800 (PST) From: Masahiro Yamada To: kernel-team@lists.ubuntu.com Subject: [L/unstable 08/13] UBUNTU: [Packaging] use olddefconfig in stamp-prepare-tree Date: Mon, 5 Dec 2022 17:56:14 +0900 Message-Id: <20221205085619.257813-9-masahiro.yamada@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221205085619.257813-1-masahiro.yamada@canonical.com> References: <20221205085619.257813-1-masahiro.yamada@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" You do not need to invoke syncconfig here because Kbuild takes care of it before staring the build. prepare and scripts are unneeded for the same reason. All the use of 'syncconfig' in debian/rules is suspicous because syncconfig may stop to ask for user's preference when it finds a new config option. There is nobody to answer the Kconfig's question when the package is being built in auto-builders such as cbd, launchpad. Presumably what you want here is olddefconfig, which is a non-interactive command to set any config option to its default. Signed-off-by: Masahiro Yamada --- debian/rules.d/2-binary-arch.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 2737638d1134..f32767671705 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -36,7 +36,7 @@ $(stampdir)/stamp-prepare-tree-%: debian/scripts/fix-filenames sed -ie 's/.*CONFIG_UBUNTU_ODM_DRIVERS.*/# CONFIG_UBUNTU_ODM_DRIVERS is not set/' \ $(builddir)/build-$*/.config find $(builddir)/build-$* -name "*.ko" | xargs rm -f - $(build_cd) $(kmake) $(build_O) -j1 syncconfig prepare scripts + $(build_cd) $(kmake) $(build_O) -j1 olddefconfig touch $@ # Used by developers as a shortcut to prepare a tree for compilation. From patchwork Mon Dec 5 08:56:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1712176 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=iXp9TONd; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NQcqW6Z6Nz23p1 for ; Mon, 5 Dec 2022 19:56:55 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1p27HI-0006fJ-Bu; Mon, 05 Dec 2022 08:56:44 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1p27HC-0006TA-Mc for kernel-team@lists.ubuntu.com; Mon, 05 Dec 2022 08:56:38 +0000 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 5A05B3F120 for ; Mon, 5 Dec 2022 08:56:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1670230596; bh=8dVjdf5pQcy1mpEIbZizHLes74TTdWrWAj6xf+0Ulhw=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iXp9TONdHuBctu48tiCu2zTnL414uxtgMzjnts2ko7J3Bcjj0BEZQuuyado0glKlc neJq3+0OnSVHYMhTeyrejyBrN8wjviYX/49upo5BXwOSqlPDVINz4CDYWapdmezL1Y jKDQBqCljbKvxp6w73x1gt7DL1AfyLGjADnQQe1zl6nUcjjBCtN0LZzWlclPu+9Ltf cRTsZayvEh25t1cNDYtyF/OhsZehigsxYFXsRl/NqEh1LOWwPD8gb1uLhhxPdIYh5p OiP6jOT7RM8LTa7vJAMEX2iILDIf/s+Sto33hm4pz6iuSjCo0lkTUMrSMtfF+X5XkM ZmMhdQCh86lcw== Received: by mail-pl1-f197.google.com with SMTP id b6-20020a170902d50600b00189a5536820so13076508plg.16 for ; Mon, 05 Dec 2022 00:56:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8dVjdf5pQcy1mpEIbZizHLes74TTdWrWAj6xf+0Ulhw=; b=TnlFHuKDXU5CT4DFZJvUFz6UVE8JtL6/hxPJwPHnpX0zRpRAWKunGspzi29USfpCjK RfxshetCIcrqNiINSgDkDmu3jDPQXLlYT4RSs2eIbK1bMjzEh894WMxrKpZKIVy8jF1U eheQ/8HuQqG80KMxWgT32kjFiMSdpVoPkuBlGcENtpkrUB0mekXucXT8X9DL29LC+VZD SuVBUfIwZCy3/HtmPvWaOhFbQmhoekaBtnwBeIb+HljFvkGj6bYCgBdFOJtnsx0i+85/ ZOAJPLjA0EfS/Mjzg67GYyZyoa6ELyFBLkFUsyFeuk5YSQdyy9F5bOYGJPJ0sYJBYPFc +ggQ== X-Gm-Message-State: ANoB5pmQeLe9gkRjDCia6S2V0LDzgXMST8y2DrVugxSGC91iRoULcY2L 5kBzlgwkLANgrXv2zDixZJCehR8wgE4+bzrsA0qnQvmgZbrUHKEkdYvGvsl3VfZjXk6jQdX7hOS ND87M9kZ3htmDb/609PKJV3S1UETKfZeiaPa7takiKA== X-Received: by 2002:a05:6a00:f95:b0:56c:a60d:54d7 with SMTP id ct21-20020a056a000f9500b0056ca60d54d7mr69579929pfb.18.1670230594638; Mon, 05 Dec 2022 00:56:34 -0800 (PST) X-Google-Smtp-Source: AA0mqf6Iqj3x9c708DnoZswyDgpLgcQ0oA0KEPbaRh5n9eheE+/9UfU5yKG5j9wHV3i+11NVX/D0Xg== X-Received: by 2002:a05:6a00:f95:b0:56c:a60d:54d7 with SMTP id ct21-20020a056a000f9500b0056ca60d54d7mr69579912pfb.18.1670230594349; Mon, 05 Dec 2022 00:56:34 -0800 (PST) Received: from zoe.. ([2001:f74:8f00:c00:6aff::1005]) by smtp.gmail.com with ESMTPSA id q6-20020a170902a3c600b00178b77b7e71sm10018133plb.188.2022.12.05.00.56.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Dec 2022 00:56:34 -0800 (PST) From: Masahiro Yamada To: kernel-team@lists.ubuntu.com Subject: [L/unstable 09/13] UBUNTU: [Packaging] use parralel builds in more places Date: Mon, 5 Dec 2022 17:56:15 +0900 Message-Id: <20221205085619.257813-10-masahiro.yamada@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221205085619.257813-1-masahiro.yamada@canonical.com> References: <20221205085619.257813-1-masahiro.yamada@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Kbuild is designed to work correctly with parallel builds. For Kconfig stage, header installation, or whatever. I do not see any reason why these must run in a single thread. Signed-off-by: Masahiro Yamada --- debian/rules.d/2-binary-arch.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index f32767671705..3d03ee610d0b 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -36,7 +36,7 @@ $(stampdir)/stamp-prepare-tree-%: debian/scripts/fix-filenames sed -ie 's/.*CONFIG_UBUNTU_ODM_DRIVERS.*/# CONFIG_UBUNTU_ODM_DRIVERS is not set/' \ $(builddir)/build-$*/.config find $(builddir)/build-$* -name "*.ko" | xargs rm -f - $(build_cd) $(kmake) $(build_O) -j1 olddefconfig + $(build_cd) $(kmake) $(build_O) $(conc_level) olddefconfig touch $@ # Used by developers as a shortcut to prepare a tree for compilation. @@ -555,7 +555,7 @@ ifeq ($(do_libc_dev_package),true) endif rm -rf $(headers_tmp) install -d $(headers_tmp) $(headers_dir)/usr/include/ - $(hmake) headers_install + $(hmake) $(conc_level) headers_install ( cd $(headers_tmp)/install/include/ && \ find . -name '.' -o -name '.*' -prune -o -print | \ cpio -pvd --preserve-modification-time \ From patchwork Mon Dec 5 08:56:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1712179 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=OWTmUX51; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NQcqh6qNjz23p1 for ; Mon, 5 Dec 2022 19:57:04 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1p27HT-0006zT-62; Mon, 05 Dec 2022 08:56:55 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1p27HD-0006Vj-Dd for kernel-team@lists.ubuntu.com; Mon, 05 Dec 2022 08:56:39 +0000 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 2602E3F131 for ; Mon, 5 Dec 2022 08:56:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1670230598; bh=xXt321TaqIGdzCc1aJo3QvHaLBCYMdNNpcFvBWes60g=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OWTmUX5129NSVSnbcwmxJHmezbcy82VkhZSTxc0TY8QsZTRWfqDuY2yh/c4veztgA X5IUM/gOauSZNqnSr2IJ+L9xFAYP0MJyokFG/q7kMyubu6yYDx4juW6OEyUN7lmpPa 1BQyylGBVO6sEmMVU62ZKJ+VE7FZQ7DZzI4/7vnypaWj92bk6r9F7vCJE0984GARWl geZ724CQt9bReGTZONL1aJQmfU1vECaDEV2hKiZgqv1NiYJHzFxD3R/sP37hWdcDrR PttsNXOyPHO1PEwzlkkTl+gf9L049A2SBRqDbMW4ZUteMkPCldkX5ZWS9emmZZ1LWq T2zgeN34PbKAw== Received: by mail-pl1-f200.google.com with SMTP id y6-20020a17090322c600b00189892baa53so13034421plg.6 for ; Mon, 05 Dec 2022 00:56:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xXt321TaqIGdzCc1aJo3QvHaLBCYMdNNpcFvBWes60g=; b=iPFArXXL61UlmH8JZBtgDKYhnIABCj6I6kpgJNo9HY59OR8OIXVCJCagcszEqVDLhn aH4ePhEtUKClxL4fbiAxSZrBsSBUhyf+eZsoX1X5ESKpaf853nc0wc7iY3kYkO9W+lKn wIMhdRei0Fy3aMgOUofpbJ8UYCKBej7eJd0cHFpv9KJLKNb2sR0KRaQ1SRmtQuCXfjG4 +XE3aN1Amy8Mz1BH3+2GLPFV/3geTPAXoaP/EWyCUvW/HTnxG16CADqLa1zModo2/Xb4 fMREwzaY9Vk74/D00y9d9hOAJI/AusSOao+FDUAoKZJ4OeYzy5KctbEJYd0g28wUbZQL e7Hw== X-Gm-Message-State: ANoB5pnd2KaPizKSQlqoHeSGcFom0/pHPuqMk5vatHiMLd4oC9XTks8W 1buk4Svo7k3Y5RQhgzNf5A7fogzPPnnVQThFEaep9iroD1I/fz41GCfbWNq2lKckTp7sTaa4nNa JaBkhzPFsGQF22R7M92iUgFNpnbvi8Npe/t/MXQwO7Q== X-Received: by 2002:a63:ff4a:0:b0:478:2dd1:cdb6 with SMTP id s10-20020a63ff4a000000b004782dd1cdb6mr30325579pgk.378.1670230595910; Mon, 05 Dec 2022 00:56:35 -0800 (PST) X-Google-Smtp-Source: AA0mqf7Hox1jPlQmT9nmI3z6/YGoNnJKOoNOds02TCtYa/Cxje11AYcKxTowIOk/z0ZBcFdcPaJIoA== X-Received: by 2002:a63:ff4a:0:b0:478:2dd1:cdb6 with SMTP id s10-20020a63ff4a000000b004782dd1cdb6mr30325564pgk.378.1670230595584; Mon, 05 Dec 2022 00:56:35 -0800 (PST) Received: from zoe.. ([2001:f74:8f00:c00:6aff::1005]) by smtp.gmail.com with ESMTPSA id q6-20020a170902a3c600b00178b77b7e71sm10018133plb.188.2022.12.05.00.56.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Dec 2022 00:56:35 -0800 (PST) From: Masahiro Yamada To: kernel-team@lists.ubuntu.com Subject: [L/unstable 10/13] UBUNTU: [Packaging] install headers to debian/linux-libc-dev directly Date: Mon, 5 Dec 2022 17:56:16 +0900 Message-Id: <20221205085619.257813-11-masahiro.yamada@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221205085619.257813-1-masahiro.yamada@canonical.com> References: <20221205085619.257813-1-masahiro.yamada@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" The header installation is somewhat complex; 'make headers_install' installs headers to debian/tmp-headers, then cpio copies them to debian/linux-libc-dev, pruning '.*' files. My best guess for the reason of this indirection is to avoid garbage files contained in the packages. In fact, "make headers_install" used to create dot files '.install' and '.check' in the install destination. Since Linux 5.3 (or more specifically since commit 59b2bd05f5f4), headers_install does not install any dot files. Specify the final destination to INSTALL_HDR_PATH, and you can get clean installation. Signed-off-by: Masahiro Yamada --- debian/rules.d/2-binary-arch.mk | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 3d03ee610d0b..40a4e2d6feef 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -538,11 +538,10 @@ ifneq ($(full_build),false) endif @touch $@ -headers_tmp := $(CURDIR)/debian/tmp-headers headers_dir := $(CURDIR)/debian/linux-libc-dev -hmake := $(MAKE) -C $(CURDIR) O=$(headers_tmp) \ - INSTALL_HDR_PATH=$(headers_tmp)/install \ +hmake := $(MAKE) -C $(CURDIR) O=$(headers_dir) \ + INSTALL_HDR_PATH=$(headers_dir)/install \ SHELL="$(SHELL)" ARCH=$(header_arch) .PHONY: install-arch-headers @@ -553,16 +552,11 @@ install-arch-headers: ifeq ($(do_libc_dev_package),true) dh_prep -plinux-libc-dev endif - rm -rf $(headers_tmp) - install -d $(headers_tmp) $(headers_dir)/usr/include/ + rm -rf $(headers_dir) + install -d $(headers_dir)/usr/include/ $(hmake) $(conc_level) headers_install - ( cd $(headers_tmp)/install/include/ && \ - find . -name '.' -o -name '.*' -prune -o -print | \ - cpio -pvd --preserve-modification-time \ - $(headers_dir)/usr/include/ ) mkdir $(headers_dir)/usr/include/$(DEB_HOST_MULTIARCH) mv $(headers_dir)/usr/include/asm $(headers_dir)/usr/include/$(DEB_HOST_MULTIARCH)/ - rm -rf $(headers_tmp) define dh_all dh_installchangelogs -p$(1) From patchwork Mon Dec 5 08:56:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1712178 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=S5Ye9WgP; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NQcqf1LcRz23p1 for ; Mon, 5 Dec 2022 19:57:02 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1p27HR-0006vf-Fr; Mon, 05 Dec 2022 08:56:53 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1p27HD-0006VJ-Uh for kernel-team@lists.ubuntu.com; Mon, 05 Dec 2022 08:56:39 +0000 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id D37163F0E9 for ; Mon, 5 Dec 2022 08:56:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1670230597; bh=bD8zkOEwtOekQHJKIs1TPtOUvPirIjixDbtAH7RwNZk=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=S5Ye9WgPn+8dIuYjHXjrijShf0mIhpLJHEe5r3bCP6GvaHM9x2a/UEqAcaHSZZmoz B2/RUHZcja2qsZfNe66968PTG5A20l9Gq5T0K8aKYFxKXop08lEu3S0Qyc1EZ1fXtY IB7MZHbj4tL65JjHIPw0fICso/D7Hv9Kd6wfwYqM1n3A0GA+EHs1p5064qri+B8/yz ulgvGtwx5EOyu7sWNX1GNkPc33BM4i0OnAqoZWkVLoWsT47Ptz115AB9n8UooQwGSf rgHM4QbCSuGOshJidCjNFL8ZEa1BvROHRIKpqXnoQYggANZ+q9wpuKCDgd2QWM/Ej0 PQvbBQfvbpTCg== Received: by mail-pl1-f200.google.com with SMTP id jc4-20020a17090325c400b00189ceee4049so3656421plb.3 for ; Mon, 05 Dec 2022 00:56:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bD8zkOEwtOekQHJKIs1TPtOUvPirIjixDbtAH7RwNZk=; b=3RCoghzf4vEzvBGTsj2yFC0P9vY6gv52re3C0ZZSH51S0GZjtFg6c0Uk9sSuyrA7fu RCSK2SWCWTg8HAmpvNqSbhXrITj1xFrguUsiAF4GTRlmWiPzlm1ulZ9O+p9fWeu/0K07 P1cAyyFzEPSzzg6xCxPqigprVvNCoWvJnqsOduNP37cRYnSlBUa2XDERoy8injawxD32 eYiljLo0tqcwrUvS/5JgFPYOdnhMN8w/u2j6pBnvTCcQAG4LZDMxHuK8BwsUcSrnL2+z 1k8sR0h+dyX8uMuCKU/iSJzeg3hOsv1HxqHGmouwDIGozKmChquqhM4vK24ElTO+PvBD QoGQ== X-Gm-Message-State: ANoB5pmcTPMrz07qAvx0IY8ejM4fTzpPe6CAIcvoUloyNbxLdaVVq61R gw7F1wkOQJJINA4GvMqBDrx9HZywNYVPLrV2h3a3j++O4uYVlBirEqEbOP9Db3iY/XhwYKlZbsr bjfftv1juDqkhcnXxydy07Qap+Yq48cvFr2CGRK0ryA== X-Received: by 2002:a63:5261:0:b0:477:e6ef:2ed2 with SMTP id s33-20020a635261000000b00477e6ef2ed2mr41112380pgl.219.1670230597239; Mon, 05 Dec 2022 00:56:37 -0800 (PST) X-Google-Smtp-Source: AA0mqf6VrspOxCAuuVuFDDp7IA7JgOE7+sicIpfGzfs6ak29TzNOR9MIxrhnct5QBIhKy64VCzTytg== X-Received: by 2002:a63:5261:0:b0:477:e6ef:2ed2 with SMTP id s33-20020a635261000000b00477e6ef2ed2mr41112369pgl.219.1670230596904; Mon, 05 Dec 2022 00:56:36 -0800 (PST) Received: from zoe.. ([2001:f74:8f00:c00:6aff::1005]) by smtp.gmail.com with ESMTPSA id q6-20020a170902a3c600b00178b77b7e71sm10018133plb.188.2022.12.05.00.56.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Dec 2022 00:56:36 -0800 (PST) From: Masahiro Yamada To: kernel-team@lists.ubuntu.com Subject: [L/unstable 11/13] UBUNTU: [Packaging] simplify abinum and uploadnum definitions Date: Mon, 5 Dec 2022 17:56:17 +0900 Message-Id: <20221205085619.257813-12-masahiro.yamada@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221205085619.257813-1-masahiro.yamada@canonical.com> References: <20221205085619.257813-1-masahiro.yamada@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" I do not say that I fully understood this complex regex, but this commit splits the debian revision at the first period - the first half as abinum and the second as uploadnum. Signed-off-by: Masahiro Yamada --- debian/rules.d/0-common-vars.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index ec9c5680493b..d3ba95eb8822 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -78,11 +78,11 @@ ifeq ($(full_build),false) skipdbg=true endif -abinum := $(shell echo $(revision) | sed -r -e 's/([^\+~]*)\.[^\.]+(~.*)?(\+.*)?$$/\1/')$(abi_suffix) -prev_abinum := $(shell echo $(prev_revision) | sed -r -e 's/([^\+~]*)\.[^\.]+(~.*)?(\+.*)?$$/\1/')$(abi_suffix) +abinum := $(firstword $(subst .,$(space),$(revision)))$(abi_suffix) +prev_abinum := $(firstword $(subst .,$(space),$(prev_revision)))$(abi_suffix) abi_release := $(release)-$(abinum) -uploadnum := $(shell echo $(revision) | sed -r -e 's/[^\+~]*\.([^\.~]+(~.*)?(\+.*)?$$)/\1/') +uploadnum := $(patsubst $(abinum).%,%,$(revision)) ifneq ($(full_build),false) uploadnum := $(uploadnum)-Ubuntu endif From patchwork Mon Dec 5 08:56:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1712180 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=gyjLKxnw; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NQcqk6WwKz23p1 for ; Mon, 5 Dec 2022 19:57:06 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1p27HV-00074C-0Z; Mon, 05 Dec 2022 08:56:57 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1p27HF-0006aB-QN for kernel-team@lists.ubuntu.com; Mon, 05 Dec 2022 08:56:41 +0000 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 8101F3F120 for ; Mon, 5 Dec 2022 08:56:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1670230600; bh=7jZtaJAU4JzoHmbsm7iOae9yWLd3jK7bCBrQuNwZ6mg=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gyjLKxnwuA0Zq13GUFIz7CC1Mu0Dxp1+2+JbjsF+mq1C3k7E3SPAilamculy95oyq 4vMGUq7X9k1AJwoMWpCnhJ1okbTZzmcNb2C7z/65lUm7TYUGZwIWC6gMLrHa30A/EX n599pQQzGa1bTe17I5LKGXslVlGY3buEaIq+P8lfPmi0HS5GQt6+zS8Wskva809fWM lromxyn8ZFV+zDpcgEawgssI0yDicmm3RQZODvp4C6RCrT+AAslOyVazgeRucY45UQ Lr+98xYUG70kNWhpI1rYJYYkBZ1XX15+ut24uKozqxEiFllYcAaOp0xyqvi78M/ld0 yTyk5L1UjXhbw== Received: by mail-pl1-f197.google.com with SMTP id e11-20020a17090301cb00b001890e0c759aso13062249plh.5 for ; Mon, 05 Dec 2022 00:56:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7jZtaJAU4JzoHmbsm7iOae9yWLd3jK7bCBrQuNwZ6mg=; b=RUSmSTQ6esXRrRzBhrrRY8Y4Thw7ZO+0z4Vn/j7V8s9N8Yd+FRZ0h8MTO8VXnH5tBU N4d4qyoKmIy6AGZsJ4CcbKw1lvRr/Pn8sp1Ylc0STVa1YgsVmHJD5ViAS0yicCoH7/jz mUxQV9jD68OdTr7SoN/q5si8rA+XmFrnrROB+y/hvVH+HwrSbbanbawEMgDbYcWetgjD IjFK1tOWLNY5fdr17Eg00YCzmYcJqpjN/XjUpATvvOnJftftAs6J5t1BNxQ0b2OMh33T eIrvU7eXvjSpIHoTprUKdUUoC02jmj4TKqRrbSuR+qObtUCkQ4/WLgHDe/xy4u9dkejF N1TQ== X-Gm-Message-State: ANoB5plFmLI5RHTCpkYvQ5IzKHoRd3fwPzuRXUAN9mlnutWMukyi1zCs UtnGF/RgB/ctfNl0oONjMugarAPhb94ICz3GXChSeaCT1oeHPLVEcMZt5PieIyEmheMBiEhWoM1 g4VZr3Oxz4A9MJNaRqxMLz8+4/Nh1j29+lGHUcNPE6A== X-Received: by 2002:a17:902:6a86:b0:188:cfc6:31fb with SMTP id n6-20020a1709026a8600b00188cfc631fbmr76177188plk.150.1670230598597; Mon, 05 Dec 2022 00:56:38 -0800 (PST) X-Google-Smtp-Source: AA0mqf7YObvjFvdscy1mC0a9NRhkNPYHRbsxTHJrsBltcZnnO9+aZ9lopVm1ZYTtejpDsAXDS3WnAA== X-Received: by 2002:a17:902:6a86:b0:188:cfc6:31fb with SMTP id n6-20020a1709026a8600b00188cfc631fbmr76177171plk.150.1670230598242; Mon, 05 Dec 2022 00:56:38 -0800 (PST) Received: from zoe.. ([2001:f74:8f00:c00:6aff::1005]) by smtp.gmail.com with ESMTPSA id q6-20020a170902a3c600b00178b77b7e71sm10018133plb.188.2022.12.05.00.56.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Dec 2022 00:56:38 -0800 (PST) From: Masahiro Yamada To: kernel-team@lists.ubuntu.com Subject: [L/unstable 12/13] UBUNTU: [Packaging] Remove unused INSTALL_FW_PATH Date: Mon, 5 Dec 2022 17:56:18 +0900 Message-Id: <20221205085619.257813-13-masahiro.yamada@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221205085619.257813-1-masahiro.yamada@canonical.com> References: <20221205085619.257813-1-masahiro.yamada@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Upstream commit 5620a0d1aacd ("firmware: delete in-kernel firmware") removed the in-tree firmware support. This is meaningless since Linux 4.14. Signed-off-by: Masahiro Yamada --- debian/rules.d/2-binary-arch.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 40a4e2d6feef..c08c7e7e5c68 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -195,8 +195,7 @@ ifeq ($(no_dumpfile),) endif $(build_cd) $(kmake) $(build_O) $(conc_level) modules_install $(vdso) \ - INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=$(pkgdir)/ \ - INSTALL_FW_PATH=$(pkgdir)/lib/firmware/$(abi_release)-$* + INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=$(pkgdir)/ # # Build module blacklists: From patchwork Mon Dec 5 08:56:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1712181 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=nTrJoXt5; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NQcqq3XRSz23p1 for ; Mon, 5 Dec 2022 19:57:11 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1p27HX-0007A3-Sh; Mon, 05 Dec 2022 08:56:59 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1p27HG-0006bg-GQ for kernel-team@lists.ubuntu.com; Mon, 05 Dec 2022 08:56:42 +0000 Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 557284131D for ; Mon, 5 Dec 2022 08:56:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1670230601; bh=EXqDG2oNQu2qPCQj40ZwnfYywHZJYyRXYcXwHD36/G4=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nTrJoXt582pFFRnawPE/escYGnkUFtwtFTCtGhfTSCqqX4Zb2cH1qwLkTscyB6f7J CmmTtRAr9Lgg5vzw2CAYFiP/A2KwWbtdJ5AOng5wrkJ+RaBGMCWCDnRM6LjEOLr5J4 dPzaHO8uS3ncJnmEJt/64ZgqxTV9VzoaD5RHHOjmfBu97qldVJQ5gnut9r1CKQ1n8L o+rjZydwOlosIfMOLDkdcjWhf42/awoUYfxBz/6LyjNN5qWIzAhqCzXxKEj9Flbd8Y MO1qiNNrzMy+ne9XjQUFDuvwQuGbNETZRpvaANg9k7VFs/KbWiokOYXZTpmbfVgp7v yDiV3jlBIpizw== Received: by mail-pl1-f198.google.com with SMTP id p6-20020a170902e74600b001896ba6837bso13113528plf.17 for ; Mon, 05 Dec 2022 00:56:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EXqDG2oNQu2qPCQj40ZwnfYywHZJYyRXYcXwHD36/G4=; b=nGy//zAYx1qysNp+4t4tUZcorpZPRyj6FfqBhtSJ1VMUihS4G/+fVC/hJk/fjaGaxH jQADwN3FghIJsIDVnGixIWMEXDNhu3HB/jawoLs440VhdWTcpyIkbNQgVIWogECGhKXO LJ8mPPJbHIpsR47PuAJRK8CxkJ0d8CJ07ZEivl71Kpif+VL/3jpRD4LetD8mSpUuwyeu HE3MuXAzGRk3dPJXc88JbOEYrOCiu6JYTux7xEKdre/zhkEMvE+gIcchD6nxpKpOrfVR 5Xi7At3MVkxEjbYndhiHDQNJa3fOOClt9zmUvecQ3lf/y/fh/X7JQthaqyHtctxGd5Jg 9mEQ== X-Gm-Message-State: ANoB5pm6KTTQnha7UeD+SJGSHI7mU93Pu+7LuqYopAn/ABhWsGlsFz9W jDbTx8iLHSumCTpcb3GvuPwF68t3CeXeRg89jg26HxCOAOOzh4A0y4amOKHS7JQSsQQBU4J6/SL /1jZX4hIoBxsOzneyWD4kQX6NQJJtxd5f3buZMBR7Gw== X-Received: by 2002:a63:d556:0:b0:435:7957:559d with SMTP id v22-20020a63d556000000b004357957559dmr61581002pgi.122.1670230599813; Mon, 05 Dec 2022 00:56:39 -0800 (PST) X-Google-Smtp-Source: AA0mqf7OYzo4lXrrlx1Iswc4p3v3xnNNLzbDeAh7LTbFWPNKk4VU45+UwG4TO4uWd/oNdHC0QLWYNA== X-Received: by 2002:a63:d556:0:b0:435:7957:559d with SMTP id v22-20020a63d556000000b004357957559dmr61580993pgi.122.1670230599500; Mon, 05 Dec 2022 00:56:39 -0800 (PST) Received: from zoe.. ([2001:f74:8f00:c00:6aff::1005]) by smtp.gmail.com with ESMTPSA id q6-20020a170902a3c600b00178b77b7e71sm10018133plb.188.2022.12.05.00.56.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Dec 2022 00:56:39 -0800 (PST) From: Masahiro Yamada To: kernel-team@lists.ubuntu.com Subject: [L/unstable 13/13] UBUNTU: [Packaging] Merge install commands Date: Mon, 5 Dec 2022 17:56:19 +0900 Message-Id: <20221205085619.257813-14-masahiro.yamada@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221205085619.257813-1-masahiro.yamada@canonical.com> References: <20221205085619.257813-1-masahiro.yamada@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" You can install multiple source files with a single 'install' command. Use $(addprefix ...) to merge the common directory part. Signed-off-by: Masahiro Yamada --- debian/rules.d/2-binary-arch.mk | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index c08c7e7e5c68..f50769281a10 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -752,9 +752,7 @@ ifeq ($(do_linux_tools),true) install -d $(toolspkgdir)/usr/lib install -d $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release) ifeq ($(do_tools_usbip),true) - install -m755 $(builddirpa)/tools/usb/usbip/bin/sbin/usbip \ - $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release) - install -m755 $(builddirpa)/tools/usb/usbip/bin/sbin/usbipd \ + install -m755 $(addprefix $(builddirpa)/tools/usb/usbip/bin/sbin/, usbip usbipd) \ $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release) endif ifeq ($(do_tools_acpidbg),true) @@ -779,9 +777,8 @@ ifeq ($(do_tools_bpftool),true) install -m755 $(builddirpa)/tools/bpf/bpftool/bpftool $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release) endif ifeq ($(do_tools_x86),true) - install -m755 $(builddirpa)/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy \ - $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release) - install -m755 $(builddirpa)/tools/power/x86/turbostat/turbostat \ + install -m755 \ + $(addprefix $(builddirpa)/tools/power/x86/, x86_energy_perf_policy/x86_energy_perf_policy turbostat/turbostat) \ $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release) endif endif @@ -789,13 +786,7 @@ ifeq ($(do_cloud_tools),true) ifeq ($(do_tools_hyperv),true) install -d $(cloudpkgdir)/usr/lib install -d $(cloudpkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release) - install -m755 $(builddirpa)/tools/hv/hv_kvp_daemon \ - $(cloudpkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release) - install -m755 $(builddirpa)/tools/hv/hv_vss_daemon \ - $(cloudpkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release) - install -m755 $(builddirpa)/tools/hv/hv_fcopy_daemon \ - $(cloudpkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release) - install -m755 $(builddirpa)/tools/hv/lsvmbus \ + install -m755 $(addprefix $(builddirpa)/tools/hv/, hv_kvp_daemon hv_vss_daemon hv_fcopy_daemon lsvmbus) \ $(cloudpkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release) endif endif