From patchwork Tue Jan 31 16:26:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 50965 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1383wrn; Tue, 31 Jan 2023 08:31:23 -0800 (PST) X-Google-Smtp-Source: AMrXdXs6iD9rS319KJrjLL1sop1ikqCIlvYMlPK+ljV0L8RZT6Wobj0qeZ8jBIcimj7VyGX1dE7o X-Received: by 2002:a17:902:76c5:b0:189:5ff5:eb92 with SMTP id j5-20020a17090276c500b001895ff5eb92mr49575021plt.39.1675182683436; Tue, 31 Jan 2023 08:31:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675182683; cv=none; d=google.com; s=arc-20160816; b=IcoCK8/vhVka8x1K+t1PaUgJbD2hN4jhgORWI7xbkQwmpvGDsARAvol9oaPXrYu7Vq 5UARkpRI/yX44ir6mdCavVsMwZ3pXiMS4BpA0/jcx70BiBegRSgyu0E+IL4b+V+oXblV uoAy/l0rs8TQXMs68QQcjxnUSf7jOtLiAJS7dVx4KgGXoBd9iapmUOxJVeH2o4HDbAyZ i2TNf7i/mS3jZXtDlDTJTOMgIQN4tvFWRm1qQrJyCj3iMpg6aYKWMT6CzMJW7B/EK/kA YDFYAzP32Q0VWVDpF9RCSrnj7VCn5RfmPU0IA+X3CZG7iPSREAVg3d9WM/MsRz21UwGW ymgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=CqlfvDs6svJsbQVHhU7Eya/UvE/0Ib61Y8uswB1KNjo=; b=xL61X4bWr5UHAyk/DUvrQOZCjlV7SDEf8bCvKi80H1xx7Bnkng02Tjikj7uMN6Cq5Q +tkk7r9j3OJ0aTCwL3+wUClf+WJIAmDUHWB2lkSmzD4hgO6Cq3MNvJQH7EBx33l/zHg2 endqjrmUzPVCqhlBdKuCGs+gP8GiCDv36V0GMVq4DXl/YD99gCSoXBnCa1HpNafJCA4f Kj/dd1IYVjYuLyBeSXoVmH2Fo0VzcDLOpj2C6N4hf5Mrqe0Fzq74okhBNDF4PG/tSntf y2PJoOTEpFWIHtj47kVHD55NXmrXBpO79WFl7ibSJQceyjXBeIlIKgIBCCizao8gGG/z SZUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=t6G7SP2S; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l189-20020a6388c6000000b00477fbd59895si16553222pgd.852.2023.01.31.08.31.11; Tue, 31 Jan 2023 08:31:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=t6G7SP2S; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229468AbjAaQ1u (ORCPT + 99 others); Tue, 31 Jan 2023 11:27:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229693AbjAaQ1g (ORCPT ); Tue, 31 Jan 2023 11:27:36 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBFE056196; Tue, 31 Jan 2023 08:27:32 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 32538B81DAE; Tue, 31 Jan 2023 16:27:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C5DE8C433A4; Tue, 31 Jan 2023 16:27:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675182449; bh=g/PguSDXjg6VLI4lh9MpBwOaQPS/+vjk/LM6FEYEX3g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t6G7SP2S/BdD/6qKiVdYXuTw3I5yjQjR3bEONpTev0/P/WY3nK/iUqJtRalNKQCu+ EUcsQDSvQCmeZCNF17SOxjfGCNaGJPxwKnS0NKQRJX6Yqui/ThcFNsrbuOQjyl6L0t ZPJAoNw3R7HgPE4KMYsYzh4/yIWihJaNzNLefvJFD6DhvSU7MpSTrnt6aeQidq3KCw ZrzbF9M5YVoKHd67hDNRJASZ+zekkjdxx0Vcg2a31jkaQmKYqr+wzK+Ot1sqeWbtXQ gjAQBqWps4OhScvie1n/Y4/10z7iunHwrj66HCxoZ+IZJUPcr8NaBlHSfUuVXDsCfW /G3snRZk6ComA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier Subject: [PATCH v3 5/5] kbuild: deb-pkg: hide KDEB_SOURCENAME from Makefile Date: Wed, 1 Feb 2023 01:26:15 +0900 Message-Id: <20230131162615.1575215-5-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230131162615.1575215-1-masahiroy@kernel.org> References: <20230131162615.1575215-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756556357163603935?= X-GMAIL-MSGID: =?utf-8?q?1756556357163603935?= scripts/Makefile.package does not need to know the value of KDEB_SOURCENAME because the source name can be taken from debian/changelog by using dpkg-parsechangelog. Move the default of KDEB_SOURCENAME (i.e. linux-upstream) to scripts/package/mkdebian. Signed-off-by: Masahiro Yamada --- (no changes since v2) Changes in v2: - New patch scripts/Makefile.package | 23 +++++++++++++++-------- scripts/package/mkdebian | 2 +- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/scripts/Makefile.package b/scripts/Makefile.package index 1383160d0eee..677692b9c74c 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -3,9 +3,7 @@ include $(srctree)/scripts/Kbuild.include -KDEB_SOURCENAME ?= linux-upstream KBUILD_PKG_ROOTCMD ?="fakeroot -u" -export KDEB_SOURCENAME MKSPEC := $(srctree)/scripts/package/mkspec # Source Tarball @@ -59,19 +57,28 @@ binrpm-pkg: +rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \ $(UTS_MACHINE)-linux -bb $(objtree)/binkernel.spec +PHONY += debian +debian: + $(call cmd,debianize) + +PHONY += debian-tarball +debian-tarball: source = $(shell dpkg-parsechangelog -S Source) +debian-tarball: orig-version = $(shell dpkg-parsechangelog -S Version | sed 's/-[^-]*$$//') +debian-tarball: debian + $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.package ../$(source)_$(orig-version).orig.tar.gz + PHONY += deb-pkg -deb-pkg: - $(CONFIG_SHELL) $(srctree)/scripts/package/mkdebian - $(Q)origversion=$$(dpkg-parsechangelog -SVersion |sed 's/-[^-]*$$//');\ - $(MAKE) -f $(srctree)/scripts/Makefile.package ../$(KDEB_SOURCENAME)_$${origversion}.orig.tar.gz +deb-pkg: debian-tarball +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) \ --build=source,binary --source-option=-sP -nc -us -uc PHONY += bindeb-pkg -bindeb-pkg: - $(CONFIG_SHELL) $(srctree)/scripts/package/mkdebian +bindeb-pkg: debian +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) -b -nc -uc +quiet_cmd_debianize = GEN $@ + cmd_debianize = $(srctree)/scripts/package/mkdebian + PHONY += intdeb-pkg intdeb-pkg: +$(CONFIG_SHELL) $(srctree)/scripts/package/builddeb diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index 2f612617cbcf..0c1ed6215a02 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -95,7 +95,7 @@ else revision=$($srctree/init/build-version) packageversion=$version-$revision fi -sourcename=$KDEB_SOURCENAME +sourcename=${KDEB_SOURCENAME:-linux-upstream} if [ "$ARCH" = "um" ] ; then packagename=user-mode-linux