Commit 9a9c8ce3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull Kbuild fixes from Nathan Chancellor:

 - Make modules-cpio-pkg respect INSTALL_MOD_PATH so that it can be
   used with distribution initramfs files that have a merged /usr,
   such as Fedora

 - Silence an instance of -Wunused-but-set-global, a strengthening
   of -Wunused-but-set-variable in tip of tree Clang, in modpost,
   as the variable for extra warnings is currently unused

* tag 'kbuild-fixes-7.0-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux:
  modpost: Declare extra_warn with unused attribute
  kbuild: modules-cpio-pkg: Respect INSTALL_MOD_PATH
parents b42ed3bb deb46056

scripts/Makefile.package

+2 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ tar%-pkg: linux-$(KERNELRELEASE)-$(ARCH).tar.% FORCE 
.tmp_modules_cpio: FORCE

	$(Q)$(MAKE) -f $(srctree)/Makefile

	$(Q)rm -rf $@

	$(Q)$(MAKE) -f $(srctree)/Makefile INSTALL_MOD_PATH=$@ modules_install

	$(Q)$(MAKE) -f $(srctree)/Makefile INSTALL_MOD_PATH=$@/$(INSTALL_MOD_PATH) modules_install



quiet_cmd_cpio = CPIO    $@

      cmd_cpio = $(CONFIG_SHELL) $(srctree)/usr/gen_initramfs.sh -o $@ $<
@@ -264,6 +264,7 @@ help: 
	@echo '  tarxz-pkg           - Build the kernel as a xz compressed tarball'

	@echo '  tarzst-pkg          - Build the kernel as a zstd compressed tarball'

	@echo '  modules-cpio-pkg    - Build the kernel modules as cpio archive'

	@echo '                        (uses INSTALL_MOD_PATH inside the archive)'

	@echo '  perf-tar-src-pkg    - Build the perf source tarball with no compression'

	@echo '  perf-targz-src-pkg  - Build the perf source tarball with gzip compression'

	@echo '  perf-tarbz2-src-pkg - Build the perf source tarball with bz2 compression'

scripts/mod/modpost.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static bool allow_missing_ns_imports; 


static bool error_occurred;



static bool extra_warn;

static bool extra_warn __attribute__((unused));



bool target_is_big_endian;

bool host_is_big_endian;