summaryrefslogtreecommitdiff
path: root/multitech/recipes/linux/linux-2.6.35/linux-2.6.35-make-3.82.patch
diff options
context:
space:
mode:
Diffstat (limited to 'multitech/recipes/linux/linux-2.6.35/linux-2.6.35-make-3.82.patch')
-rw-r--r--multitech/recipes/linux/linux-2.6.35/linux-2.6.35-make-3.82.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/multitech/recipes/linux/linux-2.6.35/linux-2.6.35-make-3.82.patch b/multitech/recipes/linux/linux-2.6.35/linux-2.6.35-make-3.82.patch
new file mode 100644
index 0000000..f941220
--- /dev/null
+++ b/multitech/recipes/linux/linux-2.6.35/linux-2.6.35-make-3.82.patch
@@ -0,0 +1,44 @@
+commit 3c955b407a084810f57260d61548cc92c14bc627
+Author: Jan Beulich <JBeulich@novell.com>
+Date: Mon Aug 16 11:58:58 2010 +0100
+
+ 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>
+
+diff --git a/firmware/Makefile b/firmware/Makefile
+index 020e629..99955ed 100644
+--- a/firmware/Makefile
++++ b/firmware/Makefile
+@@ -142,7 +142,7 @@ fw-shipped-$(CONFIG_YAM) += yam/1200.bin yam/9600.bin
+ fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-)
+
+ # Directories which we _might_ need to create, so we have a rule for them.
+-firmware-dirs := $(sort $(patsubst %,$(objtree)/$(obj)/%/,$(dir $(fw-external-y) $(fw-shipped-all))))
++firmware-dirs := $(sort $(addprefix $(objtree)/$(obj)/,$(dir $(fw-external-y) $(fw-shipped-all))))
+
+ quiet_cmd_mkdir = MKDIR $(patsubst $(objtree)/%,%,$@)
+ cmd_mkdir = mkdir -p $@
+diff --git a/scripts/mkmakefile b/scripts/mkmakefile
+index 67d59c7..5325423 100644
+--- a/scripts/mkmakefile
++++ b/scripts/mkmakefile
+@@ -44,7 +44,9 @@ all:
+
+ Makefile:;
+
+-\$(all) %/: all
++\$(all): all
+ @:
+
++%/: all
++ @:
+ EOF