[openwrt/openwrt] fakeroot: make fakeroot script relocatable

LEDE Commits lede-commits at lists.infradead.org
Thu Oct 29 20:40:49 EDT 2020


dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/f93cb5c2c8dcffae6f7bc80b9c7807de30d67371

commit f93cb5c2c8dcffae6f7bc80b9c7807de30d67371
Author: Jo-Philipp Wich <jo at mein.io>
AuthorDate: Thu Sep 10 14:52:31 2020 +0200

    fakeroot: make fakeroot script relocatable
    
    Patch the fakeroot script template to discover faked and libfakeroot.so
    relative to the STAGING_DIR_HOST environment variable, similar to how it
    is done for automake, libtool, quilt and autoconf already.
    
    This avoids the need for passing the paths to faked and libfakeroot.so
    manually every time we invoke fakeroot and subsequently allows us to
    drop OS X specific logic.
    
    Signed-off-by: Jo-Philipp Wich <jo at mein.io>
---
 tools/fakeroot/patches/000-relocatable.patch | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tools/fakeroot/patches/000-relocatable.patch b/tools/fakeroot/patches/000-relocatable.patch
new file mode 100644
index 0000000000..9f6915bfe8
--- /dev/null
+++ b/tools/fakeroot/patches/000-relocatable.patch
@@ -0,0 +1,25 @@
+--- a/scripts/fakeroot.in
++++ b/scripts/fakeroot.in
+@@ -30,12 +30,19 @@ fatal ()
+ }
+ 
+ # strip /bin/fakeroot to find install prefix
+-FAKEROOT_PREFIX=@prefix@
+-FAKEROOT_BINDIR=@bindir@
++if [ -n "$STAGING_DIR_HOST" ]; then
++    FAKEROOT_PREFIX="${STAGING_DIR_HOST}"
++    FAKEROOT_BINDIR="${STAGING_DIR_HOST}/bin"
++    FAKEROOT_LIBDIR="${STAGING_DIR_HOST}/lib"
++else
++    FAKEROOT_PREFIX=@prefix@
++    FAKEROOT_BINDIR=@bindir@
++    FAKEROOT_LIBDIR=@libdir@
++fi
+ 
+ USEABSLIBPATH=@LDPRELOADABS@
+ LIB=lib at fakeroot_transformed@@DLSUFFIX@
+-PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
++PATHS=${FAKEROOT_LIBDIR}:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
+ FAKED=${FAKEROOT_BINDIR}/@faked_transformed@
+ 
+ FAKED_MODE="unknown-is-root"



More information about the lede-commits mailing list