more toolchain + stage 1 updates

[hdw-linux/hdw-linux.git] / packages / base / util-linux / util-linux

diff --git a/packages/base/util-linux/util-linux b/packages/base/util-linux/util-linux
index 0eac9de..098c56e 100644 (file)
--- a/packages/base/util-linux/util-linux
+++ b/packages/base/util-linux/util-linux
@@ -2,14 +2,14 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 2.12q
-# [S] 1-8 2-15
-# [D] util-linux-2.12q.tar.bz2 ftp://ftp.kernel.org/pub/linux/utils/util-linux/
+# [V] 2.12r
+# [S] 1-2 2-15
+# [D] util-linux-2.12r.tar.bz2 ftp://ftp.kernel.org/pub/linux/utils/util-linux/
 
-if [ "$hdw_status" = "1" ]; then
+if [ "$stage" = "1" ]; then
        pre_install()   {
-               cp configure configure.orig
-               sed "s%/usr/include%$prefix/include%g" configure.orig configure
+               sed "s%/usr/include%$prefix/include%g" configure > tmp~
+               mv tmp~ configure
                chmod 755 configure
                        }
        build_main()    {
@@ -19,11 +19,11 @@ if [ "$hdw_status" = "1" ]; then
                make -C text-utils more
                        }
        post_install()  {
-               cp mount/{mount,umount} text-utils/more $prefix/bin
+               cp -v mount/{mount,umount} text-utils/more $prefix/bin
                        }
 fi
 
-if [ "$hdw_status" = "2" ]; then
+if [ "$stage" = "2" ]; then
        pre_install()   {
                sed 's%etc/adjtime%var/lib/hwclock/adjtime%' \
                        hwclock/hwclock.c > tmp~ &&