Revert "berryboot-tools: update for fullsize splash"

This reverts commit e961c8860480fbe1ff24a8fac6e94e2a44cb5dd4.
This commit is contained in:
Stephan Raue 2013-12-21 10:17:09 +01:00
parent 87c81268b4
commit cb65061c27
2 changed files with 8 additions and 4 deletions

View File

@ -32,8 +32,8 @@ mkdir -p $INSTALL/bin
cp $PLYMOUTH_DIR/ply-image $INSTALL/bin cp $PLYMOUTH_DIR/ply-image $INSTALL/bin
mkdir -p $INSTALL/splash mkdir -p $INSTALL/splash
if [ -f $PROJECT_DIR/$PROJECT/splash/splash-full.png ]; then if [ -f $PROJECT_DIR/$PROJECT/splash/splash.png ]; then
cp $PROJECT_DIR/$PROJECT/splash/splash-full.png $INSTALL/splash cp $PROJECT_DIR/$PROJECT/splash/splash.png $INSTALL/splash
else else
cp $PLYMOUTH_PKG_DIR/splash/splash-full.png $INSTALL/splash cp $PLYMOUTH_PKG_DIR/splash/splash.png $INSTALL/splash
fi fi

View File

@ -22,7 +22,7 @@
UPDATEDIR=${DATADIR}/storage/.update UPDATEDIR=${DATADIR}/storage/.update
UPDATEFILE=${UPDATEDIR}/SYSTEM UPDATEFILE=${UPDATEDIR}/SYSTEM
SPLASHIMAGE="/squashfs/splash/splash-full.png" SPLASHIMAGE="/squashfs/splash/splash.png"
# #
# load splash # load splash
@ -30,6 +30,10 @@ SPLASHIMAGE="/squashfs/splash/splash-full.png"
# #
if [ -e /dev/fb0 -a -f "${SPLASHIMAGE}" ]; then if [ -e /dev/fb0 -a -f "${SPLASHIMAGE}" ]; then
# set framebuffer to a default resolution (1024x768-32)
LD_LIBRARY_PATH=/squashfs/lib /squashfs/lib/ld.so \
/squashfs/bin/busybox fbset -g 1024 768 1024 768 32
# load splash # load splash
LD_LIBRARY_PATH=/squashfs/lib /squashfs/lib/ld.so \ LD_LIBRARY_PATH=/squashfs/lib /squashfs/lib/ld.so \
/squashfs/bin/ply-image ${SPLASHIMAGE} > /dev/null 2>&1 /squashfs/bin/ply-image ${SPLASHIMAGE} > /dev/null 2>&1