Message ID | 20230122141428.115372-2-masahiroy@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> 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 <rfc822;forouhar.linux@gmail.com> + 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 <rfc822;linux-kernel@vger.kernel.org>); 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 <masahiroy@kernel.org> To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Rasmus Villemoes <rasmus.villemoes@prevas.dk>, Masahiro Yamada <masahiroy@kernel.org> 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 Content-Transfer-Encoding: 8bit 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: <linux-kernel.vger.kernel.org> 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?= |
Series |
[1/7] kbuild: do not put .scmversion into the source tarball
|
|
Commit Message
Masahiro Yamada
Jan. 22, 2023, 2:14 p.m. UTC
With the --short option given, scm_version() prints "+".
Just append it.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
scripts/setlocalversion | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Comments
On Sun 22 Jan 2023 23:14:22 GMT, Masahiro Yamada wrote: > With the --short option given, scm_version() prints "+". > Just append it. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- > > 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" > -- > 2.34.1 Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
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"