From 499f28fc7ce6184c8017ccd229ffc973a520adde Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 8 Nov 2016 23:18:35 +0100 Subject: [PATCH] package/pseudo: provide better legacy handling for fakeroot MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We now have a wrapper that makes pseudo behaves like the fakeroot of the good ol' days. So the symlink will just magically keep old scripts working as they did before the switch to pseudo. However, using fakeroot is deprecated, and we want people to stop using it altogether and switch to pseudo. So, make the wrapper recognise how it's called, and if called as fakeroot, print a warning message. Signed-off-by: "Yann E. MORIN" Cc: Gaël PORTAY Cc: Patrick Keroulas Cc: Erico Nunes Cc: Julien BOIBESSOT Cc: Arnout Vandecappelle Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/pseudo/pseudo-wrapper | 9 ++++++++- package/pseudo/pseudo.mk | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/pseudo/pseudo-wrapper b/package/pseudo/pseudo-wrapper index feaa7fcecb..9c8dbdbfab 100644 --- a/package/pseudo/pseudo-wrapper +++ b/package/pseudo/pseudo-wrapper @@ -1,5 +1,12 @@ #!/bin/sh +if [ "${0##*/}" = "fakeroot" ]; then + cat >&2 <<-_EOF_ + WARNING: fakeroot has been replaced with pseudo. + WARNING: Update your script(s) to use pseudo or pseudo-wrapper instead. + _EOF_ +fi + export PSEUDO_PREFIX="$(dirname "${0%/*}")" export PSEUDO_OPTS="-t0" if [ -n "${TARGET_DIR}" ]; then @@ -9,4 +16,4 @@ if [ -n "${BASE_DIR}" ]; then export PSEUDO_LOCALSTATEDIR="${BASE_DIR}/build/.pseudodb" fi -exec "${0%-wrapper}" "${@}" +exec "${0%/*}/pseudo" "${@}" diff --git a/package/pseudo/pseudo.mk b/package/pseudo/pseudo.mk index 7701825343..aa2a9c78a0 100644 --- a/package/pseudo/pseudo.mk +++ b/package/pseudo/pseudo.mk @@ -33,7 +33,7 @@ endef HOST_PSEUDO_POST_INSTALL_HOOKS += HOST_PSEUDO_INSTALL_WRAPPER define HOST_PSEUDO_FAKEROOT_SYMLINK - ln -sf pseudo $(HOST_DIR)/usr/bin/fakeroot + ln -sf pseudo-wrapper $(HOST_DIR)/usr/bin/fakeroot endef HOST_PSEUDO_POST_INSTALL_HOOKS += HOST_PSEUDO_FAKEROOT_SYMLINK -- 2.30.2