Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d22d50796b9e742135628ae40ee97006b8d59016
commit d22d50796b9e742135628ae40ee97006b8d59016 Author: Miklos Vajna <[email protected]> Date: Tue May 3 09:52:35 2011 +0200 util-linux-2.19.1-1-i686 - version bump - drop rc.console: its stop target is empty, so it's not needed on upgrade diff --git a/source/base/util-linux/FrugalBuild b/source/base/util-linux/FrugalBuild index 3bb0aa0..9afda84 100644 --- a/source/base/util-linux/FrugalBuild +++ b/source/base/util-linux/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Miklos Vajna <[email protected]> pkgname=util-linux -pkgver=2.19 -pkgrel=3 +pkgver=2.19.1 +pkgrel=1 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux" -backup=('etc/sysconfig/console' 'etc/sysconfig/numlock') +backup=('etc/sysconfig/numlock') depends=('bash' 'ncurses>=5.6-4' 'zlib>=1.2.3-6' 'texinfo>=4.11-3') makedepends=('cvs') replaces=('util-linux-ng' 'linux32') @@ -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.{console,mount,rmount,swap,time} \ + frugalwaregetty numlock rc.{mount,rmount,swap,time} \ rc.mount-{de,hu}.po rc.rmount-{de,hu}.po \ rc.swap-{de,hu}.po rc.time-{de,hu}.po \ README.Frugalware) -signatures=($source.sign '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') +signatures=($source.sign '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') subpkgs=("${subpkgs[@]}" "libblkid") subdescs=("${subdescs[@]}" 'Block device id library') @@ -64,13 +64,11 @@ build() { do Frcd2 $i done - Fexe /etc/rc.d/rc.console # don't run old sysv init script with different name when using systemd Fmkdir /lib/systemd/system 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 - Fln systemd-vconsole-setup.service /lib/systemd/system/console.service if [ "$CARCH" != "ppc" ]; then Frcd2 time Fln hwclock-load.service /lib/systemd/system/time.service @@ -80,9 +78,6 @@ build() { Fexe /sbin/frugalwaregetty Ffile /etc/sysconfig/numlock - # Console config. - echo "idle=15" > $Fdestdir/etc/sysconfig/console - # Documentation. Fdoc README.Frugalware Fdocrel docs/* diff --git a/source/base/util-linux/rc.console b/source/base/util-linux/rc.console deleted file mode 100644 index 63a7ee2..0000000 --- a/source/base/util-linux/rc.console +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -# (c) 2005 Marcus Habermehl <[email protected]> -# (c) 2003-2005 Vajna Miklos <[email protected]> -# rc.console for Frugalware -# distributed under GPL License - -# chkconfig: 2345 00 98 -# description: Screen blanks after n minutes idle time. - -source /lib/initscripts/functions - -actions=(start stop) - -rc_start() -{ - if [ -e /etc/sysconfig/console ] ; then - source /etc/sysconfig/console - setterm -blank $idle - fi -} - -rc_stop() -{ - /bin/true -} - -rc_exec $1 - -# vim: ft=sh diff --git a/source/base/util-linux/util-linux.install b/source/base/util-linux/util-linux.install index 07252f3..270e79e 100644 --- a/source/base/util-linux/util-linux.install +++ b/source/base/util-linux/util-linux.install @@ -4,7 +4,6 @@ post_install() { 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.console [ "`type -p chkconfig`" ] && chkconfig --add rc.rmount [ "`type -p chkconfig`" ] && chkconfig --add rc.swap [ "`type -p chkconfig`" ] && chkconfig --add rc.mount @@ -18,12 +17,13 @@ post_upgrade() { echo -n "generating the top-level Info node... " mkinfodir /usr/share/info > /usr/share/info/dir 2> /dev/null echo "done." + # can be removed after Frugalware-1.5 rm -f /etc/rc.d/rcS.d/S19rc.bootclean + chkconfig --del rc.console >/dev/null 2>&1 } pre_remove() { rm -f /etc/rc.d/rcS.d/S{16rc.mount,17rc.swap,18rc.time} - [ "`type -p chkconfig`" ] && chkconfig --del rc.console [ "`type -p chkconfig`" ] && chkconfig --del rc.rmount [ "`type -p chkconfig`" ] && chkconfig --del rc.swap [ "`type -p chkconfig`" ] && chkconfig --del rc.mount _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
