diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-02-23 23:45:49 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-02-24 18:13:12 +0100 |
| commit | 4454b1067d97ecba920b02c27414638730b239a3 (patch) | |
| tree | 27bd5f116de22ca1d7cf5ed436ebd2222688139e /patches/fakeroot-1.21 | |
| parent | 496773c09f26aa3be77bffde362190157dc596a5 (diff) | |
| download | ptxdist-4454b1067d97ecba920b02c27414638730b239a3.tar.gz ptxdist-4454b1067d97ecba920b02c27414638730b239a3.tar.xz | |
fakeroot: make it relocatable
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/fakeroot-1.21')
| -rw-r--r-- | patches/fakeroot-1.21/0100-make-fakeroot-relocatable.patch (renamed from patches/fakeroot-1.21/0100-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch) | 13 | ||||
| -rw-r--r-- | patches/fakeroot-1.21/series | 4 |
2 files changed, 8 insertions, 9 deletions
diff --git a/patches/fakeroot-1.21/0100-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch b/patches/fakeroot-1.21/0100-make-fakeroot-relocatable.patch index 52bb63b9f..d6c6b9808 100644 --- a/patches/fakeroot-1.21/0100-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch +++ b/patches/fakeroot-1.21/0100-make-fakeroot-relocatable.patch @@ -1,9 +1,8 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> Date: Sun, 30 Oct 2011 22:16:53 +0100 -Subject: [PATCH] add FAKEROOT_SYSROOT prefix for relocation +Subject: [PATCH] make fakeroot relocatable -Prefix all paths with FAKEROOT_SYSROOT -It will be replaced by the current sysroot. +Calculate the libdir relative to the fakeroot binary. Not for upstream. @@ -13,7 +12,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/fakeroot.in b/scripts/fakeroot.in -index 88ff313cc12a..701e8b3f0888 100755 +index 88ff313cc12a..4fc5eddf2262 100755 --- a/scripts/fakeroot.in +++ b/scripts/fakeroot.in @@ -30,12 +30,12 @@ fatal () @@ -22,13 +21,13 @@ index 88ff313cc12a..701e8b3f0888 100755 # strip /bin/fakeroot to find install prefix -FAKEROOT_PREFIX=@prefix@ -FAKEROOT_BINDIR=@bindir@ -+FAKEROOT_PREFIX="FAKEROOT_SYSROOT@prefix@" -+FAKEROOT_BINDIR="FAKEROOT_SYSROOT@bindir@" ++FAKEROOT_BINDIR="`dirname "$0"`" ++FAKEROOT_PREFIX="`dirname "$FAKEROOT_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 ++PATHS="${FAKEROOT_PREFIX}@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.21/series b/patches/fakeroot-1.21/series index 9c2b5eb15..325c79b1d 100644 --- a/patches/fakeroot-1.21/series +++ b/patches/fakeroot-1.21/series @@ -5,6 +5,6 @@ 0002-glibc-xattr-types.patch 0003-hide-dlsym-error.patch #tag:ptxdist --start-number 100 -0100-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch +0100-make-fakeroot-relocatable.patch 0101-fakeroot-disable-build-of-doc-and-test.patch -# 5ca44e32b3f56954f5e5f253d7c2d302 - git-ptx-patches magic +# 10e086ed26479131ecd760e5b7bb7cc2 - git-ptx-patches magic |