Commit ec31f868 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

setlocalversion: absorb $(KERNELVERSION) 



Print $(KERNELVERSION) in setlocalversion so that the callers get
simpler.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 75280bdf

Makefile

+2 −3
Original line number Diff line number Diff line
@@ -1258,8 +1258,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
@@ -2124,7 +2123,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)

scripts/setlocalversion

+6 −1
Original line number Diff line number Diff line
@@ -102,6 +102,11 @@ if ! test -e include/config/auto.conf; then 
	exit 1

fi



if [ -z "${KERNELVERSION}" ]; then

	echo "KERNELVERSION is not set" >&2

	exit 1

fi



# localversion* files in the build and source directory

res="$(collect_files localversion*)"

if test ! "$srctree" -ef .; then
@@ -127,4 +132,4 @@ elif [ "${LOCALVERSION+set}" != "set" ]; then 
	res="$res$(scm_version --short)"

fi



echo "$res"
 
echo "${KERNELVERSION}${res}"