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 <[email protected]> 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: [email protected] Module: openembedded.git Branch: org.openembedded.dev Commit: 06fff17991cf5105cb29d3cec2640995ace329b5 URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=06fff17991cf5105cb29d3cec2640995ace329b5 Author: Andrea Adami <[email protected]> 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 [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
