Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2024-12-28 16:53:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

setlocalversion: absorb $(KERNELVERSION)

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

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Masahiro Yamada 2023-01-22 23:14:25 +09:00
parent 75280bdf49
commit ec31f868ec
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -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)

7
scripts/setlocalversion
View File

@ -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}"