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

commit 5c9d4175b253993286c844e724e3783c04325d4c
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Mon Apr 18 21:53:58 2011 +0200

plymouth-0.8.4-4-i686
*remove all useless services
*replace splashy

diff --git a/source/xapps-extra/plymouth/FrugalBuild 
b/source/xapps-extra/plymouth/FrugalBuild
index 0ba95d3..7051c02 100644
--- a/source/xapps-extra/plymouth/FrugalBuild
+++ b/source/xapps-extra/plymouth/FrugalBuild
@@ -5,11 +5,12 @@ USE_DEVEL=${USE_DEVEL:-"n"}

pkgname=plymouth
pkgver=0.8.4
-pkgrel=3
+pkgrel=4
pkgdesc="Graphical Boot Animation and Logger"
url="http://www.freedesktop.org/wiki/Software/Plymouth";
up2date="Flasttarbz2 http://freedesktop.org/software/plymouth/releases";

+replaces=('splashy')
depends=('libdrm' 'pango' 'libstdc++' 'libxml2>=2.7.8' 'libxau' 'libxdmcp' 
'gtk+2')
rodepends=('plymouth-theme-spinfinity')
groups=('xapps-extra')
@@ -21,7 +22,7 @@ Fconfopts=" --enable-tracing --disable-tests  \
--with-background-end-color-stop=0x00457E \
--with-background-color=0x3391cd \
--enable-gdm-transition \
-       --with-shutdown-tty=7 \
+       --with-shutdown-tty=12 \
--with-system-root-install \
--with-logo=/usr/share/pixmaps/fw.png"

@@ -34,28 +35,9 @@ else
#source=(http://freedesktop.org/software/plymouth/releases/$pkgname-$pkgver.tar.bz2
 fw.png)
#use a snaphot
source=(http://ftp.frugalware.org/pub/other/people/bouleetbil/sources/$pkgname-$pkgver.tar.bz2
 \
-               fw.png \
-               plymouth-halt.service \
-               plymouth-kexec.service \
-               plymouth-poweroff.service \
-               plymouth-quit.service \
-               plymouth-reboot.service \
-               plymouth-start.service \
-               rc.plymouth \
-               rc.zz-plymouth \
-               systemd-plymouth)
+               fw.png)
sha1sums=('d7ec4a69a6ce2b50d9daf7af961b375fe3d96963' \
-          '5cc04b415cf32353333106fb200244765f86b844' \
-          '6963d3a0778ea651e73cbd9856f506692e4309d4' \
-          'bb81749ac32b1c4d55c8a1a3606a033d9125e19c' \
-          '3a915a29e7423fe502b5d377a3f1c8d4cac4f9f4' \
-          '131b972feaecae30fb79e340ed3eb2ea15ba18ad' \
-          'e5be4019e7329bb1fe3db3a026718f901a47ee3b' \
-          '029bf2a517c446cc06bb47c51ec0d9a0c4bd6842' \
-          '0c7c6e37772c1e09d0173d78114f061426091bdc' \
-          '3bf2ae558ac4dc4906752b4865c4fb80998a7adc' \
-          '4d208ac46eea917aaf1f96b33ab7905e6b8dae11')
-
+          '5cc04b415cf32353333106fb200244765f86b844')
fi

subpkgs=('plymouth-theme-spinfinity' 'plymouth-theme-solar' 
'plymouth-theme-glow')
@@ -81,21 +63,6 @@ build() {
Fsplit plymouth-theme-solar usr/share/plymouth/themes/solar
Fsplit plymouth-theme-glow usr/share/plymouth/themes/glow

-       Frcd2 plymouth
-       Fexe /etc/rc.d/rc.zz-plymouth
-
-       # systemd
-       Fexe /lib/systemd/systemd-plymouth
-       Fmkdir 
/lib/systemd/system/{halt,kexec,poweroff,multi-user,reboot,sysinit}.target.wants
-       Ffile /lib/systemd/system/plymouth-halt.service
-       Ffile /lib/systemd/system/plymouth-kexec.service
-       Ffile /lib/systemd/system/plymouth-poweroff.service
-       Ffile /lib/systemd/system/plymouth-quit.service
-       Ffile /lib/systemd/system/plymouth-reboot.service
-       Ffile /lib/systemd/system/plymouth-start.service
-       # don't run old sysv init script with different name when using systemd
-       Fln plymouth-start.service /lib/systemd/system/plymouth.service
-       Fln plymouth-quit.service /lib/systemd/system/zz-plymouth.service
#systemd
Frm run/plymouth
Fmkdir /etc/tmpfiles.d
diff --git a/source/xapps-extra/plymouth/plymouth-halt.service 
b/source/xapps-extra/plymouth/plymouth-halt.service
deleted file mode 100644
index ac038db..0000000
--- a/source/xapps-extra/plymouth/plymouth-halt.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Show plymouth Halt Screen
-After=getty@tty1.service prefdm.service
-Before=halt.service
-DefaultDependencies=no
-
-[Service]
-ExecStart=/lib/systemd/systemd-plymouth 'Halting...'
-Type=forking
diff --git a/source/xapps-extra/plymouth/plymouth-kexec.service 
b/source/xapps-extra/plymouth/plymouth-kexec.service
deleted file mode 100644
index d347d33..0000000
--- a/source/xapps-extra/plymouth/plymouth-kexec.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Show plymouth Reboot with kexec Screen
-After=getty@tty1.service prefdm.service
-Before=kexec.service
-DefaultDependencies=no
-
-[Service]
-ExecStart=/lib/systemd/systemd-plymouth 'Rebooting with kexec...'
-Type=forking
diff --git a/source/xapps-extra/plymouth/plymouth-poweroff.service 
b/source/xapps-extra/plymouth/plymouth-poweroff.service
deleted file mode 100644
index 88cd7c0..0000000
--- a/source/xapps-extra/plymouth/plymouth-poweroff.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Show plymouth Power Off Screen
-After=getty@tty1.service prefdm.service
-Before=poweroff.service
-DefaultDependencies=no
-
-[Service]
-ExecStart=/lib/systemd/systemd-plymouth 'Powering Off...'
-Type=forking
diff --git a/source/xapps-extra/plymouth/plymouth-quit.service 
b/source/xapps-extra/plymouth/plymouth-quit.service
deleted file mode 100644
index b0c376f..0000000
--- a/source/xapps-extra/plymouth/plymouth-quit.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Terminate plymouth Boot Screen
-Before=getty@tty1.service
-After=dev-tty1.device local.service plymouth-start.service
-
-[Service]
-ExecStart=/bin/plymouth quit
-Type=oneshot
diff --git a/source/xapps-extra/plymouth/plymouth-reboot.service 
b/source/xapps-extra/plymouth/plymouth-reboot.service
deleted file mode 100644
index 604ee71..0000000
--- a/source/xapps-extra/plymouth/plymouth-reboot.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Show plymouth Reboot Screen
-After=getty@tty1.service prefdm.service
-Before=reboot.service
-DefaultDependencies=no
-
-[Service]
-ExecStart=/lib/systemd/systemd-plymouth 'Rebooting...'
-Type=forking
diff --git a/source/xapps-extra/plymouth/plymouth-start.service 
b/source/xapps-extra/plymouth/plymouth-start.service
deleted file mode 100644
index fe63db3..0000000
--- a/source/xapps-extra/plymouth/plymouth-start.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Show plymouth Boot Screen
-DefaultDependencies=no
-After=systemd-vconsole-setup.service udev-settle.service
-
-[Service]
-ExecStart=/lib/systemd/systemd-plymouth 'Booting...'
-Type=forking
diff --git a/source/xapps-extra/plymouth/plymouth.install 
b/source/xapps-extra/plymouth/plymouth.install
index d05ffd1..252e551 100644
--- a/source/xapps-extra/plymouth/plymouth.install
+++ b/source/xapps-extra/plymouth/plymouth.install
@@ -1,30 +1,5 @@
-enable_units()
-{
-       ln -s ../plymouth-halt.service /lib/systemd/system/halt.target.wants/
-       ln -s ../plymouth-kexec.service /lib/systemd/system/kexec.target.wants/
-       ln -s ../plymouth-poweroff.service 
/lib/systemd/system/poweroff.target.wants/
-       ln -s ../plymouth-quit.service 
/lib/systemd/system/multi-user.target.wants/
-       ln -s ../plymouth-reboot.service 
/lib/systemd/system/reboot.target.wants/
-       ln -s ../plymouth-start.service 
/lib/systemd/system/sysinit.target.wants/
-}
-
-disable_units()
-{
-       rm /lib/systemd/system/halt.target.wants/plymouth-halt.service
-       rm /lib/systemd/system/kexec.target.wants/plymouth-kexec.service
-       rm /lib/systemd/system/poweroff.target.wants/plymouth-poweroff.service
-       rm /lib/systemd/system/multi-user.target.wants/plymouth-quit.service
-       rm /lib/systemd/system/reboot.target.wants/plymouth-reboot.service
-       rm /lib/systemd/system/sysinit.target.wants/plymouth-start.service
-}
-
post_install()
{
-       cd /etc/rc.d/rcS.d
-       ln -sf ../rc.plymouth S03rc.plymouth
-       /usr/sbin/chkconfig --add rc.plymouth
-       /usr/sbin/chkconfig --add rc.zz-plymouth
-       enable_units
/usr/sbin/plymouth-set-default-theme spinfinity
echo "For enable plymouth you should add kernel parameter:"
echo "splash"
@@ -32,21 +7,10 @@ post_install()

post_upgrade()
{
-       if [ -e /etc/rc.d/rcS.d/S03rc.plymouth ]; then
-               enable_units
-       fi
echo "For enable plymouth you should add kernel parameter:"
echo "splash"
}

-pre_remove()
-{
-       disable_units
-       /usr/sbin/chkconfig --del rc.zz-plymouth
-       /usr/sbin/chkconfig --del rc.plymouth
-       rm /etc/rc.d/rcS.d/S03rc.plymouth
-}
-
op=$1
shift
$op $*
diff --git a/source/xapps-extra/plymouth/rc.plymouth 
b/source/xapps-extra/plymouth/rc.plymouth
deleted file mode 100755
index 1228860..0000000
--- a/source/xapps-extra/plymouth/rc.plymouth
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-### BEGIN INIT INFO
-# Default-Start: S
-### END INIT INFO
-
-# (c) 2010 bouleetbil <bouleet...@frogdev.info>
-# rc.plymouth for Frugalware
-# distributed under GPL License
-
-# chkconfig: - 00 00
-# description: Displays a nice splash screen during system boot and halt
-
-source /lib/initscripts/functions
-TEXTDOMAIN=plymouth
-TEXTDOMAINDIR=/lib/initscripts/messages
-
-actions=(start stop)
-
-rc_start()
-{
-       grep -q nosplashy /proc/cmdline && return
-       chvt 1
-       /sbin/plymouthd
-       sleep 2
-       /bin/plymouth --show-splash
-}
-
-rc_stop()
-{
-       rc_start shutdown
-}
-
-rc_exec $1
diff --git a/source/xapps-extra/plymouth/rc.zz-plymouth 
b/source/xapps-extra/plymouth/rc.zz-plymouth
deleted file mode 100755
index 6fa964c..0000000
--- a/source/xapps-extra/plymouth/rc.zz-plymouth
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# (c) 2009 bouleetbil <bouleet...@frogdev.info>
-# rc.zz-plymouth for Frugalware
-# distributed under GPL License
-
-# chkconfig: 2345 99 01
-# description: Shuts down the splash screen at the end of the boot
-source /lib/initscripts/functions
-actions=(start stop)
-
-rc_start()
-{
-       /bin/plymouth --quit
-}
-
-rc_stop()
-{
-       :
-}
-
-rc_exec $1
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to