From 06fff17991cf5105cb29d3cec2640995ace329b5 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Wed, 19 May 2010 00:40:47 +0200 Subject: [PATCH] linux-kexecboot: sed out conflicting getline in scripts/unifdef.c * mainline since 2.6.29-rc8 --- recipes/kexecboot/linux-kexecboot.inc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/recipes/kexecboot/linux-kexecboot.inc b/recipes/kexecboot/linux-kexecboot.inc index 5621e698f9..2751126b15 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 +# 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} -- 2.39.5