You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild changes from Michal Marek:
"The main part of kbuild for v3.7 contains:
- Fix for scripts/Makefile.modpost to not choke on a '.ko' substring
in the build directory path
- Two warning fixes (modpost and main Makefile)
- __compiletime_error works also with gcc 4.3
- make tar{gz,bz2,xz}-pkg uses default compression settings instead
of saving as many bytes as possible (this should actually be in the
misc branch, I don't know why I applied it here)."
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
compiler-gcc4.h: correct verion check for __compiletime_error
modpost: Permit .GCC.command.line sections
Kbuild: use normal compression settings for tar*-pkg
scripts/Makefile.modpost: error in finding modules from .mod files.
kbuild: Remove useless warning while appending KCFLAGS
This commit is contained in:
@@ -9,7 +9,7 @@ include scripts/Kbuild.include
|
||||
|
||||
#
|
||||
|
||||
__modules := $(sort $(shell grep -h '\.ko' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
|
||||
__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
|
||||
modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o)))
|
||||
|
||||
PHONY += $(modules)
|
||||
|
||||
@@ -60,7 +60,7 @@ kernelsymfile := $(objtree)/Module.symvers
|
||||
modulesymfile := $(firstword $(KBUILD_EXTMOD))/Module.symvers
|
||||
|
||||
# Step 1), find all modules listed in $(MODVERDIR)/
|
||||
__modules := $(sort $(shell grep -h '\.ko' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
|
||||
__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
|
||||
modules := $(patsubst %.o,%.ko, $(wildcard $(__modules:.ko=.o)))
|
||||
|
||||
# Stop after building .o files if NOFINAL is set. Makes compile tests quicker
|
||||
|
||||
@@ -821,6 +821,7 @@ static const char *section_white_list[] =
|
||||
".debug*",
|
||||
".zdebug*", /* Compressed debug sections. */
|
||||
".GCC-command-line", /* mn10300 */
|
||||
".GCC.command.line", /* record-gcc-switches, non mn10300 */
|
||||
".mdebug*", /* alpha, score, mips etc. */
|
||||
".pdr", /* alpha, score, mips etc. */
|
||||
".stab*",
|
||||
|
||||
@@ -28,15 +28,15 @@ case "${1}" in
|
||||
file_ext=""
|
||||
;;
|
||||
targz-pkg)
|
||||
compress="gzip -c9"
|
||||
compress="gzip"
|
||||
file_ext=".gz"
|
||||
;;
|
||||
tarbz2-pkg)
|
||||
compress="bzip2 -c9"
|
||||
compress="bzip2"
|
||||
file_ext=".bz2"
|
||||
;;
|
||||
tarxz-pkg)
|
||||
compress="xz -c9"
|
||||
compress="xz"
|
||||
file_ext=".xz"
|
||||
;;
|
||||
*)
|
||||
|
||||
Reference in New Issue
Block a user