Commit e4cf7c25 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull Kbuild fixes from Masahiro Yamada:

 - Fix broken BuildID

 - Add srcrpm-pkg to the help message

 - Fix the option order for modpost built with musl libc

 - Fix the build dependency of rpm-pkg for openSUSE

* tag 'kbuild-fixes-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  fixdep: remove unneeded <stdarg.h> inclusion
  kbuild: sort single-targets alphabetically again
  kbuild: rpm-pkg: add libelf-devel as alternative for BuildRequires
  kbuild: Fix running modpost with musl libc
  kbuild: add a missing line for help message
  .gitignore: ignore *.rpm
  arch: fix broken BuildID for arm64 and riscv
  kconfig: Add static text for search information in help menu
parents e39d9b9f 6a5e25fc

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
*.o.*

*.patch

*.rmeta

*.rpm

*.rsi

*.s

*.so

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ no-compiler-targets := $(no-dot-config-targets) install dtbs_install \ 
			headers_install modules_install kernelrelease image_name

no-sync-config-targets := $(no-dot-config-targets) %install kernelrelease \

			  image_name

single-targets := %.a %.i %.rsi %.ko %.lds %.ll %.lst %.mod %.o %.s %.symtypes %/

single-targets := %.a %.i %.ko %.lds %.ll %.lst %.mod %.o %.rsi %.s %.symtypes %/



config-build	:=

mixed-build	:=

include/asm-generic/vmlinux.lds.h

+5 −0
Original line number Diff line number Diff line
@@ -891,7 +891,12 @@ 
#define PRINTK_INDEX

#endif



/*

 * Discard .note.GNU-stack, which is emitted as PROGBITS by the compiler.

 * Otherwise, the type of .notes section would become PROGBITS instead of NOTES.

 */

#define NOTES								\

	/DISCARD/ : { *(.note.GNU-stack) }				\

	.notes : AT(ADDR(.notes) - LOAD_OFFSET) {			\

		BOUNDED_SECTION_BY(.note.*, _notes)			\

	} NOTES_HEADERS							\

scripts/Makefile.modpost

+11 −11
Original line number Diff line number Diff line
@@ -55,6 +55,17 @@ ifneq ($(findstring i,$(filter-out --%,$(MAKEFLAGS))),) 
modpost-args += -n

endif



ifneq ($(KBUILD_MODPOST_WARN)$(missing-input),)

modpost-args += -w

endif



# Read out modules.order to pass in modpost.

# Otherwise, allmodconfig would fail with "Argument list too long".

ifdef KBUILD_MODULES

modpost-args += -T $(MODORDER)

modpost-deps += $(MODORDER)

endif



ifeq ($(KBUILD_EXTMOD),)



# Generate the list of in-tree objects in vmlinux
@@ -113,17 +124,6 @@ modpost-args += -e $(addprefix -i , $(KBUILD_EXTRA_SYMBOLS)) 


endif # ($(KBUILD_EXTMOD),)



ifneq ($(KBUILD_MODPOST_WARN)$(missing-input),)

modpost-args += -w

endif



ifdef KBUILD_MODULES

modpost-args += -T $(MODORDER)

modpost-deps += $(MODORDER)

endif



# Read out modules.order to pass in modpost.

# Otherwise, allmodconfig would fail with "Argument list too long".

quiet_cmd_modpost = MODPOST $@

      cmd_modpost = \

	$(if $(missing-input), \

scripts/Makefile.package

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ $(perf-tar-pkgs): 
PHONY += help

help:

	@echo '  rpm-pkg             - Build both source and binary RPM kernel packages'

	@echo '  srcrpm-pkg          - Build only the source kernel RPM package'

	@echo '  binrpm-pkg          - Build only the binary kernel RPM package'

	@echo '  deb-pkg             - Build both source and binary deb kernel packages'

	@echo '  bindeb-pkg          - Build only the binary kernel deb package'