Messages in this thread Patch in this message | | | From | Alexey Kardashevskiy <> | Subject | [PATCH kernel] kbuild: get rid of unwanted "+" when CONFIG_LOCALVERSION is set | Date | Wed, 20 Sep 2023 11:55:59 +1000 |
| |
The scripts/setlocalversion script correctly tries not adding "+" when CONFIG_LOCALVERSION is defined. However, instead of grepping for it (as it is done for CONFIG_LOCALVERSION_AUTO=y), it relies on LOCALVERSION set in the shell which is not.
Export LOCALVERSION so scripts/setlocalversion could see it and not add unwanted "+" at the end of the kernelrelease.
Signed-off-by: Alexey Kardashevskiy <aik@amd.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile index 57698d048e2c..fc45bed69790 100644 --- a/Makefile +++ b/Makefile @@ -368,7 +368,7 @@ include $(srctree)/scripts/Kbuild.include # Read KERNELRELEASE from include/config/kernel.release (if it exists) KERNELRELEASE = $(call read-file, include/config/kernel.release) KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION) -export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION +export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION LOCALVERSION include $(srctree)/scripts/subarch.include -- 2.41.0
| |