Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=a28574dd70316461ab0d870542584aa380f21640

commit a28574dd70316461ab0d870542584aa380f21640
Author: Miklos Vajna <[email protected]>
Date:   Sun Jun 12 02:18:09 2011 +0200

util-linux-2.19.1-2-i686

- drop no longer necessary rc.time service (kernel syncs time to RTC)
- closes #4512

diff --git a/source/base/util-linux/FrugalBuild 
b/source/base/util-linux/FrugalBuild
index 9afda84..cc6994a 100644
--- a/source/base/util-linux/FrugalBuild
+++ b/source/base/util-linux/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=util-linux
pkgver=2.19.1
-pkgrel=1
+pkgrel=2
pkgdesc="Miscellaneous system utilities for Linux"
url="http://www.kernel.org/pub/linux/utils/util-linux";
backup=('etc/sysconfig/numlock')
@@ -17,11 +17,11 @@ archs=('i686' 'x86_64' 'ppc' 'arm')
up2date="lynx -dump 'http://git.kernel.org/?p=utils/util-linux/util-linux.git' 
|grep 'release v'|sed 's/.* .*v\(.*\) .*release .*/\1/'|grep -m1 -v 'rc'"
# see bzr for more description on ${pkgver%%.?}
source=($url/v${pkgver%%.?}/util-linux-$pkgver.tar.bz2 \
-       frugalwaregetty numlock rc.{mount,rmount,swap,time} \
+       frugalwaregetty numlock rc.{mount,rmount,swap} \
rc.mount-{de,hu}.po rc.rmount-{de,hu}.po \
-       rc.swap-{de,hu}.po rc.time-{de,hu}.po \
+       rc.swap-{de,hu}.po \
README.Frugalware)
-signatures=($source.sign '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
+signatures=($source.sign '' '' '' '' '' '' '' '' '' '' '' '')

subpkgs=("${subpkgs[@]}" "libblkid")
subdescs=("${subdescs[@]}" 'Block device id library')
@@ -69,10 +69,6 @@ build() {
Fln remount-rootfs.service /lib/systemd/system/mount.service
Fln remount-rootfs.service /lib/systemd/system/rmount.service
Fln remount-rootfs.service /lib/systemd/system/swap.service
-       if [ "$CARCH" != "ppc" ]; then
-               Frcd2 time
-               Fln hwclock-load.service /lib/systemd/system/time.service
-       fi

# Our getty.
Fexe /sbin/frugalwaregetty
diff --git a/source/base/util-linux/pot/rc.time.pot 
b/source/base/util-linux/pot/rc.time.pot
deleted file mode 100644
index d631339..0000000
--- a/source/base/util-linux/pot/rc.time.pot
+++ /dev/null
@@ -1,33 +0,0 @@
-# rc.time.
-# Copyright (C) YEAR THE rc.time'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the rc.time package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: rc.time\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-14 20:11+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: rc.time:26
-msgid "Setting system time from the hardware clock"
-msgstr ""
-
-#: rc.time:30 rc.time:45
-msgid "Using UTC"
-msgstr ""
-
-#: rc.time:34 rc.time:49
-msgid "Using localtime"
-msgstr ""
-
-#: rc.time:40
-msgid "Saving the system time to the hardware clock"
-msgstr ""
diff --git a/source/base/util-linux/rc.time b/source/base/util-linux/rc.time
deleted file mode 100644
index 77a15e0..0000000
--- a/source/base/util-linux/rc.time
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-
-# (c) 2005      Marcus Habermehl <[email protected]>
-# (c) 2003-2005 Vajna Miklos <[email protected]>
-# (c)           Patrick J. Volkerding, <[email protected]>
-# rc.time for Frugalware
-# distributed under GPL License
-
-# chkconfig: - 00 05
-# description: Set/save the system time to/from the hardware clock using \
-#             hwclock.
-
-source /lib/initscripts/functions
-TEXTDOMAIN=time
-TEXTDOMAINDIR=/lib/initscripts/messages
-
-actions=(restart start stop)
-
-if [ -z $2 ] ; then
-       rl=4
-else
-       rl=$2
-fi
-
-rc_start()
-{
-       msg $"Setting system time from the hardware clock"
-       if grep -q "^UTC" /etc/hardwareclock ; then
-               /sbin/hwclock --utc --hctosys
-               ok $?
-               hint $"Using UTC"
-       else
-               /sbin/hwclock --localtime --hctosys
-               ok $?
-               hint $"Using localtime"
-       fi
-}
-
-rc_stop()
-{
-       msg $"Saving the system time to the hardware clock"
-       if (( ${rl} == 0 )) || (( ${rl} == 6 )) ; then
-               if grep -q "^UTC" /etc/hardwareclock ; then
-                       /sbin/hwclock --utc --systohc
-                       ok $?
-                       hint $"Using UTC"
-               else
-                       /sbin/hwclock --localtime --systohc
-                       ok $?
-                       hint $"Using localtime"
-               fi
-       else
-               ok 999
-       fi
-}
-
-rc_exec $1
-
-# vim: ft=sh
diff --git a/source/base/util-linux/rc.time-de.po 
b/source/base/util-linux/rc.time-de.po
deleted file mode 100644
index a0df3ea..0000000
--- a/source/base/util-linux/rc.time-de.po
+++ /dev/null
@@ -1,33 +0,0 @@
-# rc.time.
-# Copyright (C) 2005 THE rc.time'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the rc.time package.
-# Marcus Habermehl <[email protected]>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: rc.time\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-14 20:11+0100\n"
-"PO-Revision-Date: 2005-11-14 20:12+0100\n"
-"Last-Translator: Marcus Habermehl <[email protected]>\n"
-"Language-Team: German <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: rc.time:26
-msgid "Setting system time from the hardware clock"
-msgstr "Lade Systemzeit aus der Hardwareuhr"
-
-#: rc.time:30 rc.time:45
-msgid "Using UTC"
-msgstr "Benutze UTC"
-
-#: rc.time:34 rc.time:49
-msgid "Using localtime"
-msgstr "Benutze localtime"
-
-#: rc.time:40
-msgid "Saving the system time to the hardware clock"
-msgstr "Sichere die Systemzeit in der Hardwareuhr"
diff --git a/source/base/util-linux/rc.time-hu.po 
b/source/base/util-linux/rc.time-hu.po
deleted file mode 100644
index c554c8c..0000000
--- a/source/base/util-linux/rc.time-hu.po
+++ /dev/null
@@ -1,33 +0,0 @@
-# rc.time.
-# Copyright (C) 2005 THE rc.time'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the rc.time package.
-# Marcus Habermehl <[email protected]>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: rc.time\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-14 20:11+0100\n"
-"PO-Revision-Date: 2005-11-14 20:12+0100\n"
-"Last-Translator: Marcus Habermehl <[email protected]>\n"
-"Language-Team: Hungarian <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: rc.time:26
-msgid "Setting system time from the hardware clock"
-msgstr "Az idõ beállítása"
-
-#: rc.time:30 rc.time:45
-msgid "Using UTC"
-msgstr "UTC idõ beállítása"
-
-#: rc.time:34 rc.time:49
-msgid "Using localtime"
-msgstr "Helyi idõ használata"
-
-#: rc.time:40
-msgid "Saving the system time to the hardware clock"
-msgstr "Az idõ elmentése"
diff --git a/source/base/util-linux/util-linux.install 
b/source/base/util-linux/util-linux.install
index 270e79e..019136f 100644
--- a/source/base/util-linux/util-linux.install
+++ b/source/base/util-linux/util-linux.install
@@ -3,11 +3,9 @@ post_install() {
cd /etc/rc.d/rcS.d
ln -sf ../rc.mount S16rc.mount
ln -sf ../rc.swap S17rc.swap
-       [ "`uname -m`" != "ppc" ] && ln -sf ../rc.time S18rc.time
[ "`type -p chkconfig`" ] && chkconfig --add rc.rmount
[ "`type -p chkconfig`" ] && chkconfig --add rc.swap
[ "`type -p chkconfig`" ] && chkconfig --add rc.mount
-       [ "`uname -m`" != "ppc" -a "`type -p chkconfig`" ] && chkconfig --add 
rc.time
echo -n "generating the top-level Info node... "
mkinfodir /usr/share/info > /usr/share/info/dir 2> /dev/null
echo "done."
@@ -20,14 +18,15 @@ post_upgrade() {
# can be removed after Frugalware-1.5
rm -f /etc/rc.d/rcS.d/S19rc.bootclean
chkconfig --del rc.console >/dev/null 2>&1
+       rm -f /etc/rc.d/rcS.d/S18rc.time
+       chkconfig --del rc.time >/dev/null 2>&1
}

pre_remove() {
-       rm -f /etc/rc.d/rcS.d/S{16rc.mount,17rc.swap,18rc.time}
+       rm -f /etc/rc.d/rcS.d/S{16rc.mount,17rc.swap}
[ "`type -p chkconfig`" ] && chkconfig --del rc.rmount
[ "`type -p chkconfig`" ] && chkconfig --del rc.swap
[ "`type -p chkconfig`" ] && chkconfig --del rc.mount
-       [ "`uname -m`" != "ppc" -a "`type -p chkconfig`" ] && chkconfig --del 
rc.time
}

post_remove() {
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to