Skip to content

Commit 9a9c8ce

Browse files
committed
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
2 parents b42ed3b + deb4605 commit 9a9c8ce

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

scripts/Makefile.package

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ tar%-pkg: linux-$(KERNELRELEASE)-$(ARCH).tar.% FORCE
195195
.tmp_modules_cpio: FORCE
196196
$(Q)$(MAKE) -f $(srctree)/Makefile
197197
$(Q)rm -rf $@
198-
$(Q)$(MAKE) -f $(srctree)/Makefile INSTALL_MOD_PATH=$@ modules_install
198+
$(Q)$(MAKE) -f $(srctree)/Makefile INSTALL_MOD_PATH=$@/$(INSTALL_MOD_PATH) modules_install
199199

200200
quiet_cmd_cpio = CPIO $@
201201
cmd_cpio = $(CONFIG_SHELL) $(srctree)/usr/gen_initramfs.sh -o $@ $<
@@ -264,6 +264,7 @@ help:
264264
@echo ' tarxz-pkg - Build the kernel as a xz compressed tarball'
265265
@echo ' tarzst-pkg - Build the kernel as a zstd compressed tarball'
266266
@echo ' modules-cpio-pkg - Build the kernel modules as cpio archive'
267+
@echo ' (uses INSTALL_MOD_PATH inside the archive)'
267268
@echo ' perf-tar-src-pkg - Build the perf source tarball with no compression'
268269
@echo ' perf-targz-src-pkg - Build the perf source tarball with gzip compression'
269270
@echo ' perf-tarbz2-src-pkg - Build the perf source tarball with bz2 compression'

scripts/mod/modpost.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ static bool allow_missing_ns_imports;
5656

5757
static bool error_occurred;
5858

59-
static bool extra_warn;
59+
static bool extra_warn __attribute__((unused));
6060

6161
bool target_is_big_endian;
6262
bool host_is_big_endian;

0 commit comments

Comments
 (0)