linux-kexecboot-2.6.26, linux-rp-2.6.26: Fix Makefile rules to be compatible with...

Signed-off-by: Stanislav Brabec <utx@penguin.cz>

diff --git a/recipes/linux/linux-kexecboot-2.6.26/new-make.patch b/recipes/linux/linux-kexecboot-2.6.26/new-make.patch
new file mode 100644 (file)
index 0000000..5cfb29b
--- /dev/null
+++ b/recipes/linux/linux-kexecboot-2.6.26/new-make.patch
@@ -0,0 +1,30 @@
+Index: linux-2.6.26/Makefile
+===================================================================
+--- linux-2.6.26.orig/Makefile
++++ linux-2.6.26/Makefile
+@@ -431,7 +431,11 @@ ifeq ($(config-targets),1)
+ include $(srctree)/arch/$(SRCARCH)/Makefile
+ export KBUILD_DEFCONFIG
+ 
+-config %config: scripts_basic outputmakefile FORCE
++config: scripts_basic outputmakefile FORCE
++      $(Q)mkdir -p include/linux include/config
++      $(Q)$(MAKE) $(build)=scripts/kconfig $@
++
++%config: scripts_basic outputmakefile FORCE
+       $(Q)mkdir -p include/linux include/config
+       $(Q)$(MAKE) $(build)=scripts/kconfig $@
+ 
+@@ -1547,7 +1551,11 @@ endif
+       $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+ 
+ # Modules
+-/ %/: prepare scripts FORCE
++/: prepare scripts FORCE
++      $(cmd_crmodverdir)
++      $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
++      $(build)=$(build-dir)
++%/: prepare scripts FORCE
+       $(cmd_crmodverdir)
+       $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
+       $(build)=$(build-dir)

diff --git a/recipes/linux/linux-kexecboot_2.6.26.bb b/recipes/linux/linux-kexecboot_2.6.26.bb
index de08362..6bdf90f 100644 (file)
--- a/recipes/linux/linux-kexecboot_2.6.26.bb
+++ b/recipes/linux/linux-kexecboot_2.6.26.bb
@@ -1,7 +1,7 @@
 require linux-kexecboot.inc
 require ../linux/linux-rp.checksums.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_qemuarm = "-1"
@@ -57,6 +57,7 @@ SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2;name=
            file://connectplus-remove-ide-HACK.patch;status=hack \
            file://connectplus-prevent-oops-HACK.patch;status=hack \
            file://htcuni.patch \
+           file://new-make.patch \
            file://versatile-armv6.patch \
            file://defconfig"
 

diff --git a/recipes/linux/linux-rp-2.6.26/new-make.patch b/recipes/linux/linux-rp-2.6.26/new-make.patch
new file mode 100644 (file)
index 0000000..5cfb29b
--- /dev/null
+++ b/recipes/linux/linux-rp-2.6.26/new-make.patch
@@ -0,0 +1,30 @@
+Index: linux-2.6.26/Makefile
+===================================================================
+--- linux-2.6.26.orig/Makefile
++++ linux-2.6.26/Makefile
+@@ -431,7 +431,11 @@ ifeq ($(config-targets),1)
+ include $(srctree)/arch/$(SRCARCH)/Makefile
+ export KBUILD_DEFCONFIG
+ 
+-config %config: scripts_basic outputmakefile FORCE
++config: scripts_basic outputmakefile FORCE
++      $(Q)mkdir -p include/linux include/config
++      $(Q)$(MAKE) $(build)=scripts/kconfig $@
++
++%config: scripts_basic outputmakefile FORCE
+       $(Q)mkdir -p include/linux include/config
+       $(Q)$(MAKE) $(build)=scripts/kconfig $@
+ 
+@@ -1547,7 +1551,11 @@ endif
+       $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+ 
+ # Modules
+-/ %/: prepare scripts FORCE
++/: prepare scripts FORCE
++      $(cmd_crmodverdir)
++      $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
++      $(build)=$(build-dir)
++%/: prepare scripts FORCE
+       $(cmd_crmodverdir)
+       $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
+       $(build)=$(build-dir)

diff --git a/recipes/linux/linux-rp_2.6.26.bb b/recipes/linux/linux-rp_2.6.26.bb
index dbfa9ac..a4dfee9 100644 (file)
--- a/recipes/linux/linux-rp_2.6.26.bb
+++ b/recipes/linux/linux-rp_2.6.26.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r13"
+PR = "r14"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_qemuarm = "-1"
@@ -56,6 +56,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2;name=k
            file://connectplus-prevent-oops-HACK.patch;status=hack \
            file://htcuni.patch \
            file://versatile-armv6.patch \
+           file://new-make.patch \
            file://defconfig-c7x0 \
            file://defconfig-hx2000 \
            file://defconfig-akita \