Makefile: fix usage of kernelrelease with M=foo

Makefile: fix usage of kernelrelease with M=foo

[nvidia]

Commit 1cb86b6c3136 ("kbuild: save overridden KERNELRELEASE in
include/config/kernel.release") set the command that is used for
printing the output of kernelrelease only when KBUILD_EXTMOD is not set.

Test:

make M=$PWD -s kernelversion
make M=$PWD -s kernelrelease

Should print both. Prints only kernelversion and an empty line for
kernelrelease. Included a simple patch that fixes this test.

[PATCH] Makefile: Make kernelrelease target work with M=

[nvidia]

From: Tzafrir Cohen <nvidia@cohens.org.il>

Fixes: commit 1cb86b6c3136 ("kbuild: save overridden KERNELRELEASE in include/config/kernel.release")

That commit required the use of filechk_kernel.release for the
kernelrelease Makefile target. It is currently only being set when
KBUILD_EXTMOD is not set. Make sure it is set in that case as well.

Signed-off-by: Tzafrir Cohen <nvidia@cohens.org.il>
---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index 3e7f96f12f08..e0859c608147 100644
--- a/Makefile
+++ b/Makefile
@@ -1880,6 +1880,8 @@ endif
 
 else # KBUILD_EXTMOD
 
+filechk_kernel.release = echo $(KERNELRELEASE)
+
 ###
 # External module support.
 # When building external modules the kernel used as basis is considered
-- 
2.39.2

Re: [PATCH] Makefile: Make kernelrelease target work with M=

[Masahiro Yamada]

On Tue, Mar 14, 2023 at 10:04 PM <nvidia@cohens.org.il> wrote:
>
> From: Tzafrir Cohen <nvidia@cohens.org.il>
>
> Fixes: commit 1cb86b6c3136 ("kbuild: save overridden KERNELRELEASE in include/config/kernel.release")
>
> That commit required the use of filechk_kernel.release for the
> kernelrelease Makefile target. It is currently only being set when
> KBUILD_EXTMOD is not set. Make sure it is set in that case as well.
>
> Signed-off-by: Tzafrir Cohen <nvidia@cohens.org.il>


Applied to linux-kbuild/fixes. Thanks.

> ---
>  Makefile | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/Makefile b/Makefile
> index 3e7f96f12f08..e0859c608147 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1880,6 +1880,8 @@ endif
>
>  else # KBUILD_EXTMOD
>
> +filechk_kernel.release = echo $(KERNELRELEASE)
> +
>  ###
>  # External module support.
>  # When building external modules the kernel used as basis is considered
> --
> 2.39.2
>


-- 
Best Regards
Masahiro Yamada