Pull kbuild fixes from Michal Marek: "These are two fixes that should go into 3.6. The link-vmlinux.sh one is obvious. The other one fixes make firmware_install with certain configurations, where a file in the toplevel firmware tree gets installed first, and $(INSTALL_FW_PATH)/$$(dir <file>) results in /lib/firmware/./, which confuses make 3.82 for some reason." * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: firmware: fix directory creation rule matching with make 3.82 link-vmlinux.sh: Fix stray "echo" in error message
Showing the changes to scripts (2 of 2 files). Show all
Unified · Split
| @@ -42,7 +42,7 @@ quiet_cmd_install = INSTALL $(subst $(srctree)/,,$@) · 41 unmodified lines | ||
| 42 | 42 | $(installed-fw-dirs): |
| 43 | 43 | $(call cmd,mkdir) |
| 44 | 44 | |
| 45 | −$(installed-fw): $(INSTALL_FW_PATH)/%: $(obj)/% | $(INSTALL_FW_PATH)/$$(dir %) | |
| 45 | +$(installed-fw): $(INSTALL_FW_PATH)/%: $(obj)/% | $$(dir $(INSTALL_FW_PATH)/%) | |
| 46 | 46 | $(call cmd,install) |
| 47 | 47 | |
| 48 | 48 | PHONY += __fw_install __fw_modinst FORCE |
| @@ -211,7 +211,7 @@ if [ -n "${CONFIG_KALLSYMS}" ]; then · 210 unmodified lines | ||
| 211 | 211 | |
| 212 | 212 | if ! cmp -s System.map .tmp_System.map; then |
| 213 | 213 | echo >&2 Inconsistent kallsyms data |
| 214 | − echo >&2 echo Try "make KALLSYMS_EXTRA_PASS=1" as a workaround | |
| 214 | + echo >&2 Try "make KALLSYMS_EXTRA_PASS=1" as a workaround | |
| 215 | 215 | cleanup |
| 216 | 216 | exit 1 |
| 217 | 217 | fi |