From patchwork Tue Jan 24 03:04:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 47505 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1938537wrn; Mon, 23 Jan 2023 19:06:30 -0800 (PST) X-Google-Smtp-Source: AMrXdXsHTtFTyFbqpAdGBpf+b0zaDO2Y8G2mTThmaEGerok0JJIlkA6OiWBhSPOvJQM+j69XkshM X-Received: by 2002:a17:902:784d:b0:194:92ab:6e23 with SMTP id e13-20020a170902784d00b0019492ab6e23mr21826575pln.27.1674529589789; Mon, 23 Jan 2023 19:06:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674529589; cv=none; d=google.com; s=arc-20160816; b=ujEOiPbqAXA/w8kVnyV5sr6f9ck0OSewE6UL87/2/pW4GxlGU7IASJ7hUISXPIVqK4 rNNE2z3v75WeenwfoBiBUz7qfIzN2mwWBEAUNENN/soLYU7g8uMUoJuKIJkV2GvENlC4 5qJpU/3wQt4WVp0zFVbAhoAGrxRb+K0W4PeuQcGSvIOEig52auqclIuW40oT3+NW5RJU pMNRLQeC8FZMB/AOQA1RodjYk/eDN8AuJXT9d+njwYWt2NyzHawE4mLWVKc6txJ4I0QW QPUgY/GuJqvVzYoIHnf6zlyqWiH4Gy25F1OlaoP1cBRd7VC7a4KRACk2rmiLNL4FYfIQ BwBA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=SoQ2zvkOzaxD+5e1Yd992oT35ttP2jGcvIpwqZCXuqI=; b=zLQBeXPTflVoXVMa0bvgbMpGUNxTl6FGrypawI3Ti0HRYhQDNRyf1q2+raAUkn9Z3U 7k0m3S1JKzG4710vA3C0C1vSZ1O/OopebxnYSfCb2o2dZwwGhx1/gteRzVwvwf2re/S3 wn3Trz+CZEksR6y9gxsCvbtIOKgKF4h8nzI0saMoGClrV5cTYDEiqP7zWYk/QcUbk2s0 9Oo3TDreLin2jzi2+Wl1V13uzJwX/Omqh9vMJWm/+Swhbvvuk2ps9UeqGmd2PqSjkCZl KRC1Hk/cSg8VkWtEFF41eb0qsm1Xx24OB7rWaJDbpTcFcGJh4yXYyy6MFHdfOya8LdHz wZJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IAqYOov9; 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 l12-20020a170903120c00b00186b1bb14a0si1209738plh.559.2023.01.23.19.06.18; Mon, 23 Jan 2023 19:06:29 -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=IAqYOov9; 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 S232203AbjAXDE2 (ORCPT + 99 others); Mon, 23 Jan 2023 22:04:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229791AbjAXDE0 (ORCPT ); Mon, 23 Jan 2023 22:04:26 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07B8B2CC76; Mon, 23 Jan 2023 19:04:26 -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 B3905B80F99; Tue, 24 Jan 2023 03:04:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 59182C433D2; Tue, 24 Jan 2023 03:04:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674529463; bh=giFIQo+mjqzUUAV7LAIzGUVEWvIHRytr3LaLHfDbk2w=; h=From:To:Cc:Subject:Date:From; b=IAqYOov90Vt0z/H9fPMmFNv/ri0lGsPKsg8UVpyD1I2pzvuSY70OZzpeh7Pd7e6Pc r4OVd5P46C2Vy0B2Ymq15ElVPy+hUMnVmeDbRwTKSqJVqg0l024fhcN218zncKCud4 V6//xSv9nYQnLK5ECqQO45SMxNbXzWcy8nQV2ArZ8CghBeyIGk+zlolt/aEtNwA9nK eSZ80KfpsYBA/I76VkGCXnf1geIO1gL6/7HelxCWFsWjrBSEVGo4fEB+fpIjoNkKAh cNx3J6FWeuFXGiUpAyhTVeJVVi6jd4ZW4vdqkUbiM+NnH6mpIhbQQNbOkdjpuL1w96 wMknuwlhLtkkw== 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] kbuild: deb-pkg: add --source-option=-sP Date: Tue, 24 Jan 2023 12:04:16 +0900 Message-Id: <20230124030416.1164288-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 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?1755871539601606427?= X-GMAIL-MSGID: =?utf-8?q?1755871539601606427?= If the source package fails to build, ../linux.orig is left over. In the next run of 'make deb-pkg', you will get the following error: dpkg-source: error: orig directory 'linux.orig' already exists, not overwriting, giving up; use -sA, -sK or -sP to override You can manually remove ../linux.orig, but it is annoying. Pass -sP down to dpkg-source. Signed-off-by: Masahiro Yamada --- scripts/Makefile.package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Makefile.package b/scripts/Makefile.package index e84c4e8ceb8e..dfbf40454a99 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -86,7 +86,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) --source-option=-sP -i.git -us -uc PHONY += bindeb-pkg bindeb-pkg: