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

Merge tag 'kbuild-fixes-v6.1-4' of... 

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

Pull Kbuild fixes from Masahiro Yamada:

 - Fix CC_HAS_ASM_GOTO_TIED_OUTPUT test in Kconfig

 - Fix noisy "No such file or directory" message when
   KBUILD_BUILD_VERSION is passed

 - Include rust/ in source tarballs

 - Fix missing FORCE for ARCH=nios2 builds

* tag 'kbuild-fixes-v6.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  nios2: add FORCE for vmlinuz.gz
  scripts: add rust in scripts/Makefile.package
  kbuild: fix "cat: .version: No such file or directory"
  init/Kconfig: fix CC_HAS_ASM_GOTO_TIED_OUTPUT test with dash
parents e5f3ec38 869e4ae4

arch/microblaze/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -67,12 +67,12 @@ linux.bin.ub linux.bin.gz: linux.bin 
linux.bin: vmlinux

linux.bin linux.bin.gz linux.bin.ub:

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@

	@echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')'

	@echo 'Kernel: $(boot)/$@ is ready' ' (#'$(or $(KBUILD_BUILD_VERSION),`cat .version`)')'



PHONY += simpleImage.$(DTB)

simpleImage.$(DTB): vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(addprefix $(boot)/$@., ub unstrip strip)

	@echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')'

	@echo 'Kernel: $(boot)/$@ is ready' ' (#'$(or $(KBUILD_BUILD_VERSION),`cat .version`)')'



define archhelp

  echo '* linux.bin    - Create raw binary'

arch/nios2/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ $(obj)/vmlinux.bin: vmlinux FORCE 
$(obj)/vmlinux.gz: $(obj)/vmlinux.bin FORCE

	$(call if_changed,gzip)



$(obj)/vmImage: $(obj)/vmlinux.gz

$(obj)/vmImage: $(obj)/vmlinux.gz FORCE

	$(call if_changed,uimage)

	@$(kecho) 'Kernel: $@ is ready'

arch/x86/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ cmd_image = $(obj)/tools/build $(obj)/setup.bin $(obj)/vmlinux.bin \ 


$(obj)/bzImage: $(obj)/setup.bin $(obj)/vmlinux.bin $(obj)/tools/build FORCE

	$(call if_changed,image)

	@$(kecho) 'Kernel: $@ is ready' ' (#'`cat .version`')'

	@$(kecho) 'Kernel: $@ is ready' ' (#'$(or $(KBUILD_BUILD_VERSION),`cat .version`)')'



OBJCOPYFLAGS_vmlinux.bin := -O binary -R .note -R .comment -S

$(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE

init/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ config CC_HAS_ASM_GOTO_OUTPUT 
config CC_HAS_ASM_GOTO_TIED_OUTPUT

	depends on CC_HAS_ASM_GOTO_OUTPUT

	# Detect buggy gcc and clang, fixed in gcc-11 clang-14.

	def_bool $(success,echo 'int foo(int *x) { asm goto (".long (%l[bar]) - .\n": "+m"(*x) ::: bar); return *x; bar: return 0; }' | $CC -x c - -c -o /dev/null)

	def_bool $(success,echo 'int foo(int *x) { asm goto (".long (%l[bar]) - .": "+m"(*x) ::: bar); return *x; bar: return 0; }' | $CC -x c - -c -o /dev/null)



config TOOLS_SUPPORT_RELR

	def_bool $(success,env "CC=$(CC)" "LD=$(LD)" "NM=$(NM)" "OBJCOPY=$(OBJCOPY)" $(srctree)/scripts/tools-support-relr.sh)

scripts/Makefile.package

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ KBUILD_PKG_ROOTCMD ?="fakeroot -u" 
export KDEB_SOURCENAME

# Include only those top-level files that are needed by make, plus the GPL copy

TAR_CONTENT := Documentation LICENSES arch block certs crypto drivers fs \

               include init io_uring ipc kernel lib mm net samples scripts \

               security sound tools usr virt \

               include init io_uring ipc kernel lib mm net rust \

               samples scripts security sound tools usr virt \

               .config .scmversion Makefile \

               Kbuild Kconfig COPYING $(wildcard localversion*)

MKSPEC     := $(srctree)/scripts/package/mkspec