diff options
| -rw-r--r-- | patches/fakeroot-1.14.4/add-sysroot-prefix.diff | 34 | ||||
| -rw-r--r-- | patches/fakeroot-1.14.4/series | 1 | ||||
| -rw-r--r-- | rules/host-fakeroot.make | 11 |
3 files changed, 46 insertions, 0 deletions
diff --git a/patches/fakeroot-1.14.4/add-sysroot-prefix.diff b/patches/fakeroot-1.14.4/add-sysroot-prefix.diff new file mode 100644 index 000000000..38239568e --- /dev/null +++ b/patches/fakeroot-1.14.4/add-sysroot-prefix.diff @@ -0,0 +1,34 @@ +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 new file mode 100644 index 000000000..1ff956dd2 --- /dev/null +++ b/patches/fakeroot-1.14.4/series @@ -0,0 +1 @@ +add-sysroot-prefix.diff diff --git a/rules/host-fakeroot.make b/rules/host-fakeroot.make index 64e6d6b8c..0bc49cc74 100644 --- a/rules/host-fakeroot.make +++ b/rules/host-fakeroot.make @@ -39,4 +39,15 @@ $(HOST_FAKEROOT_SOURCE): HOST_FAKEROOT_CONF_TOOL := autoconf +# ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/host-fakeroot.install.post: + @$(call targetinfo) + @$(call world/install.post, HOST_FAKEROOT) + @sed -ie 's,FAKEROOT_SYSROOT,$(PTXCONF_SYSROOT_HOST),' \ + $(PTXCONF_SYSROOT_HOST)/bin/fakeroot + @$(call touch) + # vim: syntax=make |