From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH 21/28] fakeroot: clean up patches
Date: Sun, 30 Oct 2011 23:00:52 +0100 [thread overview]
Message-ID: <1320012059-24971-21-git-send-email-r.schwebel@pengutronix.de> (raw)
In-Reply-To: <1320012059-24971-1-git-send-email-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
next prev parent reply other threads:[~2011-10-30 22:00 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-30 22:00 [ptxdist] Patch cleanup Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 02/28] devicekit-disks: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 03/28] mplayer: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 04/28] policykit: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 05/28] sdl: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 06/28] sdl-mixer: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 07/28] atop: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 08/28] bing: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 09/28] bridge-utils: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 10/28] bzip2: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 11/28] cbmbasic: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 12/28] cpufrequtils: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 13/28] cvs: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 14/28] daemonize: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 15/28] dibbler: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 16/28] e2fsprogs: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 17/28] efax: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 18/28] eggdbus: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 19/28] elektra: remove orphaned package Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 20/28] etherwake: clean up patches Robert Schwebel
2011-10-30 22:00 ` Robert Schwebel [this message]
2011-10-30 22:00 ` [ptxdist] [PATCH 22/28] fbtest: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 23/28] font-alias: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 24/28] freetype: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 25/28] glademm: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 26/28] gpsd: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 27/28] gst-plugins-gl: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 28/28] gtk: " Robert Schwebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320012059-24971-21-git-send-email-r.schwebel@pengutronix.de \
--to=r.schwebel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox