Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=434385a85f57de5c80ff7626f37d1e43b5f4b212
commit 434385a85f57de5c80ff7626f37d1e43b5f4b212 Author: Miklos Vajna <[email protected]> Date: Mon Nov 5 22:18:34 2012 +0100 sysvinit-2.88-17-x86_64 - drop rc.functions and rc.messages, nothing depends on these now diff --git a/source/base-extra/sysvinit/FrugalBuild b/source/base-extra/sysvinit/FrugalBuild index cc0a96c..02509d3 100644 --- a/source/base-extra/sysvinit/FrugalBuild +++ b/source/base-extra/sysvinit/FrugalBuild @@ -4,7 +4,7 @@ pkgname=sysvinit pkgver=2.88 pkgextraver=dsf -pkgrel=16 +pkgrel=17 pkgdesc="Init, the parent of all processes" url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/"; depends=() @@ -13,8 +13,8 @@ groups=('base-extra') archs=('i686' 'x86_64' 'arm') up2date="Flasttar http://download.savannah.gnu.org/releases/$pkgname"; source=(http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver$pkgextraver.tar.bz2 \ - functions functions-{de,hu,it}.po inittab rc.{de,en,hu,it} \ - rc.functions rc.local rc.messages sysvinit-2.86.diff local.service) + functions functions-{de,hu,it}.po inittab \ + rc.local sysvinit-2.86.diff local.service) subpkgs=("${subpkgs[@]}" "$pkgname-initscripts") subdescs=("${subdescs[@]}" 'System V init scripts.') @@ -38,13 +38,7 @@ sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26' \ '83e5879898d7750b157552606a62f0f7bf1f0c97' \ 'f16abb4a07b323a739b5b12d24d793559a22192d' \ '8322ba55d54522ffb2963c5503a44f774b04fe9a' \ - '7d507be266edd617545118f4bff80ab064744230' \ - 'be843c12f8e7b3db98efd7bea36ba8974c65e2bc' \ - '16b704d3ec13c0e980cec2c4f800fa7f736ac279' \ - '1c4c151b15ac5c038207a5fc472988eeca1b8f27' \ - 'f023cb3f93bf976cf51fa9ab2ab3cffb19ec7264' \ '842e99103033eb3eaa069d645fdc1b2cd9fd7c24' \ - 'c2075ca5be14e318cac2abd2c424715e399d7bfd' \ '837541969bec9e391bd77a2c1a0cca5f7fb20e9b' \ 'f19ded8c1d2a7223ae19d151b24154ae269c5ccf') @@ -69,11 +63,9 @@ build() Ffile /etc/inittab - Fexe rc.{functions,local} /etc/rc.d/ + Fexe /etc/rc.d/rc.local Ffile /lib/systemd/system/local.service - Ffile rc.{messages,de,en,hu,it} /etc/rc.d/rc.messages/ - Fsplit $pkgname-initscripts /etc/ Fsplit $pkgname-initscripts /lib/initscripts/ /lib/systemd/ diff --git a/source/base-extra/sysvinit/rc.de b/source/base-extra/sysvinit/rc.de deleted file mode 100644 index 63432a9..0000000 --- a/source/base-extra/sysvinit/rc.de +++ /dev/null @@ -1,2 +0,0 @@ -ok=' OK ' -error=' FEHLER ' diff --git a/source/base-extra/sysvinit/rc.en b/source/base-extra/sysvinit/rc.en deleted file mode 100644 index 5c921c9..0000000 --- a/source/base-extra/sysvinit/rc.en +++ /dev/null @@ -1,2 +0,0 @@ -ok=' OK ' -error=' FAILED ' diff --git a/source/base-extra/sysvinit/rc.functions b/source/base-extra/sysvinit/rc.functions deleted file mode 100644 index 7fb9275..0000000 --- a/source/base-extra/sysvinit/rc.functions +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -# (c) 2004 Vajna Miklos <[email protected]> -# rc.functions for Frugalware -# distributed under GPL License - - -start() { - echo -ne "\e[01;36m::\e[0m \e[01m$1\e[0m" -} - -stop() { - echo -ne "\e[01;36m::\e[0m \e[01m$1\e[0m" -} - -print() { - # $1: color; $2: message - if [[ "$(echo $LANG | cut -d _ -f 1)" == "de" ]] ; then - cols=$(($(tput cols) - 14)) - else - cols=$(($(tput cols) - 10)) - fi - echo -ne $'\e['${cols}$'G\e[01m[\e[01;'${1}m - echo -n "$2" - echo -e '\e[0;39m\e[01m]\e[0m' -} - -ok() { - case $1 in - 0) print 32 "$ok";; - *) print 31 "$error";; - esac -} - -. /etc/rc.d/rc.messages/rc.messages diff --git a/source/base-extra/sysvinit/rc.hu b/source/base-extra/sysvinit/rc.hu deleted file mode 100644 index bafb9a5..0000000 --- a/source/base-extra/sysvinit/rc.hu +++ /dev/null @@ -1,2 +0,0 @@ -ok=' OK ' -error=' HIBA ' diff --git a/source/base-extra/sysvinit/rc.it b/source/base-extra/sysvinit/rc.it deleted file mode 100644 index bc9844f..0000000 --- a/source/base-extra/sysvinit/rc.it +++ /dev/null @@ -1,2 +0,0 @@ -ok=' OK ' -error=' ERRORE ' diff --git a/source/base-extra/sysvinit/rc.messages b/source/base-extra/sysvinit/rc.messages deleted file mode 100644 index bb545b1..0000000 --- a/source/base-extra/sysvinit/rc.messages +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -# (c) 2004 Vajna Miklos <[email protected]> -# rc.messages for FrugalWare -# distributed under GPL License - -messagesdir=/etc/rc.d/rc.messages - -# note that this should be in $messagesdir and not -# in /var/lib/frugalware/messages - -myname=`echo $0 |sed "s/^[SK[:digit:]]//g"|tr '/' '\n'|tr '.' '\n'|tail -n 1` -lang=`echo $LANG|cut -d _ -f 1` - -for i in $messagesdir/$myname $messagesdir/rc -do - if [ -e $i.$lang ]; then - . $i.$lang - else - . $i.en - fi -done diff --git a/source/base-extra/sysvinit/sysvinit-initscripts.install b/source/base-extra/sysvinit/sysvinit-initscripts.install index f0842ca..66af670 100644 --- a/source/base-extra/sysvinit/sysvinit-initscripts.install +++ b/source/base-extra/sysvinit/sysvinit-initscripts.install @@ -4,15 +4,6 @@ post_install() { post_upgrade() { systemctl daemon-reload >/dev/null 2>&1 - # can be removed after Frugalware-1.6 - rm -f /etc/rc.d/rc?.d/???rc.single - rm -f /etc/rc.d/rc?.d/???rc.reboot - rmdir /etc/rc.d/rcS.d &>/dev/null - if [ `vercmp $2 2.88-12` -lt 0 ] ; then - if chkconfig rc.local; then - post_install - fi - fi } pre_remove() { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
