rpms/kernel/F-9 linux-2.6-kbuild-fix-unifdef.c-usage-of-getline.patch, NONE, 1.1.2.1 kernel.spec, 1.891.2.52, 1.891.2.53

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20159

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	kernel.spec 
Added Files:
      Tag: private-fedora-9-2_6_27-branch
	linux-2.6-kbuild-fix-unifdef.c-usage-of-getline.patch 
Log Message:
Allow building the F-9 kernel on F-11.

linux-2.6-kbuild-fix-unifdef.c-usage-of-getline.patch:

--- NEW FILE linux-2.6-kbuild-fix-unifdef.c-usage-of-getline.patch ---
From: Justin P. Mattock <justinmattock at gmail.com>
Date: Sat, 7 Mar 2009 12:31:29 +0000 (+0100)
Subject: kbuild: fix C libary confusion in unifdef.c due to getline()
X-Git-Tag: v2.6.29-rc8~2^2~3
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=d15bd1067b1fcb2b7250d22bc0c7c7fea0b759f7

kbuild: fix C libary confusion in unifdef.c due to getline()

This fixes an error when compiling the kernel.

  CHK     include/linux/version.h
  HOSTCC  scripts/unifdef
scripts/unifdef.c:209: error: conflicting types for 'getline'
/usr/include/stdio.h:651: note: previous declaration of 'getline' was here
make[1]: *** [scripts/unifdef] Error 1
make: *** [__headers] Error 2

Signed-off-by: Justin P. Mattock <justinmattock at gmail.com>
Cc:  Frederic Weisbecker <fweisbec at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
---

diff --git a/scripts/unifdef.c b/scripts/unifdef.c
index 552025e..05a31a6 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         get_line(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 = get_line();
 		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)
+get_line(void)
 {
 	const char *cp;
 	int cursym;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.52
retrieving revision 1.891.2.53
diff -u -p -r1.891.2.52 -r1.891.2.53
--- kernel.spec	21 May 2009 02:08:10 -0000	1.891.2.52
+++ kernel.spec	21 May 2009 02:40:06 -0000	1.891.2.53
@@ -589,11 +589,14 @@ Patch07: linux-2.6-compile-fixes.patch
 # build tweak for build ID magic, even for -vanilla
 Patch08: linux-2.6-makefile-after_link.patch
 
+# fix build on newer userspace, even for -vanilla
+Patch09: linux-2.6-kbuild-fix-unifdef.c-usage-of-getline.patch
+
 %if !%{nopatches}
 
 # revert upstream patches we get via other methods
-Patch09: linux-2.6-upstream-reverts.patch
-Patch10: linux-2.6-hotfixes.patch
+Patch15: linux-2.6-upstream-reverts.patch
+Patch16: linux-2.6-hotfixes.patch
 # patches queued for the next -stable release
 #Patch11: linux-2.6.27.5-stable-queue.patch
 #Patch12: linux-2.6.27.5-stable-queue-reverts.patch
@@ -1095,6 +1098,9 @@ ApplyPatch linux-2.6-build-nonintconfig.
 
 ApplyPatch linux-2.6-makefile-after_link.patch
 
+# Fix building kernel on newer userspace
+ApplyPatch linux-2.6-kbuild-fix-unifdef.c-usage-of-getline.patch
+
 #
 # misc small stuff to make things compile
 #
@@ -1973,6 +1979,9 @@ fi
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Wed May 20 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.24-78.2.53
+- Allow building the F-9 kernel on F-11.
+
 * Wed May 20 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.24-78.2.52
 - ext4 fixes from Fedora 11:
     linux-2.6-ext4-clear-unwritten-flag.patch