Author: sparky
Date: Thu Mar 16 19:43:35 2006
New Revision: 7201
Modified:
ppcrcd/trunk/Makefile
ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/fbsplash
Log:
- fbsplash: try to change depth is 8bpp
Modified: ppcrcd/trunk/Makefile
==============================================================================
--- ppcrcd/trunk/Makefile (original)
+++ ppcrcd/trunk/Makefile Thu Mar 16 19:43:35 2006
@@ -261,7 +261,7 @@
$(BCOND-$(notdir $@)) $(BCOND)
sleep 1 && touch $@
-out/docs/%.html: doc/README.%
+out/docs/%.html: doc/README.% conf.dir
@mkdir -p out/docs
./doc/gendoc.pl $< > $@
Modified: ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/fbsplash
==============================================================================
--- ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/fbsplash (original)
+++ ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/fbsplash Thu Mar 16 19:43:35 2006
@@ -4,14 +4,19 @@
[ -x /sbin/splash_util ] || exit
-#@@ nosplash: disable fbsplash
-cmdopt nosplash && exit
[EMAIL PROTECTED]@ nosplash: disable fbsplash
+{ cmdopt nosplash || nvopt nosplash; } && exit
verbose 1 -G "Trying to start fbsplash"
/sbin/splash_util --vc=0 -m v -t darkblue -c setcfg >/dev/null 2>&1
-/sbin/splash_util --vc=0 -m v -t darkblue -c setpic 2>&1 | grep -q "No 8bpp" \
- && die 1 "fbsplash needs high-color frame buffer"
+if /sbin/splash_util --vc=0 -m v -t darkblue -c setpic 2>&1 \
+ | grep -q "No 8bpp"; then
+ /usr/bin/fbset -depth 15 -a || /usr/bin/fbset -depth 16 -a || \
+ die 1 "can't change frame buffer color depth"
+ /sbin/splash_util --vc=0 -m v -t darkblue -c setpic || \
+ die 2 "something's wrong with with fbsplash"
+fi
/sbin/splash_util --vc=0 -c on >/dev/null 2>&1
for TTY in 2 3 4 5 6 7 8 12; do
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
