From patchwork Sun Jan 22 14:14:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 46946 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1169502wrn; Sun, 22 Jan 2023 06:16:43 -0800 (PST) X-Google-Smtp-Source: AMrXdXvmboHEKJEVYEer0WjprsBvB4/VxYn8Yi8qb675B2F1w6q4Ds0BVj/dBj9rnvGOiqePfhm+ X-Received: by 2002:a17:907:3e18:b0:84d:3403:f4f2 with SMTP id hp24-20020a1709073e1800b0084d3403f4f2mr30105516ejc.62.1674397002865; Sun, 22 Jan 2023 06:16:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674397002; cv=none; d=google.com; s=arc-20160816; b=jPQFO6ltvc8ReWBxO/xobaiTEbpRhgUR+snh+u9sqWionwdYiy00ff0rEuwu7yAKd+ L2HYFhi4sb3qw8jyrmzquOxeDcXmC+aOMAMFuvshjXTnMGiwEkQmKQyx/YzqmY2/CeCD 1ar0ytMqs+Caqaya2hwRCb4ULVxfMNSzQylSjDFQkZMTzdnCXLx5PB5FgYp3Ah0Rls9q moAEuhEBjAetOym0a5AYa5FEqH52P+L4DJLAuoz2rldFdrT0+hRgV9YGDJkjDpttFHMF Wuo6sGUjv+COZQjAvl9l6ykYBZcjed17ar3NitE393k/h0P0MkaQeNC6owNgehZPyfPl 21BQ== 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=aRYPPyLFwCG3imLwxjk+WYOGQxC4bHJWCzY3l6LDkkg=; b=hfEsOJPYecnfg3h4oyocluqIoMMplispuCVpGQvqXcXUziPpTkoR5UGMt4kUP6nDWH efwfSx886JXM5dcJQ/hZLPVJDfyzmEGw6/cgjYwOsXToAG+9D459JnV+4sl0bWiHmN/U Az9qzORnH0pUrQcUZ/BNvniZVu4xmy0Y+xzYjcO3GR1SBp+PQFxu+AMquohcX+z9Ejhf PVldgHECyTo+BcVXUiIRjko1Dqx5HnruJzHMBhW4Hn0R79wZdcO8oScyDT0lGAhAb5rB YG8AbHC2mmLMWzulaRNgktaFGBzG1JeBJW3lIF1UYsVuEBJj1L5uCGmQc5ZPSgvLh3f4 3mKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="LkGO/5gK"; 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 i3-20020a1709064fc300b00867779a2fddsi37239557ejw.188.2023.01.22.06.16.18; Sun, 22 Jan 2023 06:16:42 -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="LkGO/5gK"; 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 S230007AbjAVOOj (ORCPT + 99 others); Sun, 22 Jan 2023 09:14:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229763AbjAVOOh (ORCPT ); Sun, 22 Jan 2023 09:14:37 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B6E6FF0A; Sun, 22 Jan 2023 06:14:36 -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 2848CB80AC6; Sun, 22 Jan 2023 14:14:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 390B3C433D2; Sun, 22 Jan 2023 14:14:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674396873; bh=UAb92+qz5f4FAlarsxoJmAqQlkj41WIegpJbo4Iliyk=; h=From:To:Cc:Subject:Date:From; b=LkGO/5gK8yhGB1ezwFoTxm/hSmjzyI2MSP4Cw/WkIh2H5yyBlsgsARWLY/7fimRuh EyopLDwPdL47fpaXVZbvApWy25rPFMk5PW2xQsV74K0GjBsRJY/lsEKqv5tPIpAYVN 0o6FLc8KHvjnaedyqa3x06l9rFtzAGqJw65neo6iJZKPDLEWMGDAzqeDbjpcEDrxKp hmO03s4QLEKKFjON8xw4L63wdoarOrUDNZq9d5h/Gm2U0VJ/Tynj05RjgaqteTpi35 wuMe5Z6IAwqIXqMcVOBunlnZvnTSuQKQTX+jupMp7yjTlK3UFSX/x3/tLhxXNBVsUB GQzsOXM7axs3g== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Rasmus Villemoes , Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier Subject: [PATCH 1/7] kbuild: do not put .scmversion into the source tarball Date: Sun, 22 Jan 2023 23:14:21 +0900 Message-Id: <20230122141428.115372-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,URIBL_BLOCKED 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?1755732511726040377?= X-GMAIL-MSGID: =?utf-8?q?1755732511726040377?= .scmversion is used by (src)rpm-pkg and deb-pkg to carry KERNELRELEASE. In fact, deb-pkg does not rely on it any more because the generated debian/rules specifies KERNELRELEASE from the command line. Do likwise for (src)rpm-pkg, and remove this feature. Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier --- scripts/Makefile.package | 6 ++---- scripts/package/mkspec | 6 +++--- scripts/setlocalversion | 19 +------------------ 3 files changed, 6 insertions(+), 25 deletions(-) diff --git a/scripts/Makefile.package b/scripts/Makefile.package index 525a2820976f..e84c4e8ceb8e 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -32,7 +32,7 @@ export KDEB_SOURCENAME TAR_CONTENT := Documentation LICENSES arch block certs crypto drivers fs \ include init io_uring ipc kernel lib mm net rust \ samples scripts security sound tools usr virt \ - .config .scmversion Makefile \ + .config Makefile \ Kbuild Kconfig COPYING $(wildcard localversion*) MKSPEC := $(srctree)/scripts/package/mkspec @@ -47,10 +47,8 @@ if test "$(objtree)" != "$(srctree)"; then \ echo >&2; \ false; \ fi ; \ -$(srctree)/scripts/setlocalversion --save-scmversion; \ tar -I $(KGZIP) -c $(RCS_TAR_IGNORE) -f $(2).tar.gz \ - --transform 's:^:$(2)/:S' $(TAR_CONTENT) $(3); \ -rm -f $(objtree)/.scmversion + --transform 's:^:$(2)/:S' $(TAR_CONTENT) $(3) # rpm-pkg # --------------------------------------------------------------------------- diff --git a/scripts/package/mkspec b/scripts/package/mkspec index adab28fa7f89..d3c6701b7769 100755 --- a/scripts/package/mkspec +++ b/scripts/package/mkspec @@ -90,7 +90,7 @@ $S rm -f scripts/basic/fixdep scripts/kconfig/conf $S rm -f tools/objtool/{fixdep,objtool} $S $S %build -$S $MAKE %{?_smp_mflags} KBUILD_BUILD_VERSION=%{release} +$S $MAKE %{?_smp_mflags} KERNELRELEASE=%{version} KBUILD_BUILD_VERSION=%{release} $S %install mkdir -p %{buildroot}/boot @@ -101,8 +101,8 @@ $S %else cp \$($MAKE -s image_name) %{buildroot}/boot/vmlinuz-$KERNELRELEASE %endif -$M $MAKE %{?_smp_mflags} INSTALL_MOD_PATH=%{buildroot} modules_install - $MAKE %{?_smp_mflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install +$M $MAKE %{?_smp_mflags} KERNELRELEASE=%{version} INSTALL_MOD_PATH=%{buildroot} modules_install + $MAKE %{?_smp_mflags} KERNELRELEASE=%{version} INSTALL_HDR_PATH=%{buildroot}/usr headers_install cp System.map %{buildroot}/boot/System.map-$KERNELRELEASE cp .config %{buildroot}/boot/config-$KERNELRELEASE $S$M rm -f %{buildroot}/lib/modules/$KERNELRELEASE/build diff --git a/scripts/setlocalversion b/scripts/setlocalversion index af4754a35e66..3b31702b4a4a 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -11,16 +11,11 @@ # usage() { - echo "Usage: $0 [--save-scmversion] [srctree]" >&2 + echo "Usage: $0 [srctree]" >&2 exit 1 } -scm_only=false srctree=. -if test "$1" = "--save-scmversion"; then - scm_only=true - shift -fi if test $# -gt 0; then srctree=$1 shift @@ -35,10 +30,6 @@ scm_version() short=false cd "$srctree" - if test -e .scmversion; then - cat .scmversion - return - fi if test "$1" = "--short"; then short=true fi @@ -103,14 +94,6 @@ collect_files() echo "$res" } -if $scm_only; then - if test ! -e .scmversion; then - res=$(scm_version) - echo "$res" >.scmversion - fi - exit -fi - if ! test -e include/config/auto.conf; then echo "Error: kernelrelease not valid - run 'make prepare' to update it" >&2 exit 1 From patchwork Sun Jan 22 14:14:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 46945 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1169081wrn; Sun, 22 Jan 2023 06:15:40 -0800 (PST) X-Google-Smtp-Source: AMrXdXsB0wf106juulaMi2C1eSRWIfqP8W5qermcwpmcECzlLuu0prz9c/0ayUGN2tyDKnHEywsa X-Received: by 2002:a17:906:9f03:b0:877:962f:be0a with SMTP id fy3-20020a1709069f0300b00877962fbe0amr8963397ejc.37.1674396940156; Sun, 22 Jan 2023 06:15:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674396940; cv=none; d=google.com; s=arc-20160816; b=UHD2xMiLO1cAj3ffNhU08ATL477zC3HuGukcJGob3hqa8LW3bSD0DsQ90MXbgx4bN9 O/3sLPrVzyiGoWK1V1SoLf9XvznOMzDL/Le0fazlZdB+tLHZsZPYTSewCadOefK8WTUP pwcVsfEkJ4E9XWfYcbiAl4NgworIjm1rPhcQ2C54Cq1/7ksPDdTE93uKjAlhMs2iLmJ5 Ja/G12v6kk9r86+1JdcGOmEsMZY7Kp3fnCpwFHG/ywF62wyx3qsNcoKAMS6E4MxOtzSg k+RRbR5KmhPjWNarLGHIyE09l7T5ktyuKI98ip5k9scnGENK/E2j4Ty9CXARjIENreJl 12Aw== 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=6Bt7m39FwDvNOwoBmyv0OA6PNK5+pwoQMFDGxs+NQiY=; b=KVHiH5RuDF/YGMqZyzPDzB8SHNZSve3Ah/vNMv5tJ5IV4vaHBaW3z5Rhhh8BTlq/UX wslQfUJQrpMJYSYsaMm5nZjTeN9RHcMjAheuHdKW2EAUsbK8H9i6dvAJ4goIpXZEKBEM e3/mPJ3R6IcXer2LCabNVW9R/atAb5Egze/mnPULuffp6rmNE/FW8Yqgxg+X1dC/pW7J a1jjOL3G+GFuJKBnUZjgBFYFq8NWigeMYcbjUIw+Cnq6+riqrk3jMe0EpJXk7DxxxNe9 w6/AGT+3f6CnipwtZ/NeGllt3yjpCM0431xIGW2BTTzahqMYxQbr4KbHyzsiaWDB/QYl WF+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=PLLlojZs; 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 dr5-20020a170907720500b0078e1206d934si51666293ejc.162.2023.01.22.06.15.16; Sun, 22 Jan 2023 06:15:40 -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=PLLlojZs; 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 S230114AbjAVOOm (ORCPT + 99 others); Sun, 22 Jan 2023 09:14:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230076AbjAVOOj (ORCPT ); Sun, 22 Jan 2023 09:14:39 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 735A6FF0A; Sun, 22 Jan 2023 06:14:38 -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 sin.source.kernel.org (Postfix) with ESMTPS id DC2F6CE0EC5; Sun, 22 Jan 2023 14:14:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2CCC5C4339E; Sun, 22 Jan 2023 14:14:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674396875; bh=AmzoAcLy4rVEa77Srrddz7lY2JGQMKi8x97/XkEnqeI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PLLlojZsj6x7FqINSenhdIbYC7OHbmRHXOcA6JV2STTfF+QnTgBZL8qNlP573q0yU O+dSLE/V2X+z44PpM+BLmNKSOUEcShsLCbRgvq4mQ8qs/TOEv0gkOaLs8I1hsxdVt4 ezvO91yNvNgxD0iK5FhpnmCD+DNdLnRG4mNggGmZUJTn5QpSo51kSDdZbddndZxN+C hlFc3pU8oMygG2hJWE2XDpDxg6pA84Gd+gC7yItazOmZR/NEUhJK2EcwnynLjGXvpn 4XUlHe5NCCwsNjQAlV6taU3h7Yv6oSykSi3v9cETu+g1dxiBzzR/sR8VVofDfltGWS iym6csGpqZOWg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Rasmus Villemoes , Masahiro Yamada Subject: [PATCH 2/7] setlocalversion: simplify the construction of the short version Date: Sun, 22 Jan 2023 23:14:22 +0900 Message-Id: <20230122141428.115372-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230122141428.115372-1-masahiroy@kernel.org> References: <20230122141428.115372-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?1755732445723010337?= X-GMAIL-MSGID: =?utf-8?q?1755732445723010337?= With the --short option given, scm_version() prints "+". Just append it. Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier --- scripts/setlocalversion | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 3b31702b4a4a..5cdf409204aa 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -121,8 +121,7 @@ elif [ "${LOCALVERSION+set}" != "set" ]; then # # If the variable LOCALVERSION is set (including being set # to an empty string), we don't want to append a plus sign. - scm=$(scm_version --short) - res="$res${scm:++}" + res="$res$(scm_version --short)" fi echo "$res" From patchwork Sun Jan 22 14:14:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 46949 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1169623wrn; Sun, 22 Jan 2023 06:17:03 -0800 (PST) X-Google-Smtp-Source: AMrXdXuITznWXqud+1poAvlojYq7V62i3BEzO1GIkJI5BMkFxlP5LRQDSJQOmob97qsvoPbEdu3Z X-Received: by 2002:a17:907:8c06:b0:7c1:a0e:1607 with SMTP id ta6-20020a1709078c0600b007c10a0e1607mr24693948ejc.12.1674397022881; Sun, 22 Jan 2023 06:17:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674397022; cv=none; d=google.com; s=arc-20160816; b=GepzptGXO+BayBOb8eWvRWw33HCDeIS7Dk2yyuQm8vDxUUrl6tRjgt9hYTwxvRFVEb Br77874R4AkIvOlPSScDiuUvra/RLIFhBtGiJQZltuTEXZpN6A09LhmR6JtjhcAEVd8k 9hdyMMAqCg4T0k78S+e/U19AZbPdOJVFgn6zNZmE9V0Ty1mduWBO0VlyiCcFS0rA71hA Ar8i9jz8BIay41aluVOudHXT62yHXhkYWK8EaO6sWvYmnzBV7S3KrlbjCDptOMadl4ur UHXUE38653Xm30S/mjOjtSnnW+va8am5HPg0rgNjbnE+wUXWlWwgkXZhVm1puYsUoIQd J32A== 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=ksd/SJhyg0NIAMYgGJKOiU9eak2PCaFmhsoJcrKFiVU=; b=oE5iCeucQXyXotPGPrBn3mN1flKnXDggTMdYHrbUbI/s0/eVfV5dPJKE0irDN37qtF fMDClIRZx8F8m4g8Na9Cq5djHMTzk3ReZvs+C94fIDkxf40jWAaD2ev3eRUfco7+tZb2 4W61p2YeBeLqtIlRLOd7PCMtOLYxa4Bb0IttS3hiG741XN80jKjq6Mm2DrZm7XX4TIYN tH5YdqHa+okw/6s6hgoR3ju/m54UW36I5KhzS8gMhaibRAaXvteZW2ltX6p44NpFmJTM M+IZYp2NCdHMDWReE0Z78yVYGKX+dHzyxpHG1n5CIyJpaqh5FaTPJKm3KvZLBMjypl/g I93g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="fJ0O049/"; 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 ne35-20020a1709077ba300b008722ef50e43si19013552ejc.925.2023.01.22.06.16.39; Sun, 22 Jan 2023 06:17:02 -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="fJ0O049/"; 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 S230131AbjAVOOp (ORCPT + 99 others); Sun, 22 Jan 2023 09:14:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230098AbjAVOOk (ORCPT ); Sun, 22 Jan 2023 09:14:40 -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 D8D7610406; Sun, 22 Jan 2023 06:14:38 -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 96ADAB80AE0; Sun, 22 Jan 2023 14:14:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6661BC433D2; Sun, 22 Jan 2023 14:14:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674396876; bh=SlZozu6ilR07Tjhnx/kZyFTMO+EN6Gn/UTedC9bFFfQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fJ0O049/CuHxs0De475Oabnp1r21608SN07nlFaFJlkyHVEzeMQ4/Z3E0P+a0z1jh NLX2aRwzUDqOP2P35CBFj7fbVuQl6mqGevmRlXVKernXyqTdyZfw12V+KoY0Moxq1Q 1DtqvrMY7zDrmiAnPD/Y2fKSs3HT9GRXaHiZHcIDI2wM1se8CEje/TrLhVtdmSjsl+ /gv789zFRyK86qCAamcAPM2sH6Afgo/Kz1VqhXY49zzC0FoIYU5HOOe8yHyTSHi+O8 aGGk9ZYGVX//PKLoXvFoGoW+C892PNj+SfnEKKEz8Cc8JejPXcxEYcnTB91nGpXZ9Q Q4n2tYDf3gNUg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Rasmus Villemoes , Masahiro Yamada Subject: [PATCH 3/7] setlocalversion: make indentation shallower Date: Sun, 22 Jan 2023 23:14:23 +0900 Message-Id: <20230122141428.115372-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230122141428.115372-1-masahiroy@kernel.org> References: <20230122141428.115372-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?1755732532791352885?= X-GMAIL-MSGID: =?utf-8?q?1755732532791352885?= Return earlier if we are not in the correct git repository. This makes the code more readable. Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier --- scripts/setlocalversion | 79 +++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 38 deletions(-) diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 5cdf409204aa..b8e1018d611e 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -34,46 +34,49 @@ scm_version() short=true fi - # Check for git and a git repo. - if test -z "$(git rev-parse --show-cdup 2>/dev/null)" && - head=$(git rev-parse --verify HEAD 2>/dev/null); then - - # If we are at a tagged commit (like "v2.6.30-rc6"), we ignore - # it, because this version is defined in the top level Makefile. - if [ -z "$(git describe --exact-match 2>/dev/null)" ]; then - - # If only the short version is requested, don't bother - # running further git commands - if $short; then - echo "+" - return - fi - # If we are past a tagged commit (like - # "v2.6.30-rc5-302-g72357d5"), we pretty print it. - if atag="$(git describe 2>/dev/null)"; then - echo "$atag" | awk -F- '{printf("-%05d", $(NF-1))}' - fi - - # Add -g and exactly 12 hex chars. - printf '%s%s' -g "$(echo $head | cut -c1-12)" - fi + if test -n "$(git rev-parse --show-cdup 2>/dev/null)"; then + return + fi + + if ! head=$(git rev-parse --verify HEAD 2>/dev/null); then + return + fi + + # If we are at a tagged commit (like "v2.6.30-rc6"), we ignore it + # because this version is defined in the top level Makefile. + if [ -z "$(git describe --exact-match 2>/dev/null)" ]; then - # Check for uncommitted changes. - # This script must avoid any write attempt to the source tree, - # which might be read-only. - # You cannot use 'git describe --dirty' because it tries to - # create .git/index.lock . - # First, with git-status, but --no-optional-locks is only - # supported in git >= 2.14, so fall back to git-diff-index if - # it fails. Note that git-diff-index does not refresh the - # index, so it may give misleading results. See - # git-update-index(1), git-diff-index(1), and git-status(1). - if { - git --no-optional-locks status -uno --porcelain 2>/dev/null || - git diff-index --name-only HEAD - } | read dummy; then - printf '%s' -dirty + # If only the short version is requested, don't bother + # running further git commands + if $short; then + echo "+" + return fi + # If we are past a tagged commit (like + # "v2.6.30-rc5-302-g72357d5"), we pretty print it. + if atag="$(git describe 2>/dev/null)"; then + echo "$atag" | awk -F- '{printf("-%05d", $(NF-1))}' + fi + + # Add -g and exactly 12 hex chars. + printf '%s%s' -g "$(echo $head | cut -c1-12)" + fi + + # Check for uncommitted changes. + # This script must avoid any write attempt to the source tree, which + # might be read-only. + # You cannot use 'git describe --dirty' because it tries to create + # .git/index.lock . + # First, with git-status, but --no-optional-locks is only supported in + # git >= 2.14, so fall back to git-diff-index if it fails. Note that + # git-diff-index does not refresh the index, so it may give misleading + # results. + # See git-update-index(1), git-diff-index(1), and git-status(1). + if { + git --no-optional-locks status -uno --porcelain 2>/dev/null || + git diff-index --name-only HEAD + } | read dummy; then + printf '%s' -dirty fi } From patchwork Sun Jan 22 14:14:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 46948 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1169590wrn; Sun, 22 Jan 2023 06:16:56 -0800 (PST) X-Google-Smtp-Source: AMrXdXu5kCcysxKn+krwT4Pj5Il2HIULSa+5DGvPm1qsTayyWyVIBBj7VK8Jbb6J7+TlganeubGE X-Received: by 2002:aa7:de11:0:b0:49e:351b:fc94 with SMTP id h17-20020aa7de11000000b0049e351bfc94mr20057361edv.36.1674397015975; Sun, 22 Jan 2023 06:16:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674397015; cv=none; d=google.com; s=arc-20160816; b=S5QuO6cWnlRzuLPJ2hUcXVCdsm0h8xdofCUraxkQD4mclJ6JuAvt9SgCUQLpTZkk1X esbBFJNV8aq2p2MN6YAc1FX7HtzomJWzMAG2fPkDVsZr5WXGDbcDnX/BtSEkURHQbV9Q S168r2WvVh/++tQwbHEcetBTClIqD3vLxapKe4uFI192ipyWibw50JMpHB59NK0pt5Ir 9OqMIRbnSxqNC6KbpMLU/dwVU+Cfy3XEgRK2bT0vj/6qu0ohUzBF6QOvOsT+KrC5HwWk 2Sq2ucfQKGA5/PRikqbfha+SNZJbHqlvFBhK7dJO+JErSc6nLR9EpIaKJls403Pd9Syl uVLw== 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=OqaFKWp5rDmGB3rRi+iJJlgginC/i1sbemKNsRV3AY8=; b=0TAU75ezRTrnAZB8f54yggd02jEt74B3je5btOWhAcoe1apPC5WGMGwa5HouQYaAch L9uJpykK3HPcAD4ClcrHrAwdoaVznwrYggDJrH/kwI/lH0BjURFhnULWkf6JHIKOzkuJ +yeH/hCgC+EGLWR3POy69u/Q1qmJpyT9blbcM9+h9N+bZdWTiENfORdpBJhSKvvXeDX2 uuMm6EVpktS24ld7SfCc7e/cXc+5EO2SL/nqUdMehX52ICNdFAjjsSUW8TJtXakXijPq GEriXM/qgoJjwqB8OZVChPnLn3yWZQfnfmDVWUOP1ZDNXqZ02ING91HMjy/131iB5pUj lotQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="S8M+/49b"; 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 dm8-20020a170907948800b00871e472743asi20794846ejc.570.2023.01.22.06.16.32; Sun, 22 Jan 2023 06:16:55 -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="S8M+/49b"; 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 S230144AbjAVOOr (ORCPT + 99 others); Sun, 22 Jan 2023 09:14:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230096AbjAVOOj (ORCPT ); Sun, 22 Jan 2023 09:14:39 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 633911027D; Sun, 22 Jan 2023 06:14:38 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 09F5860C27; Sun, 22 Jan 2023 14:14:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A678AC433EF; Sun, 22 Jan 2023 14:14:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674396877; bh=y+Ug4suYHYeIMApo2ZM/VY4lgUs7HsilGboGF3UyoLU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S8M+/49bxCSUvlkbHHFeQYPCjAx0oTxw9MI29v3hNlenmYLHrCc8ueuI8kZW9C1b+ Y8YhtCIJ+TQcdYKrpbp4AafnL51606dLNskej/AJKFXEe3YLU7JsloNheDIdJjDzxJ Rdzep00ey8GjRSuHWWskMiO1Jh1qi7H+ZESkNeHQIOX763R+cDXOBvwUCyI/CULCyi nlExDe4M8WHRDHxqAdin1ui8ewn3jYUYY8fLyEmwFp1WhPrVfRt0diF33CvSBr2dxN BhId8tgSSJPS3uX3RLtvdm+TKz/XJqS4L8PlWMEyenOc0HWCMjeAdQBHTOMFxg5F9N Pp+tjPJ3K0pIA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Rasmus Villemoes , Masahiro Yamada Subject: [PATCH 4/7] setlocalversion: use only the correct release tag for git-describe Date: Sun, 22 Jan 2023 23:14:24 +0900 Message-Id: <20230122141428.115372-4-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230122141428.115372-1-masahiroy@kernel.org> References: <20230122141428.115372-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?1755732525152930177?= X-GMAIL-MSGID: =?utf-8?q?1755732525152930177?= Currently, setlocalversion uses any annotated tag for git-describe. If we are at a tagged commit, it will not append the commit hash. $ git checkout v6.2-rc1^ $ make -s defconfig prepare $ make kernelrelease 6.1.0-14595-g292a089d78d3 $ git tag -a foo -m foo $ make kernelrelease 6.1.0 If a local tag 'foo' exists, it pretends to be a released version '6.1.0', while there are many commits on top of it. The output should be consistent irrespective of such a local tag. Pass the correct release tag to --match option of git-describe. In the mainline kernel, the SUBLEVEL is always '0' but it is omitted from the tag. version tag 6.1.0 -> v6.1 (mainline) 6.2.0-rc5 -> v6.2-rc5 (mainline, release candidate) 6.1.7 -> v6.1.7 (stable) Signed-off-by: Masahiro Yamada --- scripts/setlocalversion | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/scripts/setlocalversion b/scripts/setlocalversion index b8e1018d611e..a4c9a61b0665 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -27,6 +27,7 @@ fi scm_version() { local short + local tag short=false cd "$srctree" @@ -42,9 +43,14 @@ scm_version() return fi - # If we are at a tagged commit (like "v2.6.30-rc6"), we ignore it - # because this version is defined in the top level Makefile. - if [ -z "$(git describe --exact-match 2>/dev/null)" ]; then + # convert the version to a tag + # mainline kernel: 6.2.0-rc5 -> v6.2-rc5 + # stable kernel: 6.1.7 -> v6.1.7 + tag=v$(echo "${KERNELVERSION}" | sed 's/^\(.*\..*\)\.0\(.*\)$/\1\2/') + + # If we are at a tagged commit and the tag matches the version defined + # in the top level Makefile, we ignore it. + if [ -z "$(git describe --exact-match --match=$tag 2>/dev/null)" ]; then # If only the short version is requested, don't bother # running further git commands @@ -52,9 +58,9 @@ scm_version() echo "+" return fi - # If we are past a tagged commit (like - # "v2.6.30-rc5-302-g72357d5"), we pretty print it. - if atag="$(git describe 2>/dev/null)"; then + # If we are past the release tag, we pretty print it. + # (like 6.1.0-14595-g292a089d78d3) + if atag="$(git describe --match=$tag 2>/dev/null)"; then echo "$atag" | awk -F- '{printf("-%05d", $(NF-1))}' fi @@ -102,6 +108,11 @@ if ! test -e include/config/auto.conf; then exit 1 fi +if [ -z "${KERNELVERSION}" ]; then + echo "KERNELVERSION is not set" >&2 + exit 1 +fi + # localversion* files in the build and source directory res="$(collect_files localversion*)" if test ! "$srctree" -ef .; then From patchwork Sun Jan 22 14:14:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 46950 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1169645wrn; Sun, 22 Jan 2023 06:17:06 -0800 (PST) X-Google-Smtp-Source: AMrXdXsA1owkQB8biR+ohsTwGKn44tXvkqht0SiwoimqeVRPKE6vM+/+1ZJYzjSCmy3bvW6ZLJVx X-Received: by 2002:a17:906:b24c:b0:869:236c:ac41 with SMTP id ce12-20020a170906b24c00b00869236cac41mr24456604ejb.24.1674397026155; Sun, 22 Jan 2023 06:17:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674397026; cv=none; d=google.com; s=arc-20160816; b=L1aE4VVArpP5zk/zLP5ydYgbUOW0CMox3zX6i1/pzOThU8+q4t7MoTab1AVHY9FRSX VWaR3KPbF7p5PV3baV74i2veZ31OZzVaSUGSJ0DahsJr6oAysWY+IMosofDSgrxYqNC/ mAnOiZNzEvd2ZNwJTOeREejv7RIm5o9t2tbOTNh8EaEAhdZCE6SDA7028UlCmj1X9sga rH9/KgRiwGZNl3IFkanK9sIJtg/qJ6n2LYG5G9k4DYz65KxPVJlVVosJKD4nFN28C11k 0rhpdMf4plubVaiA8Ok+5oCbRC9UtVlRK2hyp84CmQf05OAQ7L4DNmqYsjo9Fc+faRzy /1+g== 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=4X+C6pnnrFUU4WiRbzO94gFG/UsTIa3ABXrvDktDC4w=; b=I/rbbDXnbQyLcFoY0XX7sQ6AiY33CYRxCR6e8N368thABgCKJ8IAmu9I/1Uq7pFCjL cQx01c3JXL95tqo+tvYmFjaUWcQ0XuRvZFb5l0QFSCNFiGHopBh+fZ8qpe9+gYmxzHx4 eCu6jmFHdx6bZyazCCf+kroeFyb0bRxiW69Os269OGIh0MEb3pFAmlDr5KOqeF7yq4lR aMRV2atsaoRGIe0vpSFIPT9jKBb1Q1cBQ9ZkwalIGpiRQ2j1ec7KcxV1fgBP60jS20aw yhVCTfuT/EZ+jzWPLTOs3USirbv2yQ0nIDgqwCECe92mDMXUIjTMteVShXTHmDOCST76 HhNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=P2hHapDY; 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 hd16-20020a170907969000b0087780afc91csi11462140ejc.921.2023.01.22.06.16.41; Sun, 22 Jan 2023 06:17:06 -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=P2hHapDY; 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 S230152AbjAVOOy (ORCPT + 99 others); Sun, 22 Jan 2023 09:14:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230107AbjAVOOl (ORCPT ); Sun, 22 Jan 2023 09:14:41 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 795FD113C5; Sun, 22 Jan 2023 06:14:40 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 9A36C60C35; Sun, 22 Jan 2023 14:14:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D056DC4339C; Sun, 22 Jan 2023 14:14:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674396879; bh=9IUwo+QWRIianpkKIsxTKg2IUwJbi7Os01Md0K+GfMA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P2hHapDYpEu8VY7fMIr1T3wE/FRmZnEcrE6k/V1Vm6LVNCxC35dqXP4U8xcZ9SxMG uyj18Z9o8yT07+6lbYWKsDCDpg84eR4NGdoUQ/OIk71JkIHyMsPCkv0XhCxW8FK8dk nEIZNBTarPSWqZKHEu4E/jme0kw5oxKLOoT/ernhNbEuqGsyTqElF1fZhZci9hXXIp svbUQ0brQzBphYXOyCtlMA6viyAN6K9Ms1XXdEqgdavZjtcKLaczPgZp/DFliBBlXA wu3zrLlZqsSkXSRsrinOwo7IoL0LOy/WNFeGxih2cP9t1RPhleUAzLME10ntl1dddT SJIMkdiF1vjsQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Rasmus Villemoes , Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier Subject: [PATCH 5/7] setlocalversion: absorb $(KERNELVERSION) Date: Sun, 22 Jan 2023 23:14:25 +0900 Message-Id: <20230122141428.115372-5-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230122141428.115372-1-masahiroy@kernel.org> References: <20230122141428.115372-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,URIBL_BLOCKED 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?1755732535869832231?= X-GMAIL-MSGID: =?utf-8?q?1755732535869832231?= Print $(KERNELVERSION) in setlocalversion so that the callers get simpler. Signed-off-by: Masahiro Yamada --- Makefile | 5 ++--- scripts/setlocalversion | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ed3294c7be97..d0a95277f08a 100644 --- a/Makefile +++ b/Makefile @@ -1247,8 +1247,7 @@ vmlinux: vmlinux.o $(KBUILD_LDS) modpost # make sure no implicit rule kicks in $(sort $(KBUILD_LDS) $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS)): . ; -filechk_kernel.release = \ - echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" +filechk_kernel.release = $(srctree)/scripts/setlocalversion $(srctree) # Store (new) KERNELRELEASE string in include/config/kernel.release include/config/kernel.release: FORCE @@ -2112,7 +2111,7 @@ checkstack: $(PERL) $(srctree)/scripts/checkstack.pl $(CHECKSTACK_ARCH) kernelrelease: - @echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" + @$(srctree)/scripts/setlocalversion $(srctree) kernelversion: @echo $(KERNELVERSION) diff --git a/scripts/setlocalversion b/scripts/setlocalversion index a4c9a61b0665..7c7cbefa5aa4 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -113,8 +113,10 @@ if [ -z "${KERNELVERSION}" ]; then exit 1 fi +res="${KERNELVERSION}" + # localversion* files in the build and source directory -res="$(collect_files localversion*)" +res="${res}$(collect_files localversion*)" if test ! "$srctree" -ef .; then res="$res$(collect_files "$srctree"/localversion*)" fi From patchwork Sun Jan 22 14:14: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: 46947 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1169564wrn; Sun, 22 Jan 2023 06:16:51 -0800 (PST) X-Google-Smtp-Source: AMrXdXuoZYeBFJ8kUxYPt7Gj1u/G+Hgf9v9MSoBu9Z57yllTPBMvwe15jNlvCfA55u5MVZ2TFqBi X-Received: by 2002:aa7:cd86:0:b0:499:27e8:94a3 with SMTP id x6-20020aa7cd86000000b0049927e894a3mr23143928edv.13.1674397011323; Sun, 22 Jan 2023 06:16:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674397011; cv=none; d=google.com; s=arc-20160816; b=sVB8W5gXDrNBYkv/E3s7XVhTHMH5Id0dUw9Jhn7KuvFHIhJ0xL2NqgGoSPOdmSCXAE tRwlerhwDZNGCF7GFJdb0Qjey55dhPiieGWJGIZ7gGNrNHprojetCGx2rNRpDbal70iw U6rsDrGa2bHh4qT/sZKWdO5+TmKmcgqdW9kwYiAIhPlb8iVl7fWwrSgD4rChDME2YIRN bVQJJCWTz/ig2R2/5BKLjQHMIbQ1tvLXlzyOFtYIq2WWLXzJz5OFZNZThhmGTew72Gnl PWIq4QcM+WXhriQCrT5pxPfcu514Ixk19NJCTJYHiKVjuhF9RrHi3XXyueAcyFasqzta Yfsw== 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=VDiMuQ2EKJvbslPmt9j5qr/S+fDo+51wmaFten6hchE=; b=d2y44zjImaAuOjZlKLXkQr3OunF6ZRlTxlDMnmamU6kLczOu3u/3bkVj+Bc3QeYJwY I8MJQ+lOX1oLygMNqfdScfJJS/+2okb7Upg/WRjMESRFSWf4EgaRYjpvXZ+L8mUCLfHX G69KNLhVDzV1/Hv7ACs3ELt5N6zy4qPZeCtMmef1B8F+85tgVyWB0H8+PF8ESYkun/Ez S9ZpB+xEGNSAJs8xsz+C1s0O3ObyZPcTWq2o6K1HHJLo0ikiuepHUUuESZzGiUgFeg/A bJzXteKLzO3XuGgK3yKwpOpf1adpJDYqwoJVJ86sV9rBI6j9wMy62VE0ZeZFLrWiM4xt yNTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=gfpg+zWB; 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 g14-20020a056402090e00b0048721e1b62csi933314edz.613.2023.01.22.06.16.27; Sun, 22 Jan 2023 06:16:51 -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=gfpg+zWB; 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 S230158AbjAVOO7 (ORCPT + 99 others); Sun, 22 Jan 2023 09:14:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230129AbjAVOOo (ORCPT ); Sun, 22 Jan 2023 09:14:44 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 045851A95C; Sun, 22 Jan 2023 06:14:42 -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 8DBB0B80AE1; Sun, 22 Jan 2023 14:14:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B363C433A0; Sun, 22 Jan 2023 14:14:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674396880; bh=ndQFjq+/ARkN/T9TsVQmpqH/FBFem7P2bRf0kXnGi0E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gfpg+zWBgdzmkdnkHK9/GrSCoWM3Hj9M9JV2l5W7qy8P8ImFYoKFGZuJlj5KnUOY1 /hkbB+HVpmjvhYrRj7/MlNLGcbn/UFt871v/FsOs2COBs9nrITy03kdlx59oS2bZeL BVMhNEPLfLRwALVZYlxxpSHo1trUHNj/E9we8SKFznL6BxuWB2r9m6ybhUaIkh4Mm6 VhkbSNQsaZAJsFEw6x0/U3XGx62UqqJM9Ip4s6Z5aWdjfxjwp1OyiXCHzUYGLzE05f Y1J4M7d6eCdExpo6dYqh5tKsrGhpw98scizwcvXrWLyk0uLJLNlUCRUBNnTTcrrDVp 82EFSMtcZD4yQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Rasmus Villemoes , Masahiro Yamada Subject: [PATCH 6/7] setlocalversion: print ${KERNELRELEASE} if set Date: Sun, 22 Jan 2023 23:14:26 +0900 Message-Id: <20230122141428.115372-6-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230122141428.115372-1-masahiroy@kernel.org> References: <20230122141428.115372-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?1755732520321882777?= X-GMAIL-MSGID: =?utf-8?q?1755732520321882777?= When KERNELRELEASE is overridden, include/config/kernel.release still stores the string would be returned by the script if KERNELRELEASE had not been overridden. This is not strange. include/config/kernel.release should store KERNELRELEASE that was used for building the kernel. Signed-off-by: Masahiro Yamada --- scripts/setlocalversion | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 7c7cbefa5aa4..eff8cc831571 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -103,6 +103,11 @@ collect_files() echo "$res" } +if [ -n "${KERNELRELEASE}" ]; then + echo "${KERNELRELEASE}" + exit 0 +fi + if ! test -e include/config/auto.conf; then echo "Error: kernelrelease not valid - run 'make prepare' to update it" >&2 exit 1 From patchwork Sun Jan 22 14:14:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 46951 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1169780wrn; Sun, 22 Jan 2023 06:17:26 -0800 (PST) X-Google-Smtp-Source: AMrXdXuZa2XxQZTLv7FkX36xU7MWu7ZsKEzJMQK3veUi5BpF9IYVmCweb+zBT7ph0RoCweSwFg5t X-Received: by 2002:a17:906:d971:b0:870:7e7d:97a7 with SMTP id rp17-20020a170906d97100b008707e7d97a7mr19959548ejb.72.1674397046046; Sun, 22 Jan 2023 06:17:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674397046; cv=none; d=google.com; s=arc-20160816; b=HX+OG0b21fUAUpqpIGBkBsiVzqq6FYruvLAztX3TagYDzPPJHRgS6GSxk1VYSGfcHy PZeQUioZrcAx7yY+tjCm7hoTQq6cL6ysJaDsx2ydUnt+QpiJfLEueeQbNF4rR/fJjDsi hCzlasyE8XwIjyfIiHqfsU3kABQakV0Ybw07tSMne4/oPFYb/XvbtY9Qrd3iioWIIPL0 DYLfMfSvdmXpkLZ+B0i9cBq5Pdnyxxk749zhAWC2UR5FrCpQlarKYgm9Yu+vaU6SZ+D5 xhAM+hDg6E1xYe5ZStST6gZa8nileWOcS2lsD8BDz/sOJkvv/1zSKkTov53ryJrkz4iB Tgog== 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=0GwxEmlRmVKXjdZQ6qbGS2S2dT27rGeQv9//PAwCkYI=; b=RFXNjFlZzj52vEa7fc9mD41Ah1cpswIDiuMNHrpCgYGC1WrgWYRThgbSx7auadfVFh P068jkxxkhWkOe65SmxH2udo1aTokad9WXoyG++i17dJnvc5WB7htAKDZKeHPeiUtNxO Scyao8vmNlDeXhhV+gGGY/+y9SVtbuTYrMmMx0o0H5OFzeYfHVup6y4ptDNLepGf6Y/S VIhzxY/IhTpM7qRNpzH3msg4eQLkj5JyZiAKvhHkO8FwRprea5q2dEmsjGf8jJy6JeKH o9pdLX/o5nEkarCluM507lgvKObxJ0ZoMKoNPWq1DmyPNWikuS1frtxiivxfYXZ7PcYg udDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=mKaHTJNU; 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 qw10-20020a1709066a0a00b008714c52cd14si22816056ejc.37.2023.01.22.06.17.02; Sun, 22 Jan 2023 06:17:26 -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=mKaHTJNU; 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 S230161AbjAVOO4 (ORCPT + 99 others); Sun, 22 Jan 2023 09:14:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230137AbjAVOOq (ORCPT ); Sun, 22 Jan 2023 09:14:46 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0466D1A960; Sun, 22 Jan 2023 06:14:42 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 84D9160C33; Sun, 22 Jan 2023 14:14:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BE931C433EF; Sun, 22 Jan 2023 14:14:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674396881; bh=54/WoMZ8YydDCjSCHnhXruffaj7Qo/EOB9FpfM9dfE4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mKaHTJNU+lxxXBEbp3aV2wH/EkaNYfJE0weeBS2a9lRuj9k8T63GLvWo6LHMY2Tft oTXgc7CPLEpt92WRC5w5S8c+73JSshZYcMdQHtoCVHHdcU5SWECLLW/mKJW8L+vanI VtuiHWbP5iG6BBFnT0QLXB4fS648rna4lgLV8xGEiYtro0jyDtIpoeb7W+rj/n6kr9 itpHQkz+yqnSQsocunshqIBDu51acPdu6+dxuCXrBHNXGnMQXHypkt1kKWgWkpkLB+ 2xh0HqQuPQcz/pC7LMwtCwm4+F+EfVFIosNv67uPBjVvRWRchbqkjRhaLGnoF2Xe7D Sdos3Z3ba/ktw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Rasmus Villemoes , Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier Subject: [PATCH 7/7] kbuild: do not re-run setlocalversion for kernelrelease Date: Sun, 22 Jan 2023 23:14:27 +0900 Message-Id: <20230122141428.115372-7-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230122141428.115372-1-masahiroy@kernel.org> References: <20230122141428.115372-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,URIBL_BLOCKED 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?1755732556665594558?= X-GMAIL-MSGID: =?utf-8?q?1755732556665594558?= Revert: - 7b8ea53d7f18 ("makefile: not need to regenerate kernel.release file when make kernelrelease") - 01ab17887f4c ("Makefile: "make kernelrelease" should show the correct full kernel version") I think the original behavior was better - 'make kernelrelease' should print $(KERNELRELEASE) used in the last build, not the one that will be used in the next build. Therefore, it is an error if you run it in the pristine source tree. Signed-off-by: Masahiro Yamada --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index d0a95277f08a..de402d415d5f 100644 --- a/Makefile +++ b/Makefile @@ -281,13 +281,13 @@ clean-targets := %clean mrproper cleandocs no-dot-config-targets := $(clean-targets) \ cscope gtags TAGS tags help% %docs check% coccicheck \ $(version_h) headers headers_% archheaders archscripts \ - %asm-generic kernelversion %src-pkg dt_binding_check \ + %asm-generic kernelrelease kernelversion %src-pkg dt_binding_check \ outputmakefile rustavailable rustfmt rustfmtcheck # Installation targets should not require compiler. Unfortunately, vdso_install # is an exception where build artifacts may be updated. This must be fixed. no-compiler-targets := $(no-dot-config-targets) install dtbs_install \ - headers_install modules_install kernelrelease image_name -no-sync-config-targets := $(no-dot-config-targets) %install kernelrelease \ + headers_install modules_install image_name +no-sync-config-targets := $(no-dot-config-targets) %install \ image_name single-targets := %.a %.i %.ko %.lds %.ll %.lst %.mod %.o %.rsi %.s %.symtypes %/ @@ -1677,7 +1677,7 @@ help: @echo ' tags/TAGS - Generate tags file for editors' @echo ' cscope - Generate cscope index' @echo ' gtags - Generate GNU GLOBAL index' - @echo ' kernelrelease - Output the release version string (use with make -s)' + @echo ' kernelrelease - Output the release version string used in the last build (use with make -s)' @echo ' kernelversion - Output the version stored in Makefile (use with make -s)' @echo ' image_name - Output the image name (use with make -s)' @echo ' headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'; \ @@ -2111,7 +2111,7 @@ checkstack: $(PERL) $(srctree)/scripts/checkstack.pl $(CHECKSTACK_ARCH) kernelrelease: - @$(srctree)/scripts/setlocalversion $(srctree) + @echo $(or $(KERNELRELEASE),$(error kernelrelease not valid - run 'make prepare' to update it)) kernelversion: @echo $(KERNELVERSION)