mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 00:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

fakechroot: Update to 2.9 and add a patch from Debian

Browse Source 
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>
This commit is contained in:
Joshua Lock
2010-03-22 18:18:50 +00:00
parent 1d05e3aa30
commit e3c4237fd7
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
meta/packages/fakechroot/fakechroot/fix-readlink.patch
View File

@@ -2,11 +2,11 @@
src/libfakechroot.c | 4 ++-- src/libfakechroot.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
--- fakechroot-2.5.orig/src/libfakechroot.c Index: fakechroot-2.9/src/libfakechroot.c
+++ fakechroot-2.5/src/libfakechroot.c ===================================================================
@@ -596,11 +596,11 @@ void fakechroot_init (void) --- fakechroot-2.9.orig/src/libfakechroot.c 2009-03-31 11:20:41.000000000 +0100
nextsym(open64, "open64"); +++ fakechroot-2.9/src/libfakechroot.c 2010-03-22 17:40:17.386783375 +0000
#if !defined(HAVE___OPENDIR2) @@ -775,7 +775,7 @@
nextsym(opendir, "opendir"); nextsym(opendir, "opendir");
#endif #endif
nextsym(pathconf, "pathconf"); nextsym(pathconf, "pathconf");
@@ -15,18 +15,12 @@
nextsym(realpath, "realpath"); nextsym(realpath, "realpath");
nextsym(remove, "remove"); nextsym(remove, "remove");
#ifdef HAVE_REMOVEXATTR #ifdef HAVE_REMOVEXATTR
nextsym(removexattr, "removexattr"); @@ -2492,7 +2492,7 @@
#endif
@@ -1864,11 +1864,11 @@ long pathconf (const char *path, int nam
return next_pathconf(path, name);
}
/* #include <unistd.h> */ /* #include <unistd.h> */
-int readlink (const char *path, char *buf, READLINK_TYPE_ARG3) -READLINK_TYPE_RETURN readlink (const char *path, char *buf, READLINK_TYPE_ARG3)
+int own_readlink (const char *path, char *buf, READLINK_TYPE_ARG3) +READLINK_TYPE_RETURN own_readlink (const char *path, char *buf, READLINK_TYPE_ARG3)
{ {
int status; int status;
char tmp[FAKECHROOT_MAXPATH], *tmpptr; char tmp[FAKECHROOT_MAXPATH], *tmpptr;
char *fakechroot_path, *fakechroot_ptr, fakechroot_buf[FAKECHROOT_MAXPATH];

5
meta/packages/fakechroot/fakechroot_2.5.bb → meta/packages/fakechroot/fakechroot_2.9.bb
View File

@@ -3,9 +3,10 @@ DESCRIPTION = "Gives a fake root environment which can support chroot"
LICENSE = "GPL" LICENSE = "GPL"
SRC_URI = "${DEBIAN_MIRROR}/main/f/fakechroot/fakechroot_${PV}.orig.tar.gz \ SRC_URI = "${DEBIAN_MIRROR}/main/f/fakechroot/fakechroot_${PV}.orig.tar.gz \
file://fix-readlink.patch;patch=1" file://fix-readlink.patch;patch=1 \
${DEBIAN_MIRROR}/main/f/fakechroot/fakechroot_2.9-1.1.diff.gz"
inherit autotools_stage inherit autotools
PR = "r2" PR = "r2"