From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 24 Aug 2010 17:40:56 +0000 (-0700)
Subject: .27 patches
X-Git-Tag: v2.6.32.21~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eddf5e0f3562a20378841a31dd6adbfc5ec016d6;p=thirdparty%2Fkernel%2Fstable-queue.git

.27 patches
---

diff --git a/queue-2.6.27/fixes-for-using-make-3.82.patch b/queue-2.6.27/fixes-for-using-make-3.82.patch
new file mode 100644
index 00000000000..337b0f14eae
--- /dev/null
+++ b/queue-2.6.27/fixes-for-using-make-3.82.patch
@@ -0,0 +1,48 @@
+From 3c955b407a084810f57260d61548cc92c14bc627 Mon Sep 17 00:00:00 2001
+From: Jan Beulich <JBeulich@novell.com>
+Date: Mon, 16 Aug 2010 11:58:58 +0100
+Subject: fixes for using make 3.82
+
+From: Jan Beulich <JBeulich@novell.com>
+
+commit 3c955b407a084810f57260d61548cc92c14bc627 upstream.
+
+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>
+Signed-off-by: Michal Marek <mmarek@suse.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ firmware/Makefile  |    2 +-
+ scripts/mkmakefile |    4 +++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+--- a/firmware/Makefile
++++ b/firmware/Makefile
+@@ -75,7 +75,7 @@ fw-shipped-$(CONFIG_VIDEO_CPIA2) += cpia
+ 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 $@
+--- a/scripts/mkmakefile
++++ b/scripts/mkmakefile
+@@ -42,7 +42,9 @@ all:
+ 
+ Makefile:;
+ 
+-\$(all) %/: all
++\$(all): all
+ 	@:
+ 
++%/: all
++	@:
+ EOF
diff --git a/queue-2.6.27/series b/queue-2.6.27/series
index 1102d0cd48c..2af48da3961 100644
--- a/queue-2.6.27/series
+++ b/queue-2.6.27/series
@@ -2,3 +2,4 @@ arm-tighten-check-for-allowable-cpsr-values.patch
 kbuild-fix-make-incompatibility.patch
 selinux-use-default-proc-sid-on-symlinks.patch
 can-add-limit-for-nframes-and-clean-up-signed-unsigned-variables.patch
+fixes-for-using-make-3.82.patch