linux-libc-headers: fix for Make 3.82

Fix the kernel Makefile for use with Make 3.82 by splitting mixed implicit and
normal rules into separate rules.

Signed-off-by: Joshua Lock <josh@linux.intel.com>

3 files changed, 42 insertions, 5 deletions

diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/connector-msg-size-fix.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/connector-msg-size-fix.patch
index 60072c7930..f26b99b092 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/connector-msg-size-fix.patch
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/connector-msg-size-fix.patch
@@ -14,8 +14,8 @@ Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
 
 Index: linux-2.6.34/include/linux/connector.h
 ===================================================================
---- linux-2.6.34.orig/include/linux/connector.h 2010-09-30 14:15:25.000000000 +0800
-+++ linux-2.6.34/include/linux/connector.h      2010-09-30 14:15:43.000000000 +0800
+--- linux-2.6.34.orig/include/linux/connector.h
++++ linux-2.6.34/include/linux/connector.h
 @@ -48,7 +48,7 @@
  /*
   * Maximum connector's message size.
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/make-382.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/make-382.patch
new file mode 100644
index 0000000000..5ffe2fedd3
--- /dev/null
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/make-382.patch
@@ -0,0 +1,36 @@
+Index: linux-2.6.34/arch/powerpc/Makefile
+===================================================================
+--- linux-2.6.34.orig/arch/powerpc/Makefile
++++ linux-2.6.34/arch/powerpc/Makefile
+@@ -158,9 +158,10 @@ drivers-$(CONFIG_OPROFILE) += arch/power
+ # Default to zImage, override when needed
+ all: zImage
+ 
+-BOOT_TARGETS = zImage zImage.initrd uImage zImage% dtbImage% treeImage.% cuImage.% simpleImage.%
++BOOT_TARGETS1 = zImage zImage.initrd uImage
++BOOT_TARGETS2 = zImage% dtbImage% treeImage.% cuImage.% simpleImage.%
+ 
+-PHONY += $(BOOT_TARGETS)
++PHONY += $(BOOT_TARGETS1) $(BOOT_TARGETS2)
+ 
+ boot := arch/$(ARCH)/boot
+ 
+@@ -175,10 +176,16 @@ relocs_check: arch/powerpc/relocs_check.
+ zImage: relocs_check
+ endif
+ 
+-$(BOOT_TARGETS): vmlinux
++$(BOOT_TARGETS1): vmlinux
+        $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
+ 
+-bootwrapper_install %.dtb:
++$(BOOT_TARGETS2): vmlinux
++       $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
++
++bootwrapper_install:
++       $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
++
++%.dtb:
+        $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
+ 
+ define archhelp
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.34.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.34.bb
index 685b70a4a8..d62fa832a8 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.34.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.34.bb
@@ -2,11 +2,12 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://hayes-gone.patch \
-           file://ppc_glibc_build_fix.patch \
-           file://connector-msg-size-fix.patch"
+            file://ppc_glibc_build_fix.patch \
+            file://make-382.patch \
+            file://connector-msg-size-fix.patch"
 
 S = "${WORKDIR}/linux-${PV}"