X-Git-Url: https://hackdaworld.org/gitweb/?p=hdw-linux%2Fhdw-linux.git;a=blobdiff_plain;f=packages%2Fbase%2Futil-linux%2Futil-linux;h=098c56e5658d923215cacb40e11dad2477cf747f;hp=a5cf895dd974aacf874cf40ccf130366f39550ef;hb=793f79d0d200544e7193cdfd4b66dc2479bf7247;hpb=6ae193981fcc05dcc495b4bde92cb8fd290ee4dd

diff --git a/packages/base/util-linux/util-linux b/packages/base/util-linux/util-linux
index a5cf895..098c56e 100644
--- 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.12a
-# [S] 1-8 2-15
-# [D] util-linux-2.12a.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,17 +19,25 @@ 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~ &&
 		mv tmp~ hwclock/hwclock.c &&
 		mkdir -p $root/var/lib/hwclock
 			}
+	post_install()	{
+		cp $confdir/setclock_conf $root/etc/conf/setclock
+		chmod 644 $root/etc/conf/setclock
+		cp $confdir/setclock_script $root/etc/init.d/setclock
+		chmod 750 $root/etc/init.d/setclock
+		ln -svf ../setclock $root/etc/init.d/rc2.d/S05setclock
+		ln -svf ../setclock $root/etc/init.d/rc2.d/K95setclock
+			}
 confopt=""
 make_conf="HAVE_SLN=yes HAVE_KILL=yes"
 install_conf="HAVE_SLN=yes HAVE_KILL=yes"