Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 3ce9e53e788881da0d5f3912f80e0dd6b501f304

Authored by Michal Marek
Committed by Linus Torvalds
1 parent 29bb4cc5e0
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

kbuild: Fix accidental revert in commit fe04ddf 

Commit fe04ddf7c291 ("kbuild: Do not package /boot and /lib in make
tar-pkg") accidentally reverted two previous kbuild commits.  I don't
know what I was thinking.

This brings back changes made by commits 24cc7fb69a5b ("x86/kbuild:
archscripts depends on scripts_basic") and c1c1a59e37da ("firmware: fix
directory creation rule matching with make 3.80")

Reported-by: Jan Beulich <JBeulich@suse.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 3 additions and 3 deletions Side-by-side Diff

... ... @@ -142,7 +142,7 @@
142 142 KBUILD_CFLAGS += $(mflags-y)
143 143 KBUILD_AFLAGS += $(mflags-y)
144 144  
145   -archscripts:
  145 +archscripts: scripts_basic
146 146 $(Q)$(MAKE) $(build)=arch/x86/tools relocs
147 147  
148 148 ###
scripts/Makefile.fwinst
Diff comments   View file @ 3ce9e53
... ... @@ -27,7 +27,7 @@
27 27 installed-mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(mod-fw))
28 28  
29 29 installed-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-all))
30   -installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/.
  30 +installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/./
31 31  
32 32 # Workaround for make < 3.81, where .SECONDEXPANSION doesn't work.
33 33 PHONY += $(INSTALL_FW_PATH)/$$(%) install-all-dirs
... ... @@ -42,7 +42,7 @@
42 42 $(installed-fw-dirs):
43 43 $(call cmd,mkdir)
44 44  
45   -$(installed-fw): $(INSTALL_FW_PATH)/%: $(obj)/% | $$(dir $(INSTALL_FW_PATH)/%)
  45 +$(installed-fw): $(INSTALL_FW_PATH)/%: $(obj)/% | $(INSTALL_FW_PATH)/$$(dir %)
46 46 $(call cmd,install)
47 47  
48 48 PHONY += __fw_install __fw_modinst FORCE