From patchwork Fri Jan 27 16:19:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 49486 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp920751wrn; Fri, 27 Jan 2023 08:25:09 -0800 (PST) X-Google-Smtp-Source: AMrXdXvVRB8kflkHprP9PUL7993H/FNnB5FYqAVvrdvS/duhQxR0/ohXf0Wb3qTaQXPFi7VbKxTG X-Received: by 2002:a17:906:edac:b0:844:1d1d:f7 with SMTP id sa12-20020a170906edac00b008441d1d00f7mr43660565ejb.23.1674836708900; Fri, 27 Jan 2023 08:25:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674836708; cv=none; d=google.com; s=arc-20160816; b=f9SMnQPbM5vIN8e7W6CNkHD3jWy1c2WPRI4clEWUwlEqliq8n7oZEQlYMRB2alMFKV 2WLGIt714DAVporZbgZ6Pdt8LDyof8J337dmH1jYlfB3iYh64GLUYU32MXSEH6JGUey4 E2WXE6VXsw62ThhwQzXy4JWCqh1q8oc2gwsKonRT9vfjK6F/XpkFXLCkmCZ88J5omwV+ 7ij1buG4usFCbFCnZ0F2qBkMuTVISbUq8sn6O+jpT15y13d60D4yjJUHGKlCNxLS20Ku H0n0OWsh+1gC50cdAbLGQeRL7c8rkEuPLs4hwSxnHIpzA5yhoN3tDYTraUZCSE6KCTE2 e3yA== 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=KO1YBf4iz+cN2FVBei14vPCdlYj7w14RTB2U+gr3OZM=; b=qNi81qMkbxofho2kfJRq72iiHVqsO0KH95O9TGwPT3SO9ROTh7gy08vNzXLNOukDBk eXu0qDx7LB2WgMd0gJG6iEjQ9Gia7eSGbQZmJblBCntc+GCumrcM0r2Q/+VxLAywxyD1 VzLnDB8qwTcAAz03PDXvEHmzWfQ+q1VaBD6tDzK7c53ah6G7P9ntuF8yyiPNsvkJhu2S srEwHZYWze4Ua/xdwaH1prCpWTGgGHBcglFAw+r4xPMBhK8nRQHq3VR2x7bOIXZJ5s1/ LMkIKtUXUaINvuRePghgowbRr4MVSRYDlMDEJQy/yh4Gzoe9+e8Gzx47eYIM1v80POqz 7sKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=t7xEkFKO; 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 j13-20020a170906104d00b008697a71e4e9si5707267ejj.941.2023.01.27.08.24.46; Fri, 27 Jan 2023 08:25:08 -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=t7xEkFKO; 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 S234741AbjA0QUB (ORCPT + 99 others); Fri, 27 Jan 2023 11:20:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234174AbjA0QT7 (ORCPT ); Fri, 27 Jan 2023 11:19:59 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94209AD17; Fri, 27 Jan 2023 08:19:58 -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 2F30261CC3; Fri, 27 Jan 2023 16:19:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1D360C433EF; Fri, 27 Jan 2023 16:19:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674836397; bh=dWkUXrk0g8ak0BjqJ52KwIBrpaKr1aFEKuCxJYYFurI=; h=From:To:Cc:Subject:Date:From; b=t7xEkFKOfRPsnN5oKe3OF1cn9OhAJNwfDcM7cj1tjE1WBrPQ775VJ33ZDoJNKcyAA 2V3sAhAq5z61UBLNFKR91E8oYX47DUOb8lukaG2yV+UmJtrLSOF7XQ3ajeiIZopY2n DeuUmfr1Hcl2DD/zTAXwtoG/pzk6Rd4kyqp/cTa5BIWa8BJa3r9EFPkQqNQ0Mdeh3p ueBP6QLSk4PZp8AO4ImuDE6DIJhGKYLd7ZWsXF/ynUeEY0IctBAQE6KlHWK/4xdcgH if/0alOp1fDItKnLt5FsNPM4bmGDOodR0R59PJWkjuymV3ciGne4Z0NDKkQuYlYf6Z BOrDUWCm74JQQ== 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] kbuild: save overridden KERNELRELEASE in include/config/kernel.release Date: Sat, 28 Jan 2023 01:19:42 +0900 Message-Id: <20230127161942.543483-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?1756193576905209077?= X-GMAIL-MSGID: =?utf-8?q?1756193576905209077?= ${KERNELRELEASE} is used as a part of the installation path. (INSTALL_DTBS_PATH, MODLIB, etc.) When KERNELRELEASE is overridden from the command line, it should be saved in include/config/kernel.release, so that it will be consistently used for the installation steps. Signed-off-by: Masahiro Yamada --- This patch will replace the buggy https://lore.kernel.org/linux-kbuild/20230122141428.115372-6-masahiroy@kernel.org/T/#u Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 203b86e95197..aeea900eff71 100644 --- a/Makefile +++ b/Makefile @@ -1258,7 +1258,11 @@ vmlinux: vmlinux.o $(KBUILD_LDS) modpost # make sure no implicit rule kicks in $(sort $(KBUILD_LDS) $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS)): . ; +ifeq ($(origin KERNELRELEASE),file) filechk_kernel.release = $(srctree)/scripts/setlocalversion $(srctree) +else +filechk_kernel.release = echo $(KERNELRELEASE) +endif # Store (new) KERNELRELEASE string in include/config/kernel.release include/config/kernel.release: FORCE