Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd12ce8c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

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
parents 80de7c31 6c7080a6

scripts/Makefile.fwinst

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ quiet_cmd_install = INSTALL $(subst $(srctree)/,,$@) 
$(installed-fw-dirs):

	$(call cmd,mkdir)



$(installed-fw): $(INSTALL_FW_PATH)/%: $(obj)/% | $(INSTALL_FW_PATH)/$$(dir %)

$(installed-fw): $(INSTALL_FW_PATH)/%: $(obj)/% | $$(dir $(INSTALL_FW_PATH)/%)

	$(call cmd,install)



PHONY +=  __fw_install __fw_modinst FORCE

scripts/link-vmlinux.sh

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ if [ -n "${CONFIG_KALLSYMS}" ]; then 


	if ! cmp -s System.map .tmp_System.map; then

		echo >&2 Inconsistent kallsyms data

		echo >&2 echo Try "make KALLSYMS_EXTRA_PASS=1" as a workaround

		echo >&2 Try "make KALLSYMS_EXTRA_PASS=1" as a workaround

		cleanup

		exit 1

	fi