Revert "package/pseudo: provide better legacy handling for fakeroot"

This reverts commit 499f28fc7ce6184c8017ccd229ffc973a520adde.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/pseudo/pseudo-wrapper b/package/pseudo/pseudo-wrapper
index 9c8dbdbfab7b4bdda6bff11a6a1daa1d44abad9f..feaa7fcecbcceaa99a3590d0ad2654f15156eec6 100644 (file)
--- a/package/pseudo/pseudo-wrapper
+++ b/package/pseudo/pseudo-wrapper
@@ -1,12 +1,5 @@
 #!/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
@@ -16,4 +9,4 @@ if [ -n "${BASE_DIR}" ]; then
     export PSEUDO_LOCALSTATEDIR="${BASE_DIR}/build/.pseudodb"
 fi
 
-exec "${0%/*}/pseudo" "${@}"
+exec "${0%-wrapper}" "${@}"

diff --git a/package/pseudo/pseudo.mk b/package/pseudo/pseudo.mk
index aa2a9c78a07916a675c75869c647ff3e7651a3ec..7701825343cdbab18fd9222b5b71a8fe25315208 100644 (file)
--- 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-wrapper $(HOST_DIR)/usr/bin/fakeroot
+       ln -sf pseudo $(HOST_DIR)/usr/bin/fakeroot
 endef
 HOST_PSEUDO_POST_INSTALL_HOOKS += HOST_PSEUDO_FAKEROOT_SYMLINK