From patchwork Sun Apr 11 10:14:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Germann X-Patchwork-Id: 12196147 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B41BCC433B4 for ; Sun, 11 Apr 2021 10:14:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 877DE610C8 for ; Sun, 11 Apr 2021 10:14:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235234AbhDKKO6 (ORCPT ); Sun, 11 Apr 2021 06:14:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235166AbhDKKO5 (ORCPT ); Sun, 11 Apr 2021 06:14:57 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD770C06138B for ; Sun, 11 Apr 2021 03:14:41 -0700 (PDT) From: bage@linutronix.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1618136077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i3+Kl5FcYsjg9qthOVz0Zxrj9dHPWVVERskguSKkN/Y=; b=ImymoPySjj85YD8qUUxVXk3wnbOo798teXpPRdYJSaS9attSHCkC6VeQJ7VXv4sIvoaM9v e4l92VO4rBfwmV7cmpI4mypSSI203kk2a/OJUAKkVQhHRD/3etOmZXXvzL7t0JxM0qW7z1 PBR36uO08cp7Pw4iFjsKXsKHvN8zclmIwegaNkCpcd9nwuA4vK1T1kQkeEcbYFwjTV5uy+ xxqc+20q2fxl5R2sKgvo0U3A603/469jiochbE+J2/tVmaLVcutx3fVwXUD+CDDyQEMRRw x9smEJySP8TLLDAxBN0jMj1IBVC/mn/pO0FLJXF13PPdP7F3QkBgL0XC/mSL2w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1618136077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i3+Kl5FcYsjg9qthOVz0Zxrj9dHPWVVERskguSKkN/Y=; b=Y3J3C0eurLhN2XLwQXTOyc8CqbpbETgRsTccl55GrTn9Rs2UpFoV6hbfwqK5lfejORFZIx tvrEVhZhK5ljHbBw== To: Masahiro Yamada , Michal Marek Cc: Bastian Germann , linux-kbuild@vger.kernel.org, tglx@linutronix.de Subject: [PATCH 1/6] builddeb: diff-ignore unexported top-level files Date: Sun, 11 Apr 2021 12:14:17 +0200 Message-Id: <20210411101422.7092-2-bage@linutronix.de> In-Reply-To: <20210411101422.7092-1-bage@linutronix.de> References: <20210411101422.7092-1-bage@linutronix.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org From: Bastian Germann scripts/Makefile.package's TAR_CONTENT lists the files to include in orig tarballs while the deb-pkg make target only ignores .git. This results in the other top-level files ending up in the .diff.gz. Let dpkg-source ignore .git with the default diff-ignore and list the other top-level files in extend-diff-ignore. Use the debian/source/options to always have those available on building the package. Signed-off-by: Bastian Germann --- scripts/Makefile.package | 2 +- scripts/package/mkdebian | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/Makefile.package b/scripts/Makefile.package index f952fb64789d..280f3a2fa334 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -75,7 +75,7 @@ deb-pkg: $(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) -i.git -us -uc + +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) -us -uc PHONY += bindeb-pkg bindeb-pkg: diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index 60a2a63a5e90..3d2d4b033e44 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -134,6 +134,8 @@ fi mkdir -p debian/source/ echo "1.0" > debian/source/format +echo diff-ignore > debian/source/options +echo 'extend-diff-ignore = ".clang-format|.cocciconfig|.config.old|.*ignore|.mailmap|.version|CREDITS|MAINTAINERS|README"' >> debian/source/options echo $debarch > debian/arch extra_build_depends=", $(if_enabled_echo CONFIG_UNWINDER_ORC libelf-dev:native)" From patchwork Sun Apr 11 10:14:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Germann X-Patchwork-Id: 12196151 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D3056C43460 for ; Sun, 11 Apr 2021 10:14:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B00E8611CE for ; Sun, 11 Apr 2021 10:14:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231356AbhDKKO6 (ORCPT ); Sun, 11 Apr 2021 06:14:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235123AbhDKKO5 (ORCPT ); Sun, 11 Apr 2021 06:14:57 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6EF4C061574 for ; Sun, 11 Apr 2021 03:14:41 -0700 (PDT) From: bage@linutronix.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1618136078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YprCFzJGbx6nvlz1jxtaUJj1p9GgOqh51am+QXWV9pA=; b=WCNx7yij3Vaclf3IVEyzso4Qtg43M0poGMwsTq1ICOZWYf9nv+AcTw1WWdEZIM9+13XZO5 +B2WRDGhOGYlsp6mppalkdw5XE4Yun1e9zHKTS0SF6nRhz1Z3HllI1HpajI7H4LOCq/z0R SyA8pq8YbGfgGMXWh4S3YS7d1L9Ds0jp8AS3Jh5u6UVsBm+s7PCmSGvD3tkd44QYkjqWZF oCnNhZknzWkLmJKolYhYmksMO/0pXmanxxMX3ZijkSMLl4MNr6eDryT6O24flRUQPOau/x rXkDxIFrrOAWzueGAecaKYnKhGoi9+6DsL/enYe7Tovtxn0bChHehRjaDS32RQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1618136078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YprCFzJGbx6nvlz1jxtaUJj1p9GgOqh51am+QXWV9pA=; b=YfRJKlxKehVomAiV/bZ3XIl3Xr0VOiLkAoJXtaASNE5lJ0Oie5nZjIrUntHu3ZxT0MOo27 RRS2ve8cRrM3W9DQ== To: Masahiro Yamada , Michal Marek Cc: Bastian Germann , linux-kbuild@vger.kernel.org, tglx@linutronix.de Subject: [PATCH 2/6] builddeb: set CC on cross build to prefixed gcc Date: Sun, 11 Apr 2021 12:14:18 +0200 Message-Id: <20210411101422.7092-3-bage@linutronix.de> In-Reply-To: <20210411101422.7092-1-bage@linutronix.de> References: <20210411101422.7092-1-bage@linutronix.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org From: Bastian Germann Building the generated package with CC unset will fail for cross compilation. Detect that and set CC to a sane default prefixed by dpkg-architecture's DEB_HOST_GNU_TYPE variable. Signed-off-by: Bastian Germann --- scripts/package/mkdebian | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index 3d2d4b033e44..2fa149796791 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -223,6 +223,14 @@ fi cat < debian/rules #!$(command -v $MAKE) -f +include /usr/share/dpkg/architecture.mk + +ifneq (\$(DEB_BUILD_GNU_TYPE),\$(DEB_HOST_GNU_TYPE)) +ifeq (\$(origin CC),default) +CC := \$(DEB_HOST_GNU_TYPE)-gcc +endif +endif + srctree ?= . build-indep: From patchwork Sun Apr 11 10:14:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Germann X-Patchwork-Id: 12196143 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB2A5C433B4 for ; Sun, 11 Apr 2021 10:14:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9A07A610C8 for ; Sun, 11 Apr 2021 10:14:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231405AbhDKKOz (ORCPT ); Sun, 11 Apr 2021 06:14:55 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:60610 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233514AbhDKKOz (ORCPT ); Sun, 11 Apr 2021 06:14:55 -0400 From: bage@linutronix.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1618136078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c/l58PZ/LDB2s5htRD2/tprkOdjnMs3MpOQAEnFCilo=; b=Vo+RwFWllVYc3QXdntf+LNwRFSeYIltl09X1mzRJeLo2DG8DoD9RRbIjO+jHce/Bbyg7im mqZKsh4bwPQI1vLcuEWux+4oz1jgqUlKRpimiS7wSsFoJlebfiR8Bc3p9uln74RlAHfb1x Y9x9Di36dh7hI9qDEn6+2Uqpsn6SH8aLZwdhgQ+3buYv87CminPD4CXCCSeUppcYer/EJ6 ajAeS+P/3MPP0/+N//VseFyzH9oJ9ZJvVhTW78P+SNoS2uKuGbIHFbl64VYTfeqm0wTxAk GFa/v6W98IXCgtUJCii4Fhs+zFBbFIMrH3vl48S3Bv9ZLtb7DYiGumtUHWhbYg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1618136078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c/l58PZ/LDB2s5htRD2/tprkOdjnMs3MpOQAEnFCilo=; b=XcuQ5jXuxgU+n4X3psD0G5yQgVGaX8H0TPpi3hFpmzIQ9yEuNfI6UcTUvZP0wPW6RfcCWv NmL0CXB250CTUKBg== To: Masahiro Yamada , Michal Marek Cc: Bastian Germann , linux-kbuild@vger.kernel.org, tglx@linutronix.de Subject: [PATCH 3/6] builddeb: clean generated package content Date: Sun, 11 Apr 2021 12:14:19 +0200 Message-Id: <20210411101422.7092-4-bage@linutronix.de> In-Reply-To: <20210411101422.7092-1-bage@linutronix.de> References: <20210411101422.7092-1-bage@linutronix.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org From: Bastian Germann For each binary Debian package, a directory with the package name is created in the debian directory. Include the generated files in the package's clean target. Signed-off-by: Bastian Germann --- scripts/package/mkdebian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index 2fa149796791..717223ef6b03 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -246,7 +246,7 @@ binary-arch: build-arch KBUILD_BUILD_VERSION=${revision} -f \$(srctree)/Makefile intdeb-pkg clean: - rm -rf debian/*tmp debian/files + rm -rf debian/*tmp debian/files debian/linux-* \$(MAKE) clean binary: binary-arch From patchwork Sun Apr 11 10:14:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Germann X-Patchwork-Id: 12196153 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F04BC43461 for ; Sun, 11 Apr 2021 10:14:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D668961019 for ; Sun, 11 Apr 2021 10:14:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235123AbhDKKO6 (ORCPT ); Sun, 11 Apr 2021 06:14:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235229AbhDKKO5 (ORCPT ); Sun, 11 Apr 2021 06:14:57 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA3CEC06138D for ; Sun, 11 Apr 2021 03:14:41 -0700 (PDT) From: bage@linutronix.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1618136078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5s6pA65p/yfFUofwR6oMI3HJ1MVNvuCzB7HAJwIb11I=; b=Xezv23OQvaLsHN9nTDPz4fy7fNZYt1HiA2JBghTVB+xvu0mLI2J0lRQsfm8ReJBjGrwTeC aQMki2gFVTwjGt6ApcXXLOBmPWAuF/1q5uXaSw0YFbtvjBe8VWysHW7Y09bGS7DczhvyMe w8KwZZw6jbCTkzERvhGmg7bhgyTzpTbPVWbDs2nn5ZkaBcUGLskHNPvkYiW8DDHbhhPMNZ EWDMoRxuqL0n1rnMRZcDEAuzch/BdHKUp6GTkBubOWL2PBnJqtJOo+fIKDnseqe7EawAT5 kwmwDFToE2+iuwuBGGgQxCKyP9F6r6uRe1lZExBz03ivLbMboJAfj6bXeVVg3A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1618136078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5s6pA65p/yfFUofwR6oMI3HJ1MVNvuCzB7HAJwIb11I=; b=kByPnUjZoBw5ZhR6Iix4e0DmGEwn0wfUjsxW25YzgyncU8P0FVRSQcgDA+D9srMxd2V0SO ezbvQAeKAxSGG9Ag== To: Masahiro Yamada , Michal Marek Cc: Bastian Germann , linux-kbuild@vger.kernel.org, tglx@linutronix.de Subject: [PATCH 4/6] builddeb: use standard format for copyright file Date: Sun, 11 Apr 2021 12:14:20 +0200 Message-Id: <20210411101422.7092-5-bage@linutronix.de> In-Reply-To: <20210411101422.7092-1-bage@linutronix.de> References: <20210411101422.7092-1-bage@linutronix.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org From: Bastian Germann Convert the minimal copyright file to the DEP-5 standard format that is commonly used in Debian. Link: https://trends.debian.net/#copyright-format-machine-readable-dep-5-vs-old-format Signed-off-by: Bastian Germann --- scripts/package/mkdebian | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index 717223ef6b03..bb5c19735345 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -152,22 +152,23 @@ EOF # Generate copyright file cat < debian/copyright -This is a packacked upstream version of the Linux kernel. - -The sources may be found at most Linux archive sites, including: -https://www.kernel.org/pub/linux/kernel - -Copyright: 1991 - 2018 Linus Torvalds and others. - -The git repository for mainline kernel development is at: -git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git - +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Linux +Source: https://www.kernel.org/pub/linux/kernel +Comment: This is a packaged upstream version of the Linux kernel. + +Files: * +Copyright: 1991 - 2021 Linus Torvalds and others. +License: GPL-2 + The git repository for mainline kernel development is at: + git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git + . This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 dated June, 1991. - -On Debian GNU/Linux systems, the complete text of the GNU General Public -License version 2 can be found in \`/usr/share/common-licenses/GPL-2'. + . + On Debian GNU/Linux systems, the complete text of the GNU General Public + License version 2 can be found in \`/usr/share/common-licenses/GPL-2'. EOF # Generate a control file From patchwork Sun Apr 11 10:14:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Germann X-Patchwork-Id: 12196149 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B4BFC43462 for ; Sun, 11 Apr 2021 10:14:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0D667611C9 for ; Sun, 11 Apr 2021 10:14:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235166AbhDKKO6 (ORCPT ); Sun, 11 Apr 2021 06:14:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235194AbhDKKO5 (ORCPT ); Sun, 11 Apr 2021 06:14:57 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3FC1C06138C for ; Sun, 11 Apr 2021 03:14:41 -0700 (PDT) From: bage@linutronix.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1618136079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xax9m7nzK6vr5O4i2iDG/FYysmrmK18NhmQkIvTSIkk=; b=kC7Kb4La1ywDv85paW8a44W2TzTeJQQQnGSQEHWWj046VJzI4bGFA4iUXJhDe9PYATZvgL F3nPjZ5sOx97kKJEwM0q7aeZHjKgK1IwHo0OCLhoHjylXRl8qqR9hysuEI1S/2xROEa8gn rnhEm7m9lDvwaKQ/UrIXtlDBzY/4XdCL7mnfxkdGWgyBkMQlXOxfqYqoBz0WBw3z6Yrrl3 QMOv3oeBFwnoH1FbMT7B2Yl2dX/W88hC2OmBPgQvvmAEn26L12Tw5PB7UUDUtPzGOqrgF5 GUlU74XgxHfdiz8XexXRNeOtNkWswzVIvTHK2oN4U5XpRp+qi8iTzOIEwjLhSg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1618136079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xax9m7nzK6vr5O4i2iDG/FYysmrmK18NhmQkIvTSIkk=; b=fmJ84kJLNuq93s0S/Nweqfh0mt9/CmwGR8w3/+IGE/CQuQNbNXejwtCX2PTap//5jJm5jn blJai1NHGft8uGBA== To: Masahiro Yamada , Michal Marek Cc: Bastian Germann , linux-kbuild@vger.kernel.org, tglx@linutronix.de Subject: [PATCH 5/6] builddeb: introduce profile excluding the dbg pkg Date: Sun, 11 Apr 2021 12:14:21 +0200 Message-Id: <20210411101422.7092-6-bage@linutronix.de> In-Reply-To: <20210411101422.7092-1-bage@linutronix.de> References: <20210411101422.7092-1-bage@linutronix.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org From: Bastian Germann Enabling CONFIG_DEBUG_INFO implies building the binary linux-image-*-dbg. As this increases package build time significantly, one might want to exclude it from being built. Add a pkg.$sourcename.nodbg build profile for that package so it can be excluded via e.g.: `make DPKG_FLAGS="-P=pkg.linux-5.11.0.nodbg" deb-pkg` Link: https://wiki.debian.org/BuildProfileSpec Signed-off-by: Bastian Germann --- scripts/package/mkdebian | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index bb5c19735345..369a989499ef 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -213,6 +213,7 @@ if is_enabled CONFIG_DEBUG_INFO; then cat <> debian/control Package: linux-image-$version-dbg +Build-Profiles: Section: debug Architecture: $debarch Description: Linux kernel debugging symbols for $version From patchwork Sun Apr 11 10:14:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Germann X-Patchwork-Id: 12196145 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8B45C433ED for ; Sun, 11 Apr 2021 10:14:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ACCE16108F for ; Sun, 11 Apr 2021 10:14:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233514AbhDKKO5 (ORCPT ); Sun, 11 Apr 2021 06:14:57 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:60622 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235123AbhDKKO4 (ORCPT ); Sun, 11 Apr 2021 06:14:56 -0400 From: bage@linutronix.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1618136079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Wd/BIX/T87DqZRsUNG1oh6/GmVH+vUs28kJhYAzfhQA=; b=ygqe/tRvQbhRiCqoDIUJ/aH3raWyU9jDh2I83w1pbC192rdlKc+eU0j9Jb38eNDvizyYFN 8zrtp1Vpb1ijIY8rmZGv/aaq971B8OazPF+KMYuPcK+0dWg+9Hqzaie/fVUPTug3ec/LlD 5XAUWQnGVUpzQ+wBZwUq2yprgVeDrw1ioDM08WQU2Q4iYbzSz0D77IypofuN6gw/ceBTGx LHEFC4z9teMQneEbDl8ZeL22iCr72gKGoXBbTFymE5zRMND+DeTCacIUlbpcRBpMvAfQoT 4Mpe0JPhbFZSvl7j7R01C4XHn652Sl9rqHGEYZvCeMKJsZiLajQ2cqOPitOKVA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1618136079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Wd/BIX/T87DqZRsUNG1oh6/GmVH+vUs28kJhYAzfhQA=; b=c8RoIeTh+MAy9v8gnbCgVZ+iBWcyt3xbVCc16JQKDIryOJGl5fHTt0ZZFVRH4FRt6JCcRt POZ6IAjEPePWXbCA== To: Masahiro Yamada , Michal Marek Cc: Bastian Germann , linux-kbuild@vger.kernel.org, tglx@linutronix.de Subject: [PATCH 6/6] kbuild: introduce srcdeb-pkg target Date: Sun, 11 Apr 2021 12:14:22 +0200 Message-Id: <20210411101422.7092-7-bage@linutronix.de> In-Reply-To: <20210411101422.7092-1-bage@linutronix.de> References: <20210411101422.7092-1-bage@linutronix.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org From: Bastian Germann A Debian source package can be generated only in combination with building it afterwards. Introduce a target srcdeb-pkg that generates the source package without building it (adding dpkg-buildpackage's -S flag). Make the former deb-pkg depend on both srcdeb-pkg and bindeb-pkg to retain its behavior. Signed-off-by: Bastian Germann --- scripts/Makefile.package | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/Makefile.package b/scripts/Makefile.package index 280f3a2fa334..78a363623c3a 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -69,13 +69,16 @@ binrpm-pkg: $(UTS_MACHINE) -bb $(objtree)/binkernel.spec PHONY += deb-pkg -deb-pkg: +deb-pkg: srcdeb-pkg bindeb-pkg + +PHONY += srcdeb-pkg +srcdeb-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) -us -uc + +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) -S -us -uc PHONY += bindeb-pkg bindeb-pkg: @@ -145,6 +148,7 @@ help: @echo ' rpm-pkg - Build both source and binary RPM kernel packages' @echo ' binrpm-pkg - Build only the binary kernel RPM package' @echo ' deb-pkg - Build both source and binary deb kernel packages' + @echo ' srcdeb-pkg - Build only the source kernel deb package' @echo ' bindeb-pkg - Build only the binary kernel deb package' @echo ' snap-pkg - Build only the binary kernel snap package' @echo ' (will connect to external hosts)'