[oe-commits]: linux-kexecboot: sed out conflicting getline in scripts/ unifdef.c

[oe-commits]: linux-kexecboot: sed out conflicting getline in scripts/ unifdef.c

[Andrea Adami]

We are discussing about moving this sed to linux.inc in order to fix
the issue once for all.
Opinions?

Andrea


---------- Forwarded message ----------
From: git version control <git@git.openembedded.org>
Date: Wed, May 19, 2010 at 12:47 AM
Subject: [oe-commits] Andrea Adami : linux-kexecboot: sed out
conflicting getline in scripts/ unifdef.c
To: openembedded-commits@openembedded.org


Module: openembedded.git
Branch: org.openembedded.dev
Commit: 06fff17991cf5105cb29d3cec2640995ace329b5
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=06fff17991cf5105cb29d3cec2640995ace329b5

Author: Andrea Adami <andrea.adami@gmail.com>
Date:   Wed May 19 00:40:47 2010 +0200

linux-kexecboot: sed out conflicting getline in scripts/unifdef.c

* mainline since 2.6.29-rc8

---

 recipes/kexecboot/linux-kexecboot.inc |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/recipes/kexecboot/linux-kexecboot.inc
b/recipes/kexecboot/linux-kexecboot.inc
index 5621e69..2751126 100644
--- a/recipes/kexecboot/linux-kexecboot.inc
+++ b/recipes/kexecboot/linux-kexecboot.inc
@@ -71,6 +71,15 @@ 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}


_______________________________________________
Openembedded-commits mailing list
Openembedded-commits@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits

Re: [oe-commits]: linux-kexecboot: sed out conflicting getline in scripts/ unifdef.c

[Tom Rini]

Andrea Adami wrote:
> We are discussing about moving this sed to linux.inc in order to fix
> the issue once for all.
> Opinions?

Please do it, thanks.

-- 
Tom Rini
Mentor Graphics Corporation

Re: [oe-commits]: linux-kexecboot: sed out conflicting getline in scripts/ unifdef.c

[Andrea Adami]

Bump

Pls, a second ack is needed.

Thx

Andrea

Re: [oe-commits]: linux-kexecboot: sed out conflicting getline in scripts/ unifdef.c

[Henning Heinold]

On Thu, May 20, 2010 at 01:15:37PM +0200, Andrea Adami wrote:
> Bump
> 
> Pls, a second ack is needed.
> 
> Thx
> 
> Andrea

Acked-by: Henning Heinold <heinold@inf.fu-berlin.de>

Bye Henning

Re: [oe-commits]: linux-kexecboot: sed out conflicting getline in scripts/ unifdef.c

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 20-05-10 13:15, Andrea Adami wrote:
> Bump
> 
> Pls, a second ack is needed.
> 
> Thx
> 
> Andrea

Acked-By: Koen Kooi <koen@openembedded.org>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFL9R91MkyGM64RGpERAqJSAKCiCIP08B8lfU2LtAsSXI8gb7nG7gCgt6IT
F4VHUYC9PW6MlGV3hrk95mY=
=rfrb
-----END PGP SIGNATURE-----