From 7b1bce18571faab989c95caf13b2a03d77eeed43 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 15 Dec 2009 09:17:26 +0000 Subject: [PATCH] build in f12 --- kernel-2.6.spec | 4 +++- linux-2.6-050-getline.patch | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 linux-2.6-050-getline.patch diff --git a/kernel-2.6.spec b/kernel-2.6.spec index 179578a90..3e716ae67 100644 --- a/kernel-2.6.spec +++ b/kernel-2.6.spec @@ -139,6 +139,7 @@ Source30: %{pldistro}-%{kversion}-i686-xenU.config %if "0%{patchlevel}" Patch000: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-%{rpmversion}.bz2 %endif +Patch050: linux-2.6-050-getline.patch # Linux-VServer Patch200: patch-%{rpmversion}-vs%{vsversion}.diff @@ -332,8 +333,9 @@ KERNEL_PREVIOUS=vanilla %ApplyPatch 0 %endif -# NetNS patch for VINI +%ApplyPatch 050 +# vserver patch %ApplyPatch 200 %ApplyPatch 250 diff --git a/linux-2.6-050-getline.patch b/linux-2.6-050-getline.patch new file mode 100644 index 000000000..483330195 --- /dev/null +++ b/linux-2.6-050-getline.patch @@ -0,0 +1,31 @@ +diff --git a/scripts/unifdef.c b/scripts/unifdef.c +index 552025e..977e682 100644 +--- a/scripts/unifdef.c ++++ b/scripts/unifdef.c +@@ -206,7 +206,7 @@ static void done(void); + static void error(const char *); + static int findsym(const char *); + static void flushline(bool); +-static Linetype getline(void); ++static Linetype parseline(void); + static Linetype ifeval(const char **); + static void ignoreoff(void); + static void ignoreon(void); +@@ -512,7 +512,7 @@ process(void) + + for (;;) { + linenum++; +- lineval = getline(); ++ lineval = parseline(); + trans_table[ifstate[depth]][lineval](); + debug("process %s -> %s depth %d", + linetype_name[lineval], +@@ -526,7 +526,7 @@ process(void) + * help from skipcomment(). + */ + static Linetype +-getline(void) ++parseline(void) + { + const char *cp; + int cursym; -- 2.47.0