From patchwork Sat Jul 22 04:47:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 124218 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp627545vqg; Fri, 21 Jul 2023 22:14:52 -0700 (PDT) X-Google-Smtp-Source: APBJJlE9CiNamgn/VKoBH3FcCbAQK2ajKKmAnZ2xUeSrvCMRasQ7AfVGcLgWwlSs79OMPnDRJwtV X-Received: by 2002:a05:6871:5207:b0:1b3:f8b7:55b4 with SMTP id ht7-20020a056871520700b001b3f8b755b4mr5221768oac.35.1690002892375; Fri, 21 Jul 2023 22:14:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690002892; cv=none; d=google.com; s=arc-20160816; b=ajeNV0Lu+1v5RnX7ijl6itqx8O1oNvOqNthQG2lDsXn8ta/EqEaaC7OYl3EqkzEccI X/e4LhtZB4duCXEejvsOaNlCyzsgO5MIFt0M8mjy4yy4cULp7YwjbEpSMGDaM5r9pFN2 yBK8QiOQ/kL9rofMMzcDITb59vflgf3oCQ8mFINwUeP2cNPajILNJefRA5B7VTiYti1O iHEmq4VtTSVTjiWq9nc6LY0bjCyipRPH59IrdMx/t6cUVzPRdTD/7GFQe8hdMEDL1cCY uPhC8uTAvkS2O8Y9FxhgpCS21GyAe17ne6NKHzEqlxwaCod55p1bCMgkyRm9JPmJJklR ZE1g== 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=goxX9HQ6RbGUTfMbYNPYBryNMEmr80DskjZpAYWHvlU=; fh=rliOZr6Fz5JmnSfKOt6v3ZHxXv/lQ1TnqU77+ZCO3og=; b=cqcp1YB5UpBIhF1w8z8Qo5Hp0NgKM8fjK7BpMDhEml9O6A0BsZ0V3+g+/zTQGrP2vi rsOBQ+kEVHeZ2gIyiJLsIohsDDCF8stk9/kkYAWmz3d0TXxnqjA/QzyqpTwXlfDW37ev KS/DhZlFkBJo6BQ93Pdd65WOIy3Y/uPmY0qRpFUGJ5GFDekY15SFPnKeuthoJ/HGuEV8 BqY/Jdgv32k/RmIr9q89xb3UpA+xgOQU11zjZATjbGEq8Wmd0R7fQruWEIOzO1LKeNxG PeJZ7rRp05vmmaLMNeneGDQ41oUMvFC9Ap1UB4xOcgd39niy8qNdPrsNuUxeOItHlcm1 Tqcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=lp6FOQo4; 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 v21-20020a056a00149500b00681c3725a98si4723253pfu.82.2023.07.21.22.14.38; Fri, 21 Jul 2023 22:14:52 -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=lp6FOQo4; 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 S231151AbjGVEtW (ORCPT + 99 others); Sat, 22 Jul 2023 00:49:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229679AbjGVEtH (ORCPT ); Sat, 22 Jul 2023 00:49:07 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C05E3C3E; Fri, 21 Jul 2023 21:48:30 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E744C60A4C; Sat, 22 Jul 2023 04:48:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45568C433CC; Sat, 22 Jul 2023 04:48:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690001309; bh=GAV/eLhMDGBWsU4RkH60dgfKVcN7IvGPnaFM8V2OKes=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lp6FOQo44sQPExuQZjESFj1zb62XPACYDO5tkQkWDaiHdCTv9LFS0Q9KtXa0ffkPj K9ek+TTO6Tg1il21/dLxohqckw9/8aSrqZuyrrPyIQU6DX7NNFTlC+a6KRe+AU5Ye2 dN7PHYzAvJ4gldhG/Uc4t5x2NXmbL3hR2EOY2aVtjKv+ADOt/iEI3IK59F/Qcehfxl t8KbPuPRgL9WzkyKAce/SRAI5PSAWWOjWeKDFYNYfpaFmVB8ywDqXdnW25u2LVl/XJ 1U2jeyYQ1lap77PVhtvRQ8Z5AtBKbrzQb+VE39IM6Yieh99JNDPHWeVxN8ceJCS/da e8HBT9m2E+noQ== 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 10/19] kbuild: rpm-pkg: derive the Version from %{KERNELRELEASE} Date: Sat, 22 Jul 2023 13:47:57 +0900 Message-Id: <20230722044806.3867434-10-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230722044806.3867434-1-masahiroy@kernel.org> References: <20230722044806.3867434-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1772096473303933814 X-GMAIL-MSGID: 1772096473303933814 Avoid hard-coding the Version field in the generated spec file. Signed-off-by: Masahiro Yamada --- scripts/package/mkspec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/package/mkspec b/scripts/package/mkspec index 22e290d23d8a..783e1997d94a 100755 --- a/scripts/package/mkspec +++ b/scripts/package/mkspec @@ -27,8 +27,6 @@ else M=DEL fi -__KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g") - # We can label the here-doc lines for conditional output to the spec file # # Labels: @@ -43,7 +41,7 @@ sed -e '/^DEL/d' -e 's/^\t*//' </dev/null || echo 1) License: GPL Group: System Environment/Kernel