busybox-initramfs: make uvesafb support optional, and use only if needed

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2013-09-30 03:23:11 +02:00
parent 7a3503a56a
commit 8d04e2048d
13 changed files with 58 additions and 13 deletions

View File

@ -38,3 +38,8 @@ if [ -n "$INITRAMFS_MODULES" ]; then
fi fi
done done
fi fi
if [ "$UVESAFB_SUPPORT" = yes ]; then
uvesafb=`find $LINUX_MODULES_DIR -name uvesafb.ko`
cp $uvesafb $INSTALL/lib/modules/`basename $uvesafb`
fi

View File

@ -339,23 +339,32 @@
load_splash() { load_splash() {
progress "Loading bootsplash" progress "Loading bootsplash"
if [ -e /dev/fb0 -a ! "$SPLASH" = "no" ]; then if [ ! "$SPLASH" = "no" ]; then
SPLASHIMAGE="/splash/splash-full.png"
# set framebuffer to a default resolution (1024x768-32) # load uvesafb module if needed
if [ -f "$MODULE_DIR/uvesafb.ko" -a ! -e /dev/fb0 ]; then
progress "Loading kernel module uvesafb.ko"
insmod "$MODULE_DIR/uvesafb.ko" || \
progress "... Failed to load kernel module uvesafb, skipping"
# set framebuffer to a default resolution (1024x768-32)
if [ ! "$SWITCH_FRAMEBUFFER" = "no" ]; then if [ ! "$SWITCH_FRAMEBUFFER" = "no" ]; then
fbset -g 1024 768 1024 768 32 fbset -g 1024 768 1024 768 32
SPLASHIMAGE="/splash/splash-1024.png"
fi fi
fi
# load splash if [ -e /dev/fb0 ]; then
# load splash
if [ -f /flash/oemsplash.png ]; then if [ -f /flash/oemsplash.png ]; then
SPLASHIMAGE="/flash/oemsplash.png" SPLASHIMAGE="/flash/oemsplash.png"
elif [ -f /splash/splash.conf ]; then elif [ -f /splash/splash.conf ]; then
. /splash/splash.conf . /splash/splash.conf
else
SPLASHIMAGE="/splash/splash.png"
fi fi
ply-image $SPLASHIMAGE > /dev/null 2>&1 ply-image $SPLASHIMAGE > /dev/null 2>&1
fi
fi fi
} }

View File

@ -32,5 +32,5 @@ mkdir -p $INSTALL/splash
elif [ -f $PROJECT_DIR/$PROJECT/splash/splash.png ]; then elif [ -f $PROJECT_DIR/$PROJECT/splash/splash.png ]; then
cp $PROJECT_DIR/$PROJECT/splash/splash.png $INSTALL/splash cp $PROJECT_DIR/$PROJECT/splash/splash.png $INSTALL/splash
else else
cp $PKG_DIR/splash/splash.png $INSTALL/splash cp $PKG_DIR/splash/splash-*.png $INSTALL/splash
fi fi

View File

@ -25,7 +25,7 @@ PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://www.meego.com" PKG_SITE="http://www.meego.com"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="gcc-initramfs zlib-initramfs v86d" PKG_DEPENDS="gcc-initramfs zlib-initramfs"
PKG_BUILD_DEPENDS="toolchain zlib libpng" PKG_BUILD_DEPENDS="toolchain zlib libpng"
PKG_PRIORITY="optional" PKG_PRIORITY="optional"
PKG_SECTION="system" PKG_SECTION="system"
@ -34,3 +34,7 @@ PKG_LONGDESC="Boot splash screen based on Fedora's Plymouth code"
PKG_IS_ADDON="no" PKG_IS_ADDON="no"
PKG_AUTORECONF="no" PKG_AUTORECONF="no"
if [ "UVESAFB_SUPPORT" = yes ]; then
PKG_DEPENDS="$PKG_DEPENDS v86d"
fi

View File

@ -249,6 +249,9 @@
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="ratpoison" WINDOWMANAGER="ratpoison"
# include uvesafb support (yes / no)
UVESAFB_SUPPORT="yes"
# Displayserver to use (xorg-server / no) # Displayserver to use (xorg-server / no)
DISPLAYSERVER="xorg-server" DISPLAYSERVER="xorg-server"
@ -305,7 +308,7 @@
LCD_DRIVER="none" LCD_DRIVER="none"
# Modules to install in initramfs for early boot # Modules to install in initramfs for early boot
INITRAMFS_MODULES="uvesafb xhci-hcd" INITRAMFS_MODULES="xhci-hcd"
# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
# Space separated list is supported, # Space separated list is supported,

View File

@ -249,6 +249,9 @@
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="ratpoison" WINDOWMANAGER="ratpoison"
# include uvesafb support (yes / no)
UVESAFB_SUPPORT="yes"
# Displayserver to use (xorg-server / no) # Displayserver to use (xorg-server / no)
DISPLAYSERVER="xorg-server" DISPLAYSERVER="xorg-server"

View File

@ -249,6 +249,9 @@
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="ratpoison" WINDOWMANAGER="ratpoison"
# include uvesafb support (yes / no)
UVESAFB_SUPPORT="yes"
# Displayserver to use (xorg-server / no) # Displayserver to use (xorg-server / no)
DISPLAYSERVER="xorg-server" DISPLAYSERVER="xorg-server"
@ -305,7 +308,7 @@
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec,vlsys_m428" LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec,vlsys_m428"
# Modules to install in initramfs for early boot # Modules to install in initramfs for early boot
INITRAMFS_MODULES="uvesafb xhci-hcd" INITRAMFS_MODULES="xhci-hcd"
# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
# Space separated list is supported, # Space separated list is supported,

View File

@ -249,6 +249,9 @@
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="ratpoison" WINDOWMANAGER="ratpoison"
# include uvesafb support (yes / no)
UVESAFB_SUPPORT="yes"
# Displayserver to use (xorg-server / no) # Displayserver to use (xorg-server / no)
DISPLAYSERVER="xorg-server" DISPLAYSERVER="xorg-server"
@ -305,7 +308,7 @@
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec,vlsys_m428" LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec,vlsys_m428"
# Modules to install in initramfs for early boot # Modules to install in initramfs for early boot
INITRAMFS_MODULES="uvesafb xhci-hcd" INITRAMFS_MODULES="xhci-hcd"
# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
# Space separated list is supported, # Space separated list is supported,

View File

@ -249,6 +249,9 @@
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="ratpoison" WINDOWMANAGER="ratpoison"
# include uvesafb support (yes / no)
UVESAFB_SUPPORT="no"
# Displayserver to use (xorg-server / no) # Displayserver to use (xorg-server / no)
DISPLAYSERVER="xorg-server" DISPLAYSERVER="xorg-server"
@ -305,7 +308,7 @@
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec,vlsys_m428" LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec,vlsys_m428"
# Modules to install in initramfs for early boot # Modules to install in initramfs for early boot
INITRAMFS_MODULES="uvesafb xhci-hcd" INITRAMFS_MODULES="xhci-hcd"
# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
# Space separated list is supported, # Space separated list is supported,

View File

@ -249,6 +249,9 @@
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="ratpoison" WINDOWMANAGER="ratpoison"
# include uvesafb support (yes / no)
UVESAFB_SUPPORT="yes"
# Displayserver to use (xorg-server / no) # Displayserver to use (xorg-server / no)
DISPLAYSERVER="xorg-server" DISPLAYSERVER="xorg-server"
@ -305,7 +308,7 @@
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec,vlsys_m428" LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec,vlsys_m428"
# Modules to install in initramfs for early boot # Modules to install in initramfs for early boot
INITRAMFS_MODULES="uvesafb xhci-hcd" INITRAMFS_MODULES="xhci-hcd"
# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
# Space separated list is supported, # Space separated list is supported,

View File

@ -249,6 +249,9 @@
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="ratpoison" WINDOWMANAGER="ratpoison"
# include uvesafb support (yes / no)
UVESAFB_SUPPORT="no"
# Displayserver to use (xorg-server / no) # Displayserver to use (xorg-server / no)
DISPLAYSERVER="xorg-server" DISPLAYSERVER="xorg-server"

View File

@ -249,6 +249,9 @@
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="none" WINDOWMANAGER="none"
# include uvesafb support (yes / no)
UVESAFB_SUPPORT="no"
# Displayserver to use (xorg-server / no) # Displayserver to use (xorg-server / no)
DISPLAYSERVER="no" DISPLAYSERVER="no"

View File

@ -244,6 +244,9 @@
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="ratpoison" WINDOWMANAGER="ratpoison"
# include uvesafb support (yes / no)
UVESAFB_SUPPORT="no"
# Displayserver to use (xorg-server / no) # Displayserver to use (xorg-server / no)
DISPLAYSERVER="xorg-server" DISPLAYSERVER="xorg-server"
@ -300,7 +303,7 @@
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec,vlsys_m428" LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec,vlsys_m428"
# Modules to install in initramfs for early boot # Modules to install in initramfs for early boot
INITRAMFS_MODULES="uvesafb xhci-hcd" INITRAMFS_MODULES="xhci-hcd"
# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
# Space separated list is supported, # Space separated list is supported,