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

commit de58a3c71c5faf843e36dd2113f651abaab9c67d
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Sat Dec 18 00:14:52 2010 +0100

plymouth-0.8.4-1-i686
*version bump (use snapshot)
*enable systemd support
*fixes lsb support
*should works out of box without initramfs
*added "splash" to kernel parameter for enable it

diff --git a/source/xapps-extra/plymouth/FrugalBuild 
b/source/xapps-extra/plymouth/FrugalBuild
index bb8f140..c3079af 100644
--- a/source/xapps-extra/plymouth/FrugalBuild
+++ b/source/xapps-extra/plymouth/FrugalBuild
@@ -1,54 +1,103 @@
# Compiling Time: 0.20 SBU
# Maintainer: bouleetbil <bouleet...@frogdev.info>

+USE_DEVEL=${USE_DEVEL:-"n"}
+
pkgname=plymouth
-pkgver=0.8.3
+pkgver=0.8.4
pkgrel=1
pkgdesc="Graphical Boot Animation and Logger"
url="http://www.freedesktop.org/wiki/Software/Plymouth";
up2date="Flasttarbz2 http://freedesktop.org/software/plymouth/releases";
-source=(http://freedesktop.org/software/plymouth/releases/$pkgname-$pkgver.tar.bz2
 \
-       fw.png rc.zz-plymouth rc.plymouth)
-depends=('libdrm' 'pango' 'libstdc++' 'libxml2' 'libxau' 'libxdmcp')
-makedepends=('gtk+2>=2.20.0-2' 'gdm')
+
+depends=('libdrm' 'pango' 'libstdc++' 'libxml2' 'libxau' 'libxdmcp' 'gtk+2')
#use nash of mkinitrd for switch the theme
rodepends=('plymouth-theme-spinfinity' 'mkinitrd')
groups=('xapps-extra')
archs=('i686 x86_64')
-sha1sums=('2fdd45d1bd0207e934d294925d0dfad515b16a8a' \
-          '5cc04b415cf32353333106fb200244765f86b844' \
-          '3bf2ae558ac4dc4906752b4865c4fb80998a7adc' \
-          'af0eb22938bfce8608ba95afcb93786b94b291f6')
+replaces=("plymouth-utility" "plymouth-gdm")

-subpkgs=('plymouth-utility' 'plymouth-gdm' 'plymouth-theme-spinfinity' 
'plymouth-theme-solar' 'plymouth-theme-glow')
-subdescs=("utilities that integrate with Plymouth" "Plymouth GDM integration" 
"plymouth theme spinfinity" "plymouth theme solar" "plymouth theme glow")
-subdepends=("gtk+2" "gdm" "" "" "")
-subrodepends=("plymouth" "plymouth plymouth-utility" "" "" "")
-subgroups=('xapps-extra' 'gnome-extra' 'xlib-extra' 'xlib-extra' 'xlib-extra')
-subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 
x86_64')
-
-build() {
-       Fbuild --enable-tracing --disable-tests  \
-       --without-default-plugin \
-       --with-logo=/usr/share/pixmaps/fw.png \
+Fconfopts=" --enable-tracing --disable-tests  \
--with-background-start-color-stop=0x0073B3 \
--with-background-end-color-stop=0x00457E \
--with-background-color=0x3391cd \
--enable-gdm-transition \
-       --with-shutdown-tty=12 \
-       --with-system-root-install
+       --with-shutdown-tty=7 \
+       --with-system-root-install \
+        --with-logo=/usr/share/pixmaps/fw.png"
+
+if Fuse $USE_DEVEL; then
+       pkgver=0.8.3.ge5a78dd
+       _F_scm_type="git"
+       _F_scm_url="git://anongit.freedesktop.org/plymouth"
+               Finclude scm
+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)
+       sha1sums=('d7ec4a69a6ce2b50d9daf7af961b375fe3d96963' \
+          '5cc04b415cf32353333106fb200244765f86b844' \
+          '6963d3a0778ea651e73cbd9856f506692e4309d4' \
+          'bb81749ac32b1c4d55c8a1a3606a033d9125e19c' \
+          '3a915a29e7423fe502b5d377a3f1c8d4cac4f9f4' \
+          '131b972feaecae30fb79e340ed3eb2ea15ba18ad' \
+          'e5be4019e7329bb1fe3db3a026718f901a47ee3b' \
+          '029bf2a517c446cc06bb47c51ec0d9a0c4bd6842' \
+          '0c7c6e37772c1e09d0173d78114f061426091bdc' \
+          '3bf2ae558ac4dc4906752b4865c4fb80998a7adc' \
+          '4d208ac46eea917aaf1f96b33ab7905e6b8dae11')
+
+fi
+
+subpkgs=('plymouth-theme-spinfinity' 'plymouth-theme-solar' 
'plymouth-theme-glow')
+subdescs=("plymouth theme spinfinity" "plymouth theme solar" "plymouth theme 
glow")
+subdepends=("" "" "")
+subrodepends=("" "" "")
+subgroups=('xlib-extra' 'xlib-extra' 'xlib-extra')
+subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64')

+build() {
+       if Fuse $USE_DEVEL; then
+               Funpack_scm
+               Fcd $pkgname
+       else
+               Fcd
+       fi
+       Fautoreconf
+       Fbuild
Fmkdir usr/share/pixmaps/
Fcp fw.png usr/share/pixmaps/

-       Fsplit plymouth-gdm 
usr/share/gdm/autostart/LoginWindow/plymouth-log-viewer.desktop
Fsplit plymouth-theme-spinfinity usr/share/plymouth/themes/spinfinity
Fsplit plymouth-theme-solar usr/share/plymouth/themes/solar
Fsplit plymouth-theme-glow usr/share/plymouth/themes/glow
-       Fsplit plymouth-utility usr/bin/plymouth-log-viewer

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
+
}

# optimization OK
diff --git a/source/xapps-extra/plymouth/README.Frugalware 
b/source/xapps-extra/plymouth/README.Frugalware
new file mode 100644
index 0000000..e113932
--- /dev/null
+++ b/source/xapps-extra/plymouth/README.Frugalware
@@ -0,0 +1,2 @@
+For use plymouth
+Just add kernel parameter : splash
diff --git a/source/xapps-extra/plymouth/devfb.diff 
b/source/xapps-extra/plymouth/devfb.diff
deleted file mode 100644
index c3949cf..0000000
--- a/source/xapps-extra/plymouth/devfb.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5fd3ed5a1f661eb1d99e1d4df5edad8410cc54e3 Mon Sep 17 00:00:00 2001
-From: root <r...@christoph.egore.lan>
-Date: Sun, 25 Oct 2009 03:55:54 +0100
-Subject: [PATCH] Gentoo does not have /dev/fb, but /dev/fb0 (at least on i915 
KMS)
-
----
- src/libply/ply-frame-buffer.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/libply/ply-frame-buffer.c b/src/libply/ply-frame-buffer.c
-index a1e4fcd..19aab4b 100644
---- a/src/libply/ply-frame-buffer.c
-+++ b/src/libply/ply-frame-buffer.c
-@@ -46,7 +46,7 @@
- #include <linux/fb.h>
-
- #ifndef PLY_FRAME_BUFFER_DEFAULT_FB_DEVICE_NAME
--#define PLY_FRAME_BUFFER_DEFAULT_FB_DEVICE_NAME "/dev/fb"
-+#define PLY_FRAME_BUFFER_DEFAULT_FB_DEVICE_NAME "/dev/fb0"
- #endif
-
- struct _ply_frame_buffer
---
-1.6.5
-
diff --git a/source/xapps-extra/plymouth/plymouth-halt.service 
b/source/xapps-extra/plymouth/plymouth-halt.service
new file mode 100644
index 0000000..ac038db
--- /dev/null
+++ b/source/xapps-extra/plymouth/plymouth-halt.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Show plymouth Halt Screen
+after=ge...@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
new file mode 100644
index 0000000..d347d33
--- /dev/null
+++ b/source/xapps-extra/plymouth/plymouth-kexec.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Show plymouth Reboot with kexec Screen
+after=ge...@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
new file mode 100644
index 0000000..88cd7c0
--- /dev/null
+++ b/source/xapps-extra/plymouth/plymouth-poweroff.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Show plymouth Power Off Screen
+after=ge...@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
new file mode 100644
index 0000000..b0c376f
--- /dev/null
+++ b/source/xapps-extra/plymouth/plymouth-quit.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Terminate plymouth Boot Screen
+before=ge...@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
new file mode 100644
index 0000000..604ee71
--- /dev/null
+++ b/source/xapps-extra/plymouth/plymouth-reboot.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Show plymouth Reboot Screen
+after=ge...@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
new file mode 100644
index 0000000..fe63db3
--- /dev/null
+++ b/source/xapps-extra/plymouth/plymouth-start.service
@@ -0,0 +1,8 @@
+[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 f54ce25..d05ffd1 100644
--- a/source/xapps-extra/plymouth/plymouth.install
+++ b/source/xapps-extra/plymouth/plymouth.install
@@ -1,24 +1,52 @@
-post_install() {
+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/
+}

-       /usr/sbin/plymouth-set-default-theme spinfinity
+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
+       /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"
}

-post_upgrade() {
-  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
index 1496331..1228860 100755
--- a/source/xapps-extra/plymouth/rc.plymouth
+++ b/source/xapps-extra/plymouth/rc.plymouth
@@ -1,6 +1,9 @@
#!/bin/bash
+### BEGIN INIT INFO
+# Default-Start: S
+### END INIT INFO

-# (c) 2009 bouleetbil <bouleet...@frogdev.info>
+# (c) 2010 bouleetbil <bouleet...@frogdev.info>
# rc.plymouth for Frugalware
# distributed under GPL License

diff --git a/source/xapps-extra/plymouth/systemd-plymouth 
b/source/xapps-extra/plymouth/systemd-plymouth
new file mode 100644
index 0000000..d31df06
--- /dev/null
+++ b/source/xapps-extra/plymouth/systemd-plymouth
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+/sbin/plymouthd
+/bin/plymouth --show-splash
+str=$1
+max=1024
+i=0
+while true
+do
+       /bin/plymouth --update $str 2>/dev/null && break
+       i=$(($i+1))
+       [ $i -gt $max ] && break
+done
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to