diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-27 15:25:47 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-27 15:25:47 -0500 |
commit | 0ca7ffb356063c5ece847687da457dfe748612a2 (patch) | |
tree | f7858236ba482814c8cacf45447a3f96548a1688 /kernel/Makefile | |
parent | 30acd906b02470e7eb346401de966a33864d9af4 (diff) | |
parent | 423a8155facf23719078ff63911c1e85ba40970b (diff) |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild changes from Michal Marek:
- Alias generation in modpost is cross-compile safe.
- kernel/timeconst.h is now generated using a bc script instead of
perl.
- scripts/link-vmlinux.sh now works with an alternative
$KCONFIG_CONFIG.
- destination-y for exported headers is supported in Kbuild files
again.
- depmod is called with -P $CONFIG_SYMBOL_PREFIX on architectures that
need it.
- CONFIG_DEBUG_INFO_REDUCED disables var-tracking
- scripts/setlocalversion works with too much translated locales ;)
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
kbuild: Fix reading of .config in link-vmlinux.sh
kbuild: Unset language specific variables in setlocalversion script
Kbuild: Disable var tracking with CONFIG_DEBUG_INFO_REDUCED
depmod: pass -P $CONFIG_SYMBOL_PREFIX
kbuild: Fix destination-y for installed headers
scripts/link-vmlinux.sh: source variables from KCONFIG_CONFIG
kernel: Replace timeconst.pl with a bc script
mod/file2alias: make modalias generation safe for cross compiling
Diffstat (limited to 'kernel/Makefile')
-rw-r--r-- | kernel/Makefile | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index eceac38f3c65..05949c0510c5 100644 --- a/kernel/Makefile +++ b/kernel/Makefile | |||
@@ -127,11 +127,19 @@ $(obj)/config_data.h: $(obj)/config_data.gz FORCE | |||
127 | 127 | ||
128 | $(obj)/time.o: $(obj)/timeconst.h | 128 | $(obj)/time.o: $(obj)/timeconst.h |
129 | 129 | ||
130 | quiet_cmd_timeconst = TIMEC $@ | 130 | quiet_cmd_hzfile = HZFILE $@ |
131 | cmd_timeconst = $(PERL) $< $(CONFIG_HZ) > $@ | 131 | cmd_hzfile = echo "hz=$(CONFIG_HZ)" > $@ |
132 | |||
133 | targets += hz.bc | ||
134 | $(obj)/hz.bc: $(objtree)/include/config/hz.h FORCE | ||
135 | $(call if_changed,hzfile) | ||
136 | |||
137 | quiet_cmd_bc = BC $@ | ||
138 | cmd_bc = bc -q $(filter-out FORCE,$^) > $@ | ||
139 | |||
132 | targets += timeconst.h | 140 | targets += timeconst.h |
133 | $(obj)/timeconst.h: $(src)/timeconst.pl FORCE | 141 | $(obj)/timeconst.h: $(obj)/hz.bc $(src)/timeconst.bc FORCE |
134 | $(call if_changed,timeconst) | 142 | $(call if_changed,bc) |
135 | 143 | ||
136 | ifeq ($(CONFIG_MODULE_SIG),y) | 144 | ifeq ($(CONFIG_MODULE_SIG),y) |
137 | # | 145 | # |