Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 3c955b407a084810f57260d61548cc92c14bc627

Authored by Jan Beulich
Committed by Michal Marek
1 parent 3643f849d7
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

fixes for using make 3.82 

It doesn't like pattern and explicit rules to be on the same line,
and it seems to be more picky when matching file (or really directory)
names with different numbers of trailing slashes.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Andrew Benton <b3nton@gmail.com>
Cc: <stable@kernel.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>

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

... ... @@ -142,7 +142,7 @@
142 142 fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-)
143 143  
144 144 # Directories which we _might_ need to create, so we have a rule for them.
145   -firmware-dirs := $(sort $(patsubst %,$(objtree)/$(obj)/%/,$(dir $(fw-external-y) $(fw-shipped-all))))
  145 +firmware-dirs := $(sort $(addprefix $(objtree)/$(obj)/,$(dir $(fw-external-y) $(fw-shipped-all))))
146 146  
147 147 quiet_cmd_mkdir = MKDIR $(patsubst $(objtree)/%,%,$@)
148 148 cmd_mkdir = mkdir -p $@
... ... @@ -44,8 +44,10 @@
44 44  
45 45 Makefile:;
46 46  
47   -\$(all) %/: all
  47 +\$(all): all
48 48 @:
49 49  
  50 +%/: all
  51 + @:
50 52 EOF