From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
From: Robert Schwebel <r.schwebel@pengutronix.de>
Date: Sun, 30 Oct 2011 23:00:52 +0100
Message-Id: <1320012059-24971-21-git-send-email-r.schwebel@pengutronix.de>
In-Reply-To: <1320012059-24971-1-git-send-email-r.schwebel@pengutronix.de>
References: <20111030220011.GK14918@pengutronix.de>
	<1320012059-24971-1-git-send-email-r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH 21/28] fakeroot: clean up patches
Reply-To: ptxdist@pengutronix.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=subscribe>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: ptxdist-bounces@pengutronix.de
Errors-To: ptxdist-bounces@pengutronix.de
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 ...dd-FAKEROOT_SYSROOT-prefix-for-relocation.patch |   38 ++++++++++++++++++++
 patches/fakeroot-1.14.4/add-sysroot-prefix.diff    |   34 -----------------
 patches/fakeroot-1.14.4/series                     |    1 -
 3 files changed, 38 insertions(+), 35 deletions(-)
 create mode 100644 patches/fakeroot-1.14.4/0001-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch
 delete mode 100644 patches/fakeroot-1.14.4/add-sysroot-prefix.diff
 delete mode 100644 patches/fakeroot-1.14.4/series

diff --git a/patches/fakeroot-1.14.4/0001-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch b/patches/fakeroot-1.14.4/0001-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch
new file mode 100644
index 0000000..eddc33e
--- /dev/null
+++ b/patches/fakeroot-1.14.4/0001-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch
@@ -0,0 +1,38 @@
+From ae801497625f2403507720ad5d1640756f6e8c17 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:16:53 +0100
+Subject: [PATCH] add FAKEROOT_SYSROOT prefix for relocation
+
+Prefix all paths with FAKEROOT_SYSROOT
+It will be replaced by the current sysroot.
+
+Not for upstream.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ scripts/fakeroot.in |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/fakeroot.in b/scripts/fakeroot.in
+index d4f888d..4c998c8 100755
+--- a/scripts/fakeroot.in
++++ b/scripts/fakeroot.in
+@@ -30,12 +30,12 @@ fatal ()
+ }
+ 
+ # strip /bin/fakeroot to find install prefix
+-FAKEROOT_PREFIX=@prefix@
+-FAKEROOT_BINDIR=@bindir@
++FAKEROOT_PREFIX="FAKEROOT_SYSROOT@prefix@"
++FAKEROOT_BINDIR="FAKEROOT_SYSROOT@bindir@"
+ 
+ USEABSLIBPATH=@LDPRELOADABS@
+ LIB=lib@fakeroot_transformed@@DLSUFFIX@
+-PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
++PATHS="FAKEROOT_SYSROOT@libdir@":${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
+ FAKED=${FAKEROOT_BINDIR}/@faked_transformed@
+ 
+ FAKED_MODE="unknown-is-root"
+-- 
+1.7.7
+
diff --git a/patches/fakeroot-1.14.4/add-sysroot-prefix.diff b/patches/fakeroot-1.14.4/add-sysroot-prefix.diff
deleted file mode 100644
index 3823956..0000000
--- a/patches/fakeroot-1.14.4/add-sysroot-prefix.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: add FAKEROOT_SYSROOT prefix for relocation
-
-Prefix all paths with FAKEROOT_SYSROOT
-It will be replaced by the current sysroot.
-
-Not for upstream.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- scripts/fakeroot.in |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-Index: b/scripts/fakeroot.in
-===================================================================
---- a/scripts/fakeroot.in
-+++ b/scripts/fakeroot.in
-@@ -30,12 +30,12 @@ fatal ()
- }
- 
- # strip /bin/fakeroot to find install prefix
--FAKEROOT_PREFIX=@prefix@
--FAKEROOT_BINDIR=@bindir@
-+FAKEROOT_PREFIX="FAKEROOT_SYSROOT@prefix@"
-+FAKEROOT_BINDIR="FAKEROOT_SYSROOT@bindir@"
- 
- USEABSLIBPATH=@LDPRELOADABS@
- LIB=lib@fakeroot_transformed@@DLSUFFIX@
--PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
-+PATHS="FAKEROOT_SYSROOT@libdir@":${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
- FAKED=${FAKEROOT_BINDIR}/@faked_transformed@
- 
- FAKED_MODE="unknown-is-root"
diff --git a/patches/fakeroot-1.14.4/series b/patches/fakeroot-1.14.4/series
deleted file mode 100644
index 1ff956d..0000000
--- a/patches/fakeroot-1.14.4/series
+++ /dev/null
@@ -1 +0,0 @@
-add-sysroot-prefix.diff
-- 
1.7.7


-- 
ptxdist mailing list
ptxdist@pengutronix.de