diff options
| author |   Steffen Sledz <sledz@dresearch-fe.de> | 2011-03-28 15:43:31 +0200 |
|---|---|---|
| committer | Steffen Sledz <sledz@dresearch-fe.de> | 2011-04-01 12:59:42 +0200 |
| commit | 83430c0988fed25dbb2e4c2046189eaf01a3780c (patch) | |
| tree | 0c4741f8bcaae509bd62cc136f759f874f2000d3 /recipes/linux | |
| parent | 84cbf663f3b2208f6f818bd07042c50ef55e0e38 (diff) | |
| download | openembedded-83430c0988fed25dbb2e4c2046189eaf01a3780c.tar.gz | |
linux-2.6.24: allow building kernel with newer GNU make
GNU make >= 3.82 does not allow mixed implicit and normal rules
Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
Acked-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/linux')
| -rw-r--r-- | recipes/linux/linux-2.6.24/make-3.82.patch | 29 | ||||
| -rw-r--r-- | recipes/linux/linux_2.6.24.bb | 3 |
2 files changed, 31 insertions, 1 deletions
diff --git a/recipes/linux/linux-2.6.24/make-3.82.patch b/recipes/linux/linux-2.6.24/make-3.82.patch new file mode 100644 index 0000000000..99896d9f4c --- /dev/null +++ b/recipes/linux/linux-2.6.24/make-3.82.patch @@ -0,0 +1,29 @@ +diff -Nurd linux-2.6.24.orig//Makefile linux-2.6.24/Makefile +--- linux-2.6.24.orig//Makefile 2011-03-29 07:56:05.122449521 +0200 ++++ linux-2.6.24/Makefile 2011-03-29 07:57:48.726768621 +0200 +@@ -431,7 +431,11 @@ + 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 $@ + +@@ -1500,7 +1504,11 @@ + $(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_2.6.24.bb b/recipes/linux/linux_2.6.24.bb index 5c05593c39..5cc686a4c7 100644 --- a/recipes/linux/linux_2.6.24.bb +++ b/recipes/linux/linux_2.6.24.bb @@ -11,7 +11,7 @@ DEFAULT_PREFERENCE_hipox = "1" DEFAULT_PREFERENCE_cs-e9302 = "1" DEFAULT_PREFERENCE_smartq5 = "1" -PR = "r36" +PR = "r37" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=kernel \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.7.bz2;apply=yes;name=stablepatch \ @@ -19,6 +19,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=k file://ubifs-v2.6.24.patch \ file://ubifs-v2.6.24-silent-get-sb.patch \ file://cfi-amic.patch \ + file://make-3.82.patch \ file://defconfig" # Moved away temporarely until committed properly (work in progress). |