summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-03-22 18:18:50 +0000
committerJoshua Lock <josh@linux.intel.com>2010-03-23 14:50:50 +0000
commite3c4237fd7fcd1dfe0bb086d61122c3704c9e835 (patch)
treea13b0c9c502c90480ad8530e29c71d154bb8f92c
parent1d05e3aa30e890a46d5febbde00548a20031fae5 (diff)
downloadpoky-e3c4237fd7fcd1dfe0bb086d61122c3704c9e835.tar.gz
fakechroot: Update to 2.9 and add a patch from Debian
This update includes a refresh of our existing readlink patch and a (trimmed) copy of the patch Debian are shipping in their package which includes unreleased fixes from SVN for building against more recent glibc. Signed-off-by: Joshua Lock <josh@linux.intel.com>
-rw-r--r--meta/packages/fakechroot/fakechroot/fix-readlink.patch22
-rw-r--r--meta/packages/fakechroot/fakechroot_2.9.bb (renamed from meta/packages/fakechroot/fakechroot_2.5.bb)5
2 files changed, 11 insertions, 16 deletions
diff --git a/meta/packages/fakechroot/fakechroot/fix-readlink.patch b/meta/packages/fakechroot/fakechroot/fix-readlink.patch
index f218956790..9321564922 100644
--- a/meta/packages/fakechroot/fakechroot/fix-readlink.patch
+++ b/meta/packages/fakechroot/fakechroot/fix-readlink.patch
@@ -2,11 +2,11 @@
2 src/libfakechroot.c | 4 ++-- 2 src/libfakechroot.c | 4 ++--
3 1 file changed, 2 insertions(+), 2 deletions(-) 3 1 file changed, 2 insertions(+), 2 deletions(-)
4 4
5--- fakechroot-2.5.orig/src/libfakechroot.c 5Index: fakechroot-2.9/src/libfakechroot.c
6+++ fakechroot-2.5/src/libfakechroot.c 6===================================================================
7@@ -596,11 +596,11 @@ void fakechroot_init (void) 7--- fakechroot-2.9.orig/src/libfakechroot.c 2009-03-31 11:20:41.000000000 +0100
8 nextsym(open64, "open64"); 8+++ fakechroot-2.9/src/libfakechroot.c 2010-03-22 17:40:17.386783375 +0000
9 #if !defined(HAVE___OPENDIR2) 9@@ -775,7 +775,7 @@
10 nextsym(opendir, "opendir"); 10 nextsym(opendir, "opendir");
11 #endif 11 #endif
12 nextsym(pathconf, "pathconf"); 12 nextsym(pathconf, "pathconf");
@@ -15,18 +15,12 @@
15 nextsym(realpath, "realpath"); 15 nextsym(realpath, "realpath");
16 nextsym(remove, "remove"); 16 nextsym(remove, "remove");
17 #ifdef HAVE_REMOVEXATTR 17 #ifdef HAVE_REMOVEXATTR
18 nextsym(removexattr, "removexattr"); 18@@ -2492,7 +2492,7 @@
19 #endif
20@@ -1864,11 +1864,11 @@ long pathconf (const char *path, int nam
21 return next_pathconf(path, name);
22 }
23 19
24 20
25 /* #include <unistd.h> */ 21 /* #include <unistd.h> */
26-int readlink (const char *path, char *buf, READLINK_TYPE_ARG3) 22-READLINK_TYPE_RETURN readlink (const char *path, char *buf, READLINK_TYPE_ARG3)
27+int own_readlink (const char *path, char *buf, READLINK_TYPE_ARG3) 23+READLINK_TYPE_RETURN own_readlink (const char *path, char *buf, READLINK_TYPE_ARG3)
28 { 24 {
29 int status; 25 int status;
30 char tmp[FAKECHROOT_MAXPATH], *tmpptr; 26 char tmp[FAKECHROOT_MAXPATH], *tmpptr;
31 char *fakechroot_path, *fakechroot_ptr, fakechroot_buf[FAKECHROOT_MAXPATH];
32
diff --git a/meta/packages/fakechroot/fakechroot_2.5.bb b/meta/packages/fakechroot/fakechroot_2.9.bb
index a72dfdaf05..6d45e01940 100644
--- a/meta/packages/fakechroot/fakechroot_2.5.bb
+++ b/meta/packages/fakechroot/fakechroot_2.9.bb
@@ -3,9 +3,10 @@ DESCRIPTION = "Gives a fake root environment which can support chroot"
3LICENSE = "GPL" 3LICENSE = "GPL"
4 4
5SRC_URI = "${DEBIAN_MIRROR}/main/f/fakechroot/fakechroot_${PV}.orig.tar.gz \ 5SRC_URI = "${DEBIAN_MIRROR}/main/f/fakechroot/fakechroot_${PV}.orig.tar.gz \
6 file://fix-readlink.patch;patch=1" 6 file://fix-readlink.patch;patch=1 \
7 ${DEBIAN_MIRROR}/main/f/fakechroot/fakechroot_2.9-1.1.diff.gz"
7 8
8inherit autotools_stage 9inherit autotools
9 10
10PR = "r2" 11PR = "r2"
11 12