[Lunar-commits] <moonbase> Revert "coreutils: removed ugly hacks forcing to out of standards legacy /bin. Compat symlinks added to /bin for out of specs apps"

[Zbigniew Luszpinski]

commit 276204c6b26a5f55f9577d90ce3b936237864b26
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Mon Apr 30 12:34:48 2012 +0200

    Revert "coreutils: removed ugly hacks forcing to out of standards legacy /bin. Compat symlinks added to /bin for out of specs apps"
    
    This reverts commit f1bf4c8810ae137161d3e0e84980f917af2aca47.
---
 utils/coreutils/BUILD |   25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/utils/coreutils/BUILD b/utils/coreutils/BUILD
index c615e93..4463e89 100644
--- a/utils/coreutils/BUILD
+++ b/utils/coreutils/BUILD
@@ -18,18 +18,35 @@
   # This option resolves conflicts with shadow/heimdal, net-tools and procps
   OPTS+=" --enable-no-install-program=arch,hostname,su,groups,kill,uptime"  &&
 
+  # tchan added this hack for coreutils > 6.x
+  export CHGRPPROG=/bin/chgrp  &&
+  export CHMODPROG=/bin/chmod  &&
+  export    CPPROG=/bin/cp     &&
+  export MKDIRPROG=/bin/mkdir  &&
+  export    MVPROG=/bin/mv     &&
+  export    RMPROG=/bin/rm     &&
   DEFAULT_POSIX2_VERSION=199209 default_build  &&
 
   (
     for FILE in basename cat cp chgrp chmod chown cut date dd df echo false  \
-                head id ln ls mkdir mknod mv nice pwd rm rmdir sleep sort    \
+                head id ln ls mkdir mknod nice pwd rm rmdir sleep sort       \
                 stty sync tail tr true uname ; do
       if [ -f /usr/bin/$FILE ] ; then
-        /usr/bin/ln -sf /usr/bin/$FILE /bin/
+        /bin/mv -f /usr/bin/$FILE /bin
       fi
     done  &&
+    # mv cannot be mv'ed:
+    if [ -f /usr/bin/mv ] ; then
+      cp /usr/bin/mv /bin/mv  &&
+      rm /usr/bin/mv
+    fi  &&
     # also, bash will need to rehash, but doesn't:
-    /usr/bin/mv -f /usr/bin/chroot /usr/sbin/
-  )
+    /bin/mv -f /usr/bin/chroot /usr/sbin
+  )  &&
+
+  # Some apps use fixed paths to /usr/bin so we add a symlink to make
+  # them happy. For example see config.log of any compiled app to see that
+  # autoconf looks for this coreutils app only inside /usr/bin
+  ln -sf /bin/uname /usr/bin/uname
 
 ) > $C_FIFO 2>&1