From 824e315bb0ed56d726e136d76290dcf3810ad567 Mon Sep 17 00:00:00 2001 From: Dongjin Kim Date: Sat, 12 Jan 2019 22:21:03 -0500 Subject: [PATCH] Revert "Makefile: generate kernel_full in seperate command" This reverts commit 7c6adea43cba783a08ad911090c4293f35c29b9b. Change-Id: If46fc1c8183a20350a6e649599c7af771bcae752 --- Makefile | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index fde735db1533..cb64eba98b3c 100644 --- a/Makefile +++ b/Makefile @@ -410,8 +410,8 @@ KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds GCC_PLUGINS_CFLAGS := # Read KERNELRELEASE from include/config/kernel.release (if it exists) -KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) -KERNELRELEASE_FULL = $(shell cat include/config/kernel.release_full 2> /dev/null) +KERNELRELEASE = $(shell head -1 include/config/kernel.release 2> /dev/null) +KERNELRELEASE_FULL = $(shell tail -1 include/config/kernel.release 2> /dev/null) KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION) export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION @@ -1090,21 +1090,13 @@ $(vmlinux-dirs): prepare scripts $(Q)$(MAKE) $(build)=$@ define filechk_kernel.release - echo "$(KERNELVERSION)" + echo "$(KERNELVERSION)\n$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" endef -define filechk_kernel.release_full - echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" -endef - - # Store (new) KERNELRELEASE string in include/config/kernel.release include/config/kernel.release: include/config/auto.conf FORCE $(call filechk,kernel.release) -include/config/kernel.release_full: include/config/auto.conf FORCE - $(call filechk,kernel.release_full) - # Things we need to do before we recursively start building the kernel # or the modules are listed in "prepare". @@ -1118,7 +1110,7 @@ PHONY += prepare archprepare prepare0 prepare1 prepare2 prepare3 # prepare3 is used to check if we are building in a separate output directory, # and if so do: # 1) Check that make has not been executed in the kernel src $(srctree) -prepare3: include/config/kernel.release include/config/kernel.release_full +prepare3: include/config/kernel.release ifneq ($(KBUILD_SRC),) @$(kecho) ' Using $(srctree) as source for kernel' $(Q)if [ -f $(srctree)/.config -o -d $(srctree)/include/config ]; then \