Commit 83cd5fd0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v6.2-3' of... 

Merge tag 'kbuild-fixes-v6.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada:

 - Hide LDFLAGS_vmlinux from decompressor Makefiles to fix error
   messages when GNU Make 4.4 is used.

 - Fix 'make modules' build error when CONFIG_DEBUG_INFO_BTF_MODULES=y.

 - Fix warnings emitted by GNU Make 4.4 in scripts/kconfig/Makefile.

 - Support GNU Make 4.4 for scripts/jobserver-exec.

 - Show clearer error message when kernel/gen_kheaders.sh fails due to
   missing cpio.

* tag 'kbuild-fixes-v6.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kheaders: explicitly validate existence of cpio command
  scripts: support GNU make 4.4 in jobserver-exec
  kconfig: Update all declared targets
  scripts: rpm: make clear that mkspec script contains 4.13 feature
  init/Kconfig: fix LOCALVERSION_AUTO help text
  kbuild: fix 'make modules' error when CONFIG_DEBUG_INFO_BTF_MODULES=y
  kbuild: export top-level LDFLAGS_vmlinux only to scripts/Makefile.vmlinux
  init/version-timestamp.c: remove unneeded #include <linux/version.h>
  docs: kbuild: remove mention to dropped $(objtree) feature
parents f3bbac32 13e1df09

Documentation/kbuild/makefiles.rst

+1 −1
Original line number Diff line number Diff line
@@ -1042,7 +1042,7 @@ $(clean-files). 


When executing "make clean", the file "crc32table.h" will be deleted.

Kbuild will assume files to be in the same relative directory as the

Makefile, except if prefixed with $(objtree).

Makefile.



To exclude certain files or directories from make clean, use the

$(no-clean-files) variable.

Makefile

+14 −1
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ LDFLAGS_MODULE = 
CFLAGS_KERNEL	=

RUSTFLAGS_KERNEL =

AFLAGS_KERNEL	=

export LDFLAGS_vmlinux =

LDFLAGS_vmlinux =



# Use USERINCLUDE when you must reference the UAPI directories only.

USERINCLUDE    := \
@@ -1248,6 +1248,18 @@ vmlinux.o modules.builtin.modinfo modules.builtin: vmlinux_o 
	@:



PHONY += vmlinux

# LDFLAGS_vmlinux in the top Makefile defines linker flags for the top vmlinux,

# not for decompressors. LDFLAGS_vmlinux in arch/*/boot/compressed/Makefile is

# unrelated; the decompressors just happen to have the same base name,

# arch/*/boot/compressed/vmlinux.

# Export LDFLAGS_vmlinux only to scripts/Makefile.vmlinux.

#

# _LDFLAGS_vmlinux is a workaround for the 'private export' bug:

#   https://savannah.gnu.org/bugs/?61463

# For Make > 4.4, the following simple code will work:

#  vmlinux: private export LDFLAGS_vmlinux := $(LDFLAGS_vmlinux)

vmlinux: private _LDFLAGS_vmlinux := $(LDFLAGS_vmlinux)

vmlinux: export LDFLAGS_vmlinux = $(_LDFLAGS_vmlinux)

vmlinux: vmlinux.o $(KBUILD_LDS) modpost

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.vmlinux
@@ -1533,6 +1545,7 @@ endif 
# *.ko are usually independent of vmlinux, but CONFIG_DEBUG_INFOBTF_MODULES

# is an exception.

ifdef CONFIG_DEBUG_INFO_BTF_MODULES

KBUILD_BUILTIN := 1

modules: vmlinux

endif

init/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ config LOCALVERSION_AUTO 
	  appended after any matching localversion* files, and after the value

	  set in CONFIG_LOCALVERSION.



	  (The actual string used here is the first eight characters produced

	  (The actual string used here is the first 12 characters produced

	  by running the command:



	    $ git rev-parse --verify HEAD

init/version-timestamp.c

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 


#include <generated/compile.h>

#include <generated/utsrelease.h>

#include <linux/version.h>

#include <linux/proc_ns.h>

#include <linux/refcount.h>

#include <linux/uts.h>

kernel/gen_kheaders.sh

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ include/ 
arch/$SRCARCH/include/

"



type cpio > /dev/null



# Support incremental builds by skipping archive generation

# if timestamps of files being archived are not changed.