aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2010-05-21 00:08:56 +0200
committerAndrea Adami <andrea.adami@gmail.com>2010-05-21 00:08:56 +0200
commit75bc8e0ea1118b478332e110eb39bd6cf405ee26 (patch)
tree64c2ad879ac30846918c0337a2f79b051560e517
parentdf6007e5d3d0f9205e8fe6183aabae197ad75aa8 (diff)
downloadopenembedded-75bc8e0ea1118b478332e110eb39bd6cf405ee26.tar.gz
openembedded-75bc8e0ea1118b478332e110eb39bd6cf405ee26.tar.bz2
openembedded-75bc8e0ea1118b478332e110eb39bd6cf405ee26.zip
linux.inc: Rename getline in unifdef.c to parseline to avoid conflict.
* move patch from linux-kexecboot.inc * see https://patchwork.kernel.org/patch/11166/ * committed in 2.6.29 (commit d15bd1067b1fcb2b7250d22bc0c7c7fea0b759f7) * Acked-by: Tom Rini <tom_rini@mentor.com> * Acked-by: Henning Heinold <heinold@inf.fu-berlin.de> * Acked-by: Koen Kooi <koen@openembedded.org>
-rw-r--r--recipes/kexecboot/linux-kexecboot.inc9
-rw-r--r--recipes/linux/linux.inc10
2 files changed, 10 insertions, 9 deletions
diff --git a/recipes/kexecboot/linux-kexecboot.inc b/recipes/kexecboot/linux-kexecboot.inc
index 2751126b15..5621e698f9 100644
--- a/recipes/kexecboot/linux-kexecboot.inc
+++ b/recipes/kexecboot/linux-kexecboot.inc
@@ -71,15 +71,6 @@ sed -i -e /CONFIG_BLK_DEV_INITRD/d \
sed -i -e /CONFIG_CMDLINE/s/quiet/loglevel=3/1 ${S}/.config
sed -i -e /CONFIG_CMDLINE/s/debug/loglevel=3/1 ${S}/.config
-# Rename getline in ./scripts/unifdef.c
-# with 2.6.2x builds are currently failing to build unifdef.c,
-# clashing with exposed getline() from <stdio.h>
-# see https://patchwork.kernel.org/patch/11166/
-# committed in 2.6.29 (harmless for newer kernels)
-
-sed -i -e 's/getline/parseline/g' ${S}/scripts/unifdef.c
-
-
echo 'CONFIG_BLK_DEV_INITRD=y
CONFIG_KEXEC=y
${KERNEL_COMPRESSION}
diff --git a/recipes/linux/linux.inc b/recipes/linux/linux.inc
index a92cdd3092..0b188d44d1 100644
--- a/recipes/linux/linux.inc
+++ b/recipes/linux/linux.inc
@@ -57,6 +57,16 @@ python __anonymous () {
}
do_configure_prepend() {
+
+ # Rename getline in ./scripts/unifdef.c
+ # Kernels up to 2.6.29 are currently failing to build unifdef.c,
+ # clashing with exposed getline() from <stdio.h>
+ # see https://patchwork.kernel.org/patch/11166/
+ # committed in 2.6.29 (commit d15bd1067b1fcb2b7250d22bc0c7c7fea0b759f7)
+
+ sed -i -e 's/getline/parseline/g' ${S}/scripts/unifdef.c
+
+
echo "" > ${S}/.config
#