From patchwork Tue Jan 31 13:32:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 50873 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2757722wrn; Tue, 31 Jan 2023 05:46:04 -0800 (PST) X-Google-Smtp-Source: AK7set8ErducYhLlSZE/jyFC1il0SAk5FxI0Ltpue5NGXrjd6txvmEJ3lr+g2bA5NPBqDMIub0pO X-Received: by 2002:a17:906:1409:b0:878:702e:9dff with SMTP id p9-20020a170906140900b00878702e9dffmr18080229ejc.41.1675172764057; Tue, 31 Jan 2023 05:46:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675172764; cv=none; d=google.com; s=arc-20160816; b=F0ifgdbfizCx9WRChQx0V6oNVXDT6JY4QMtQJL7Rn4yplF7u66FPcwyuMe6SdaoOid S8fW5cmYqZk2Ma1EPjQm8p/uLRn+t4RlE+KjuDhgKdGtw6FXH3rYedIz5367qbx28AW1 Hvm4BXoNaPaUy/HPPQu7n5YiaR5zHXW1AU0yAycGxy2PT/s+V140DKyWf2C56gwg2mc3 60mnS8xiRSlyq73wTZar101K9dvJiZD3Hv0DkEHrl1U+1Lz2N9MnXGpFDlzWIevwo2XA rgM+a1XLwX8zA/ywTFG0bfgDUvBVJjuZdkEdwr6hOv+4UF7c8rdCWfc9C1W2H6HV7wl+ LvUg== 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=ZJgmSthaysJzyIWUxTSE87jd8dXKwdSYIzMMZ7J5zgI=; b=yqQP+IYzSXAupyXM+TGMjE9A4DUATPnqsYelT1hHm71H3VmxGkgER7ol81bFiHv2Ys GwoprtDQDe3P/kBehheNXGmfCNzU0RTcr/5f/FsilavWTLqkr8l8Om2SLq5aIYsqFh/s xPjwbIMWgdZuCjSSCFifiQLb0PJgd3C86OGbSmFZvKl07xN2IxT0qXRwCNuLB54yNkC9 L3EgpFqz5eJCwRsq9IETzg6u2qldxwYC+WtORTWj5DrWAzVbc6zvaJUpcsTft0dNFr9J raggKvx8AhjymrehwjdGKUoCH1s8wWfmS+uqv7vSlcragrxWKdUCz00Z+FOllbztfTl5 qy+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=gxAxcYea; 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 gk23-20020a17090790d700b0087fc4e02485si206172ejb.952.2023.01.31.05.45.40; Tue, 31 Jan 2023 05:46:04 -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=gxAxcYea; 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 S232230AbjAaNdw (ORCPT + 99 others); Tue, 31 Jan 2023 08:33:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231578AbjAaNdq (ORCPT ); Tue, 31 Jan 2023 08:33:46 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBF2F23C76; Tue, 31 Jan 2023 05:33: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 8B03EB81C95; Tue, 31 Jan 2023 13:33:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7705DC433EF; Tue, 31 Jan 2023 13:33:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675172020; bh=6Hx/Yl639gs12tAxrrRchm4lXuBjrnkbiP792+3ios0=; h=From:To:Cc:Subject:Date:From; b=gxAxcYeaUqyMFe6e/jBcqfq0uWYwq0vATyD9O3wKa13ubJc9WGsyrnKZdRiXI4VXI hgt9wqAogfJScOIsdtAksRFD4RA6jwT3aLkvF0mATVvUqfCfCK6PRjQB//ipGv8Tnr Wjt6HNH8V/XMAiA+tmiHUlP78dkRSgIbA5zgNO0U7PwARe8dmvMwh1Qm4U5BIgmomd KNpIUuUizU9hv2j+UnOU5Um3HJmSt2OyvOexEOAdIpdqIHpHRLyAKX9F+2ChTKABIf qojUpQblX5pD0vvGkDkCzmqRZiFsq9WdpjmlH5t1J0hfKF+u/JKl8nRg5fhNdZMtiZ 8tR4sC/FknT0g== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH] setlocalversion: do not append git commit hash if localversion* exists Date: Tue, 31 Jan 2023 22:32:53 +0900 Message-Id: <20230131133253.1460560-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?1756545955827698417?= X-GMAIL-MSGID: =?utf-8?q?1756545955827698417?= Since commit dcfbcb1033bb ("setlocalversion: use only the correct release tag for git-describe"), KERNELRELEASE of linux-next is annoyingly long: $ make kernelrelease 6.2.0-rc6-next-20230131-09515-g80bd9028feca The string '-09515-g80bd9028feca' is appended because git-describe now uses the v6.2.0 tag instead of the next-20230113 tag. In linux-next, the 'localversion-next' file well specifies the local version, so the extra info from git is unneeded. Signed-off-by: Masahiro Yamada --- scripts/setlocalversion | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/scripts/setlocalversion b/scripts/setlocalversion index e2b2d492ac13..4219a0ca1e62 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -113,22 +113,23 @@ if [ -z "${KERNELVERSION}" ]; then exit 1 fi -res="${KERNELVERSION}" - # localversion* files in the build and source directory -res="${res}$(collect_files localversion*)" +file_localversion="$(collect_files localversion*)" if test ! "$srctree" -ef .; then - res="$res$(collect_files "$srctree"/localversion*)" + file_localversion="${file_localversion}$(collect_files "$srctree"/localversion*)" fi -# CONFIG_LOCALVERSION and LOCALVERSION (if set) +# CONFIG_LOCALVERSION config_localversion=$(sed -n 's/^CONFIG_LOCALVERSION=\(.*\)$/\1/p' include/config/auto.conf) -res="${res}${config_localversion}${LOCALVERSION}" # scm version string if not at the kernel version tag -if grep -q "^CONFIG_LOCALVERSION_AUTO=y$" include/config/auto.conf; then +if [ -n "${file_localversion}" ]; then + # If localversion* files exist (like in linux-next), the version is + # well specified. Do not append scm_version. + scm_version= +elif grep -q "^CONFIG_LOCALVERSION_AUTO=y$" include/config/auto.conf; then # full scm version string - res="$res$(scm_version)" + scm_version="$(scm_version)" elif [ "${LOCALVERSION+set}" != "set" ]; then # If the variable LOCALVERSION is not set, append a plus # sign if the repository is not in a clean annotated or @@ -137,7 +138,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. - res="$res$(scm_version --short)" + scm_version="$(scm_version --short)" fi -echo "$res" +echo "${KERNELVERSION}${file_localversion}${config_localversion}${LOCALVERSION}${scm_version}"