From 7c2ef155881eb032ec684aa1408a71cbb9bcef20 Mon Sep 17 00:00:00 2001
From: josch <josch@pyneo.org>
Date: Tue, 18 Oct 2011 16:34:59 +0200
Subject: [PATCH] QEMU_LD_PREFIX support is upstream in qemu git

---
 README       | 20 +++++++++++++-------
 polystrap.sh |  2 ++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/README b/README
index 9392b2d..18d2bca 100644
--- a/README
+++ b/README
@@ -43,10 +43,10 @@ omitdebsrc=true
 -%<----------------------------
 
 You can also avoid all this trouble by either waiting for #632192 to be fixed
-or by applying the patch from there to qemu and using the newly introduced
-environment variable QEMU_LD_PREFIX like so:
+or by applying the patch from there to qemu.
 
-QEMU_LD_PREFIX=/tmp/debian-sid/ ./polystrap.sh -d /tmp/debian-sid/ om-gta02
+Since support for QEMU_LD_PREFIX has now been added upstream it is now already
+part of polystrap.sh
 
 
 FAKEROOT/FAKECHROOT
@@ -56,13 +56,19 @@ Additionally you will need to have copies of libfakechroot.so and
 libfakeroot-sysv.so for your target architecture in /usr/lib/<arch-triplet>/.
 Get the debian packages of fakeroot and fakechroot for your target architecture
 and copy the shared libraries into /usr/lib/<arch-triplet>/. For example for
-arm do:
+armel do:
 
-wget http://ftp.debian.org/debian/pool/main/f/fakechroot/fakechroot_2.14-1_armel.deb
-wget http://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.14.5-1_armel.deb
 sudo mkdir -p /usr/lib/arm-linux-gnueabi/
+wget http://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.18.1-1_armel.deb
 dpkg-deb --fsys-tarfile fakeroot_1.14.5-1_armel.deb | sudo tar -xf - --strip-components=4 -C /usr/lib/arm-linux-gnueabi/ ./usr/lib/libfakeroot/libfakeroot-sysv.so
-dpkg-deb --fsys-tarfile fakechroot_2.14-1_armel.deb | sudo tar -xf - --strip-components=4 -C /usr/lib/arm-linux-gnueabi/ ./usr/lib/fakechroot/libfakechroot.so
+wget http://ftp.debian.org/debian/pool/main/f/fakechroot/libfakechroot_2.15-1_armel.deb
+dpkg -x libfakechroot_2.15-1_armel.deb /
+
+Alternatively, since libfakechroot is multiarch you can also do:
+
+apt-get install libfakechroot:armel
+
+if your system supports it instead of the last two lines.
 
 
 INNER WORKINGS
diff --git a/polystrap.sh b/polystrap.sh
index 11d567e..9216481 100755
--- a/polystrap.sh
+++ b/polystrap.sh
@@ -84,6 +84,8 @@ fi
 # binutils must always be installed for objdump for fake ldd
 PACKAGES="$PACKAGES binutils"
 
+export QEMU_LD_PREFIX="`readlink -m "$ROOTDIR"`"
+
 echo "I: --------------------------"
 echo "I: suite:   $SUITE"
 echo "I: arch:    $ARCH"