3 files changed, 9 insertions, 22 deletions

diff --git a/meta/packages/fakeroot/fakeroot/absolutepaths.patch b/meta/packages/fakeroot/fakeroot-1.14.4/absolutepaths.patch
index ae18e8a28c..ae18e8a28c 100644
--- a/meta/packages/fakeroot/fakeroot/absolutepaths.patch
+++ b/meta/packages/fakeroot/fakeroot-1.14.4/absolutepaths.patch
diff --git a/meta/packages/fakeroot/fakeroot/configure-libtool.patch b/meta/packages/fakeroot/fakeroot/configure-libtool.patch
deleted file mode 100644
index 8830328eb5..0000000000
--- a/meta/packages/fakeroot/fakeroot/configure-libtool.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- fakeroot-1.8.3/configure.ac.orig    2007-10-31 00:17:27.000000000 -0500
-+++ fakeroot-1.8.3/configure.ac 2007-10-31 00:18:12.000000000 -0500
-@@ -1,14 +1,12 @@
- dnl Process this file with autoconf to produce a configure script.
- AC_INIT([fakeroot],[FAKEROOT_VERSION],[schizo@debian.org],[fakeroot])
- AC_PREREQ(2.61)
--LT_PREREQ(2.1a)
- AC_CANONICAL_TARGET
- AM_INIT_AUTOMAKE
- AM_MAINTAINER_MODE
- AC_CONFIG_HEADERS([config.h])
- AC_PROG_MAKE_SET
--LT_INIT
--LT_LANG(C)
-+AC_PROG_LIBTOOL
- 
- AC_ARG_WITH([ipc],
-            AS_HELP_STRING([--with-ipc@<:@=IPCTYPE@:>@],
diff --git a/meta/packages/fakeroot/fakeroot_1.9.4.bb b/meta/packages/fakeroot/fakeroot_1.14.4.bb
index 66193171fc..11ae015a83 100644
--- a/meta/packages/fakeroot/fakeroot_1.9.4.bb
+++ b/meta/packages/fakeroot/fakeroot_1.14.4.bb
@@ -5,14 +5,19 @@ LICENSE = "GPLv2"
 # fakeroot needs getopt which is provided by the util-linux package
 RDEPENDS = "util-linux"
 RDEPENDS_virtclass-native = "util-linux-native"
-PR = "r3"
+PR = "r0"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \
-           file://configure-libtool.patch; \
-           file://absolutepaths.patch;"
+SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.orig.tar.bz2 \
+           file://absolutepaths.patch"
             
 inherit autotools
 
+do_configure_prepend() {
+        # fakeroot's own bootstrap includes other autoreconf stuff we don't need here
+        # so manually create the aux directory
+        mkdir -p ${S}/build-aux
+}
+
 do_install_append() {
         install -d ${D}${STAGING_INCDIR}/fakeroot/
         install -m 644 *.h ${D}${STAGING_INCDIR}/fakeroot