diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-10-22 17:00:50 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-10-22 17:00:50 +0100 |
| commit | a1a308c54671f20bf9eaf87f74fc6e5ec01842c9 (patch) | |
| tree | cc7c5b2dec1ec003d788c4578bc668915635cd40 | |
| parent | 699fb85c0af1ae5da6cd0c28bd185218c8ee5183 (diff) | |
| parent | 559cb333d00e09f88a520ad01e4d7204192b1376 (diff) | |
| download | openembedded-core-a1a308c54671f20bf9eaf87f74fc6e5ec01842c9.tar.gz openembedded-core-a1a308c54671f20bf9eaf87f74fc6e5ec01842c9.tar.bz2 openembedded-core-a1a308c54671f20bf9eaf87f74fc6e5ec01842c9.tar.xz openembedded-core-a1a308c54671f20bf9eaf87f74fc6e5ec01842c9.zip | |
Merge branch 'marcin/trunk' of git://git.pokylinux.org/poky-contrib
| -rw-r--r-- | meta/packages/linux-libc-headers/files/unifdef.patch | 31 | ||||
| -rw-r--r-- | meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb | 5 |
2 files changed, 34 insertions, 2 deletions
diff --git a/meta/packages/linux-libc-headers/files/unifdef.patch b/meta/packages/linux-libc-headers/files/unifdef.patch new file mode 100644 index 000000000..bda886000 --- /dev/null +++ b/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; diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb index c85733611..9ade91ca4 100644 --- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb +++ b/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}" |