From 8bc4105ddff851fc0e2c716d677b52236f6c3209 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Sat, 3 Jan 2009 18:32:56 +0000
Subject: fakechroot: Clean up and convert to BBCLASSEXTEND

---
 meta/packages/fakechroot/fakechroot-native_2.5.bb  | 12 --------
 .../fakechroot/fakechroot/fix-readlink.patch       | 32 ++++++++++++++++++++++
 meta/packages/fakechroot/fakechroot_2.5.bb         |  6 +++-
 meta/packages/fakechroot/files/fix-readlink.patch  | 32 ----------------------
 4 files changed, 37 insertions(+), 45 deletions(-)
 delete mode 100644 meta/packages/fakechroot/fakechroot-native_2.5.bb
 create mode 100644 meta/packages/fakechroot/fakechroot/fix-readlink.patch
 delete mode 100644 meta/packages/fakechroot/files/fix-readlink.patch

(limited to 'meta/packages/fakechroot')

diff --git a/meta/packages/fakechroot/fakechroot-native_2.5.bb b/meta/packages/fakechroot/fakechroot-native_2.5.bb
deleted file mode 100644
index 8cb88bdaa..000000000
--- a/meta/packages/fakechroot/fakechroot-native_2.5.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-SECTION = "base"
-PR = "r1"
-require fakechroot_${PV}.bb
-inherit native
-
-S = "${WORKDIR}/fakechroot-${PV}"
-
-EXTRA_OECONF = " --program-prefix="
-
-do_stage_append () {
-    oe_libinstall -so libfakechroot ${STAGING_LIBDIR}/libfakechroot/
-}
diff --git a/meta/packages/fakechroot/fakechroot/fix-readlink.patch b/meta/packages/fakechroot/fakechroot/fix-readlink.patch
new file mode 100644
index 000000000..f21895679
--- /dev/null
+++ b/meta/packages/fakechroot/fakechroot/fix-readlink.patch
@@ -0,0 +1,32 @@
+---
+ src/libfakechroot.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- fakechroot-2.5.orig/src/libfakechroot.c
++++ fakechroot-2.5/src/libfakechroot.c
+@@ -596,11 +596,11 @@ void fakechroot_init (void)
+     nextsym(open64, "open64");
+ #if !defined(HAVE___OPENDIR2)
+     nextsym(opendir, "opendir");
+ #endif
+     nextsym(pathconf, "pathconf");
+-    nextsym(readlink, "readlink");
++    nextsym(readlink, "own_readlink");
+     nextsym(realpath, "realpath");
+     nextsym(remove, "remove");
+ #ifdef HAVE_REMOVEXATTR
+     nextsym(removexattr, "removexattr");
+ #endif
+@@ -1864,11 +1864,11 @@ long pathconf (const char *path, int nam
+     return next_pathconf(path, name);
+ }
+ 
+ 
+ /* #include <unistd.h> */
+-int readlink (const char *path, char *buf, READLINK_TYPE_ARG3)
++int own_readlink (const char *path, char *buf, READLINK_TYPE_ARG3)
+ {
+     int status;
+     char tmp[FAKECHROOT_MAXPATH], *tmpptr;
+     char *fakechroot_path, *fakechroot_ptr, fakechroot_buf[FAKECHROOT_MAXPATH];
+ 
diff --git a/meta/packages/fakechroot/fakechroot_2.5.bb b/meta/packages/fakechroot/fakechroot_2.5.bb
index dfe90779b..a72dfdaf0 100644
--- a/meta/packages/fakechroot/fakechroot_2.5.bb
+++ b/meta/packages/fakechroot/fakechroot_2.5.bb
@@ -5,4 +5,8 @@ LICENSE = "GPL"
 SRC_URI = "${DEBIAN_MIRROR}/main/f/fakechroot/fakechroot_${PV}.orig.tar.gz \
            file://fix-readlink.patch;patch=1"
 
-inherit autotools
+inherit autotools_stage
+
+PR = "r2"
+
+BBCLASSEXTEND = "native"
\ No newline at end of file
diff --git a/meta/packages/fakechroot/files/fix-readlink.patch b/meta/packages/fakechroot/files/fix-readlink.patch
deleted file mode 100644
index f21895679..000000000
--- a/meta/packages/fakechroot/files/fix-readlink.patch
+++ /dev/null
@@ -1,32 +0,0 @@
----
- src/libfakechroot.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- fakechroot-2.5.orig/src/libfakechroot.c
-+++ fakechroot-2.5/src/libfakechroot.c
-@@ -596,11 +596,11 @@ void fakechroot_init (void)
-     nextsym(open64, "open64");
- #if !defined(HAVE___OPENDIR2)
-     nextsym(opendir, "opendir");
- #endif
-     nextsym(pathconf, "pathconf");
--    nextsym(readlink, "readlink");
-+    nextsym(readlink, "own_readlink");
-     nextsym(realpath, "realpath");
-     nextsym(remove, "remove");
- #ifdef HAVE_REMOVEXATTR
-     nextsym(removexattr, "removexattr");
- #endif
-@@ -1864,11 +1864,11 @@ long pathconf (const char *path, int nam
-     return next_pathconf(path, name);
- }
- 
- 
- /* #include <unistd.h> */
--int readlink (const char *path, char *buf, READLINK_TYPE_ARG3)
-+int own_readlink (const char *path, char *buf, READLINK_TYPE_ARG3)
- {
-     int status;
-     char tmp[FAKECHROOT_MAXPATH], *tmpptr;
-     char *fakechroot_path, *fakechroot_ptr, fakechroot_buf[FAKECHROOT_MAXPATH];
- 
-- 
cgit v1.2.3