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