From 65de08468aea634874224bac43cbfadee7d6f7dd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 26 Feb 2012 01:52:17 +0100 Subject: [PATCH] splashutils: rename theme dir, add support for project based splash dir Signed-off-by: Stephan Raue --- packages/sysutils/splashutils/init.d/03_splash | 11 ++++++----- packages/sysutils/splashutils/install | 6 +++++- .../{theme/openelec => splash/default}/1024x768.cfg | 0 .../openelec => splash/default}/1280x1024.cfg | 0 .../{theme/openelec => splash/default}/1280x720.cfg | 0 .../{theme/openelec => splash/default}/1280x800.cfg | 0 .../openelec => splash/default}/1400x1050.cfg | 0 .../openelec => splash/default}/1600x1200.cfg | 0 .../{theme/openelec => splash/default}/1600x900.cfg | 0 .../openelec => splash/default}/1920x1080.cfg | 0 .../default}/images/splash-1024x768.png | Bin .../default}/images/splash-1280x1024.png | Bin .../default}/images/splash-1280x720.png | Bin .../default}/images/splash-1280x800.png | Bin .../default}/images/splash-1400x1050.png | Bin .../default}/images/splash-1600x1200.png | Bin .../default}/images/splash-1600x900.png | Bin .../default}/images/splash-1920x1080.png | Bin 18 files changed, 11 insertions(+), 6 deletions(-) rename packages/sysutils/splashutils/{theme/openelec => splash/default}/1024x768.cfg (100%) rename packages/sysutils/splashutils/{theme/openelec => splash/default}/1280x1024.cfg (100%) rename packages/sysutils/splashutils/{theme/openelec => splash/default}/1280x720.cfg (100%) rename packages/sysutils/splashutils/{theme/openelec => splash/default}/1280x800.cfg (100%) rename packages/sysutils/splashutils/{theme/openelec => splash/default}/1400x1050.cfg (100%) rename packages/sysutils/splashutils/{theme/openelec => splash/default}/1600x1200.cfg (100%) rename packages/sysutils/splashutils/{theme/openelec => splash/default}/1600x900.cfg (100%) rename packages/sysutils/splashutils/{theme/openelec => splash/default}/1920x1080.cfg (100%) rename packages/sysutils/splashutils/{theme/openelec => splash/default}/images/splash-1024x768.png (100%) rename packages/sysutils/splashutils/{theme/openelec => splash/default}/images/splash-1280x1024.png (100%) rename packages/sysutils/splashutils/{theme/openelec => splash/default}/images/splash-1280x720.png (100%) rename packages/sysutils/splashutils/{theme/openelec => splash/default}/images/splash-1280x800.png (100%) rename packages/sysutils/splashutils/{theme/openelec => splash/default}/images/splash-1400x1050.png (100%) rename packages/sysutils/splashutils/{theme/openelec => splash/default}/images/splash-1600x1200.png (100%) rename packages/sysutils/splashutils/{theme/openelec => splash/default}/images/splash-1600x900.png (100%) rename packages/sysutils/splashutils/{theme/openelec => splash/default}/images/splash-1920x1080.png (100%) diff --git a/packages/sysutils/splashutils/init.d/03_splash b/packages/sysutils/splashutils/init.d/03_splash index 0315231e5d..e778456e1a 100644 --- a/packages/sysutils/splashutils/init.d/03_splash +++ b/packages/sysutils/splashutils/init.d/03_splash @@ -25,11 +25,12 @@ progress "starting splash" mkdir -p /run/splash/cache/ - fbsplashd --theme=openelec --type=bootup + fbsplashd --theme=default --type=bootup - echo "set tty silent 2" > /run/splash/cache/.splash - echo "set tty verbose 6" > /run/splash/cache/.splash - echo "set mode silent" > /run/splash/cache/.splash + echo "set tty silent 2" > /run/splash/cache/.splash + echo "set tty verbose 6" > /run/splash/cache/.splash + echo "set mode silent" > /run/splash/cache/.splash echo "set message `lsb_release`" > /run/splash/cache/.splash - echo "repaint" > /run/splash/cache/.splash + echo "repaint" > /run/splash/cache/.splash chvt 2 + diff --git a/packages/sysutils/splashutils/install b/packages/sysutils/splashutils/install index 3e773ac1ea..3072461bdc 100755 --- a/packages/sysutils/splashutils/install +++ b/packages/sysutils/splashutils/install @@ -34,4 +34,8 @@ mkdir -p $INSTALL/usr/bin cp $PKG_BUILD/src/.libs/splash_util $INSTALL/usr/bin mkdir -p $INSTALL/etc/splash - cp -R $PKG_DIR/theme/openelec $INSTALL/etc/splash \ No newline at end of file + if [ -d $PROJECT_DIR/$PROJECT/splash/default ]; then + cp -R $PROJECT_DIR/$PROJECT/splash/default $INSTALL/etc/splash + else + cp -R $PKG_DIR/splash/default $INSTALL/etc/splash + fi diff --git a/packages/sysutils/splashutils/theme/openelec/1024x768.cfg b/packages/sysutils/splashutils/splash/default/1024x768.cfg similarity index 100% rename from packages/sysutils/splashutils/theme/openelec/1024x768.cfg rename to packages/sysutils/splashutils/splash/default/1024x768.cfg diff --git a/packages/sysutils/splashutils/theme/openelec/1280x1024.cfg b/packages/sysutils/splashutils/splash/default/1280x1024.cfg similarity index 100% rename from packages/sysutils/splashutils/theme/openelec/1280x1024.cfg rename to packages/sysutils/splashutils/splash/default/1280x1024.cfg diff --git a/packages/sysutils/splashutils/theme/openelec/1280x720.cfg b/packages/sysutils/splashutils/splash/default/1280x720.cfg similarity index 100% rename from packages/sysutils/splashutils/theme/openelec/1280x720.cfg rename to packages/sysutils/splashutils/splash/default/1280x720.cfg diff --git a/packages/sysutils/splashutils/theme/openelec/1280x800.cfg b/packages/sysutils/splashutils/splash/default/1280x800.cfg similarity index 100% rename from packages/sysutils/splashutils/theme/openelec/1280x800.cfg rename to packages/sysutils/splashutils/splash/default/1280x800.cfg diff --git a/packages/sysutils/splashutils/theme/openelec/1400x1050.cfg b/packages/sysutils/splashutils/splash/default/1400x1050.cfg similarity index 100% rename from packages/sysutils/splashutils/theme/openelec/1400x1050.cfg rename to packages/sysutils/splashutils/splash/default/1400x1050.cfg diff --git a/packages/sysutils/splashutils/theme/openelec/1600x1200.cfg b/packages/sysutils/splashutils/splash/default/1600x1200.cfg similarity index 100% rename from packages/sysutils/splashutils/theme/openelec/1600x1200.cfg rename to packages/sysutils/splashutils/splash/default/1600x1200.cfg diff --git a/packages/sysutils/splashutils/theme/openelec/1600x900.cfg b/packages/sysutils/splashutils/splash/default/1600x900.cfg similarity index 100% rename from packages/sysutils/splashutils/theme/openelec/1600x900.cfg rename to packages/sysutils/splashutils/splash/default/1600x900.cfg diff --git a/packages/sysutils/splashutils/theme/openelec/1920x1080.cfg b/packages/sysutils/splashutils/splash/default/1920x1080.cfg similarity index 100% rename from packages/sysutils/splashutils/theme/openelec/1920x1080.cfg rename to packages/sysutils/splashutils/splash/default/1920x1080.cfg diff --git a/packages/sysutils/splashutils/theme/openelec/images/splash-1024x768.png b/packages/sysutils/splashutils/splash/default/images/splash-1024x768.png similarity index 100% rename from packages/sysutils/splashutils/theme/openelec/images/splash-1024x768.png rename to packages/sysutils/splashutils/splash/default/images/splash-1024x768.png diff --git a/packages/sysutils/splashutils/theme/openelec/images/splash-1280x1024.png b/packages/sysutils/splashutils/splash/default/images/splash-1280x1024.png similarity index 100% rename from packages/sysutils/splashutils/theme/openelec/images/splash-1280x1024.png rename to packages/sysutils/splashutils/splash/default/images/splash-1280x1024.png diff --git a/packages/sysutils/splashutils/theme/openelec/images/splash-1280x720.png b/packages/sysutils/splashutils/splash/default/images/splash-1280x720.png similarity index 100% rename from packages/sysutils/splashutils/theme/openelec/images/splash-1280x720.png rename to packages/sysutils/splashutils/splash/default/images/splash-1280x720.png diff --git a/packages/sysutils/splashutils/theme/openelec/images/splash-1280x800.png b/packages/sysutils/splashutils/splash/default/images/splash-1280x800.png similarity index 100% rename from packages/sysutils/splashutils/theme/openelec/images/splash-1280x800.png rename to packages/sysutils/splashutils/splash/default/images/splash-1280x800.png diff --git a/packages/sysutils/splashutils/theme/openelec/images/splash-1400x1050.png b/packages/sysutils/splashutils/splash/default/images/splash-1400x1050.png similarity index 100% rename from packages/sysutils/splashutils/theme/openelec/images/splash-1400x1050.png rename to packages/sysutils/splashutils/splash/default/images/splash-1400x1050.png diff --git a/packages/sysutils/splashutils/theme/openelec/images/splash-1600x1200.png b/packages/sysutils/splashutils/splash/default/images/splash-1600x1200.png similarity index 100% rename from packages/sysutils/splashutils/theme/openelec/images/splash-1600x1200.png rename to packages/sysutils/splashutils/splash/default/images/splash-1600x1200.png diff --git a/packages/sysutils/splashutils/theme/openelec/images/splash-1600x900.png b/packages/sysutils/splashutils/splash/default/images/splash-1600x900.png similarity index 100% rename from packages/sysutils/splashutils/theme/openelec/images/splash-1600x900.png rename to packages/sysutils/splashutils/splash/default/images/splash-1600x900.png diff --git a/packages/sysutils/splashutils/theme/openelec/images/splash-1920x1080.png b/packages/sysutils/splashutils/splash/default/images/splash-1920x1080.png similarity index 100% rename from packages/sysutils/splashutils/theme/openelec/images/splash-1920x1080.png rename to packages/sysutils/splashutils/splash/default/images/splash-1920x1080.png