From 75bc8e0ea1118b478332e110eb39bd6cf405ee26 Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Fri, 21 May 2010 00:08:56 +0200
Subject: 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>
---
recipes/kexecboot/linux-kexecboot.inc | 9 ---------
1 file changed, 9 deletions(-)
(limited to 'recipes/kexecboot')
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}
--
cgit v1.2.3