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