Merge branch 'marcin/trunk' of git://git.pokylinux.org/poky-contrib

meta/packages/linux-libc-headers/files/unifdef.patch

@@ -0,0 +1,31 @@
+Index: linux-2.6.20/scripts/unifdef.c
+===================================================================
+--- linux-2.6.20.orig/scripts/unifdef.c
++++ linux-2.6.20/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;

meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb

@@ -2,10 +2,11 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-           file://procinfo.h"
+           file://procinfo.h \
+           file://unifdef.patch;patch=1"
 
 S = "${WORKDIR}/linux-${PV}"