From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 15 Oct 2012 21:22:47 +0000 (-0700)
Subject: 3.6-stable patches
X-Git-Tag: v3.0.47~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9121ca92431a791145c6f21a95e1f2ac3a28b6e2;p=thirdparty%2Fkernel%2Fstable-queue.git

3.6-stable patches

added patches:
	kbuild-fix-accidental-revert-in-commit-fe04ddf.patch
---

diff --git a/queue-3.6/kbuild-fix-accidental-revert-in-commit-fe04ddf.patch b/queue-3.6/kbuild-fix-accidental-revert-in-commit-fe04ddf.patch
new file mode 100644
index 00000000000..8406418dbd9
--- /dev/null
+++ b/queue-3.6/kbuild-fix-accidental-revert-in-commit-fe04ddf.patch
@@ -0,0 +1,58 @@
+From 3ce9e53e788881da0d5f3912f80e0dd6b501f304 Mon Sep 17 00:00:00 2001
+From: Michal Marek <mmarek@suse.cz>
+Date: Mon, 15 Oct 2012 21:16:56 +0200
+Subject: kbuild: Fix accidental revert in commit fe04ddf
+
+From: Michal Marek <mmarek@suse.cz>
+
+commit 3ce9e53e788881da0d5f3912f80e0dd6b501f304 upstream.
+
+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>
+Signed-off-by: Michal Marek <mmarek@suse.cz>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/Makefile       |    2 +-
+ scripts/Makefile.fwinst |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/arch/x86/Makefile
++++ b/arch/x86/Makefile
+@@ -142,7 +142,7 @@ KBUILD_CFLAGS += $(call cc-option,-mno-a
+ KBUILD_CFLAGS += $(mflags-y)
+ KBUILD_AFLAGS += $(mflags-y)
+ 
+-archscripts:
++archscripts: scripts_basic
+ 	$(Q)$(MAKE) $(build)=arch/x86/tools relocs
+ 
+ ###
+--- a/scripts/Makefile.fwinst
++++ b/scripts/Makefile.fwinst
+@@ -27,7 +27,7 @@ endif
+ installed-mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(mod-fw))
+ 
+ installed-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-all))
+-installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/.
++installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/./
+ 
+ # Workaround for make < 3.81, where .SECONDEXPANSION doesn't work.
+ PHONY += $(INSTALL_FW_PATH)/$$(%) install-all-dirs
+@@ -42,7 +42,7 @@ quiet_cmd_install = INSTALL $(subst $(sr
+ $(installed-fw-dirs):
+ 	$(call cmd,mkdir)
+ 
+-$(installed-fw): $(INSTALL_FW_PATH)/%: $(obj)/% | $$(dir $(INSTALL_FW_PATH)/%)
++$(installed-fw): $(INSTALL_FW_PATH)/%: $(obj)/% | $(INSTALL_FW_PATH)/$$(dir %)
+ 	$(call cmd,install)
+ 
+ PHONY +=  __fw_install __fw_modinst FORCE
diff --git a/queue-3.6/series b/queue-3.6/series
index 700de2dd0a7..264b4ab5a91 100644
--- a/queue-3.6/series
+++ b/queue-3.6/series
@@ -50,3 +50,4 @@ md-raid10-use-correct-limit-variable.patch
 kdb-vt_console-fix-missed-data-due-to-pager-overruns.patch
 pktgen-fix-crash-when-generating-ipv6-packets.patch
 mips-ath79-fix-cpu-ddr-frequency-calculation-for-srif-plls.patch
+kbuild-fix-accidental-revert-in-commit-fe04ddf.patch