Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d183e6f5 authored by David Howells's avatar David Howells
Browse files

UAPI: Move linux/version.h 



Move include/linux/version.h to the include/generated/ header directory.
A later patch will move it to include/uapi/generated/.

This allows us to get rid of the objhdr-y list.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: default avatarDave Jones <davej@redhat.com>
parent 494b3e1c

Makefile

+7 −6
Original line number Original line Diff line number Diff line
@@ -447,9 +447,11 @@ asm-generic: 
# Detect when mixed targets is specified, and make a second invocation

# Detect when mixed targets is specified, and make a second invocation

# of make so .config is not included in this case either (for *config).

# of make so .config is not included in this case either (for *config).





version_h := include/generated/linux/version.h



no-dot-config-targets := clean mrproper distclean \

no-dot-config-targets := clean mrproper distclean \

			 cscope gtags TAGS tags help %docs check% coccicheck \

			 cscope gtags TAGS tags help %docs check% coccicheck \

			 include/linux/version.h headers_% archheaders archscripts \

			 $(version_h) headers_% archheaders archscripts \

			 kernelversion %src-pkg

			 kernelversion %src-pkg





config-targets := 0

config-targets := 0
@@ -819,7 +821,7 @@ endif 
# prepare2 creates a makefile if using a separate output directory

# prepare2 creates a makefile if using a separate output directory

prepare2: prepare3 outputmakefile asm-generic

prepare2: prepare3 outputmakefile asm-generic





prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \

prepare1: prepare2 $(version_h) include/generated/utsrelease.h \

                   include/config/auto.conf

                   include/config/auto.conf

	$(cmd_crmodverdir)

	$(cmd_crmodverdir)
@@ -852,7 +854,7 @@ define filechk_version.h 
	echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';)

	echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';)

endef

endef





include/linux/version.h: $(srctree)/Makefile FORCE

$(version_h): $(srctree)/Makefile FORCE

	$(call filechk,version.h)

	$(call filechk,version.h)





include/generated/utsrelease.h: include/config/kernel.release FORCE

include/generated/utsrelease.h: include/config/kernel.release FORCE
@@ -897,7 +899,7 @@ PHONY += archscripts 
archscripts:

archscripts:





PHONY += __headers

PHONY += __headers

__headers: include/linux/version.h scripts_basic asm-generic archheaders archscripts FORCE

__headers: $(version_h) scripts_basic asm-generic archheaders archscripts FORCE

	$(Q)$(MAKE) $(build)=scripts build_unifdef

	$(Q)$(MAKE) $(build)=scripts build_unifdef





PHONY += headers_install_all

PHONY += headers_install_all
@@ -1007,8 +1009,7 @@ CLEAN_DIRS += $(MODVERDIR) 
# Directories & files removed with 'make mrproper'

# Directories & files removed with 'make mrproper'

MRPROPER_DIRS  += include/config usr/include include/generated          \

MRPROPER_DIRS  += include/config usr/include include/generated          \

                  arch/*/include/generated

                  arch/*/include/generated

MRPROPER_FILES += .config .config.old .version .old_version             \

MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \

                  include/linux/version.h                               \

		  Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS

		  Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS





# clean - Delete most, but leave enough to build external modules

# clean - Delete most, but leave enough to build external modules

include/linux/Kbuild

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ header-y += netfilter_ipv6/ 
header-y += usb/

header-y += usb/

header-y += wimax/

header-y += wimax/





objhdr-y += version.h

genhdr-y += version.h





ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \

ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \

		  $(srctree)/include/asm-$(SRCARCH)/a.out.h \

		  $(srctree)/include/asm-$(SRCARCH)/a.out.h \