From patchwork Sun Mar 12 20:07:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 68561 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp860334wrd; Sun, 12 Mar 2023 13:14:09 -0700 (PDT) X-Google-Smtp-Source: AK7set89/le4xu2aNUkFq2Cjzu0l7DtlduJLNT8BYhs1Jx+lpxiXzqfD75gRATJRsv6eO9AaqxMY X-Received: by 2002:a17:90b:3a8d:b0:235:53e5:8597 with SMTP id om13-20020a17090b3a8d00b0023553e58597mr33591285pjb.34.1678652049441; Sun, 12 Mar 2023 13:14:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678652049; cv=none; d=google.com; s=arc-20160816; b=L639h1UyH7Oe8fu0CEmtgsNNG/KPblWCy9AyD64fJb2KLtTLM5mdFSiRRy7XjJkjxj ne5c9x+bmXU9ZUrLIwm5mln3koXkJXi5FLNaFJUAXPiN2tTJ2QEohKgufIy2rDYD3gUG z7thLyJHm0tbeznr8pP10p/LtQBGIs6ZzYJHQcdZljf8XU0bmFnhth6/0/3zfbN/I6Rs A9qA2XsL0WyUwU0WlVkMkBvw1j/uZmZZKT0HnAJ19w8zJzZKwQTJspzod9pVkkE0dhsW Wr6HB5jTDHagBfaEqYldryxZotUhhZoyFdehVBm7ZRIgkeIzVNncIgnxxZdIgqRCN+4L rTHA== 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=7MSwiX4uH/KbpqmQRSvbpUSj2WM2gh61WiucReIGi3Y=; b=XAE6xksbdRtMlp+d8pGle7jNK4MqVRvBkhsmf6rPNLf6e+HMAN3o8TQ/D5aUZFQWw9 fdzwl5tPZVe6vNTL10AGZAfDDjyG67FXQgmRVHjeTuCaUhoCbCbOVVGONR9XXB3clbwA 1AvW4lXYuR7owrAtcke7hakiXtET5q+tXSNCpKSILsUW3lggD3V/Pf7RhLxAlqQi6jnq lkhGyyMnAhuEjVNZPowzvsnKBMTknJmmVmnt63IumB+xOUTI6SGQ2RMdHhicOF9mNSky rB8TcZQcD8y0Jm6mDXbpHrubVOksVMgnfVvpIXI1KLMJ99QwFfLRSYTe4Oo8JBfMsKO0 1jpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=T0dH1LT2; 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 e5-20020a17090a804500b00233e9243c88si4804612pjw.187.2023.03.12.13.13.53; Sun, 12 Mar 2023 13:14:09 -0700 (PDT) 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=T0dH1LT2; 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 S230417AbjCLUHp (ORCPT + 99 others); Sun, 12 Mar 2023 16:07:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229552AbjCLUHl (ORCPT ); Sun, 12 Mar 2023 16:07:41 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E806C2B2AE; Sun, 12 Mar 2023 13:07:38 -0700 (PDT) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 7094B60F24; Sun, 12 Mar 2023 20:07:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5FF8AC4339E; Sun, 12 Mar 2023 20:07:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678651657; bh=EWFebzRJB5EaxVLme/XjbtAAgfIoo8j3Er0mUNianiQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T0dH1LT2PXEwchZ/rueoW/DQqvaJDkllGUZkdXIixOGajbaD5SCS4qUhncrdQvbtY SPARZCTRL+1SssomEofLmBctMBryXtmNv3wkX/oWOcr8HVgKcZxrZtRra00UFlnkil Nj6RUU2MPoJ+PE+WLUkp3Dy2BohBROntjHN0wejGNArsHb02jxq+lYK0lVt7cPRXlD 9PHJorZD87nhzNpZMYJYmrhJYDOFBzco6FuaKDG9EeZMcrZ1+RnEx3Kunr8ATIVQxT /SowIYZ3D3Q31xX29Gnwr0bDb3l6FNe5NQNsQCF0iThAPN6Y4xYpW706vZq3ijEJHC xNR/E0irVu7Zw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Linus Torvalds , linux-kernel@vger.kernel.org, Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier Subject: [PATCH 1/6] kbuild: deb-pkg: make debian source package working again Date: Mon, 13 Mar 2023 05:07:26 +0900 Message-Id: <20230312200731.599706-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230312200731.599706-1-masahiroy@kernel.org> References: <20230312200731.599706-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760194251647069040?= X-GMAIL-MSGID: =?utf-8?q?1760194251647069040?= Since commit c5bf2efb058d ("kbuild: deb-pkg: fix binary-arch and clean in debian/rules"), the source package generated by 'make deb-pkg' fails to build. I terribly missed the fact that the intdeb-pkg target may regenerate include/config/kernel.release due to the following in the top Makefile: %pkg: include/config/kernel.release FORCE Restore KERNELRELEASE= option to avoid the kernel.release disagreement between build-arch and binary-arch. Fixes: c5bf2efb058d ("kbuild: deb-pkg: fix binary-arch and clean in debian/rules") Signed-off-by: Masahiro Yamada --- scripts/package/mkdebian | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index f74380036bb5..c6fbfb9f74ba 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -239,6 +239,7 @@ cat < debian/rules #!$(command -v $MAKE) -f srctree ?= . +KERNELRELEASE = ${KERNELRELEASE} build-indep: build-arch: @@ -250,7 +251,9 @@ build: build-arch binary-indep: binary-arch: build-arch - \$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} intdeb-pkg + \$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} \ + KERNELRELEASE=\$(KERNELRELEASE) intdeb-pkg + clean: rm -rf debian/files debian/linux-* \$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} clean