xserver-kdrive-common: install xsplash ppms for branding

4 files changed, 21 insertions, 6 deletions

diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
index 489010a414..50da711ed4 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
@@ -91,14 +91,15 @@ case `module_id` in
                 modprobe mbxfb
                 ARGS="$ARGS -br -fb /dev/fb1" ;;
         "GTA01" | "GTA02")
-                ARGS="$ARGS -dpi 285 -screen 480x640 -hide-cursor -root-ppm /usr/share/pixmaps/xsplash.ppm" ;;
+                ARGS="$ARGS -dpi 285 -screen 480x640 -hide-cursor -root-ppm /usr/share/pixmaps/xsplash-vga.ppm" ;;
         "Motorola Ezx Platform")
-                ARGS="$ARGS -dpi 170 -screen 240x320 -hide-cursor -root-ppm /usr/share/pixmaps/xsplash.ppm" ;;
+                ARGS="$ARGS -dpi 170 -screen 240x320 -hide-cursor -root-ppm /usr/share/pixmaps/xsplash-qvga.ppm" ;;
         "Nokia N800")
                 ARGS="$ARGS -br -dpi 225 -screen 800x480x16 -mouse tslib" ;;
         *)
+# It is a device we do not know about, in which case we force
                 # It is a device we do not know about, in which case we force
-                # kdrive to use the current framebuffer geometry -- otherwise
+# kdrive to use the current framebuffer geometry -- otherwise
                 # it will default to trying to achieve 1024x768
                 S=`fallback_screen_arg`
                 ARGS="$ARGS -screen $S" ;;
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-qvga.ppm b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-qvga.ppm
new file mode 100644
index 0000000000..88df5e5476
--- /dev/null
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-qvga.ppm
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-vga.ppm b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-vga.ppm
new file mode 100644
index 0000000000..90eb056056
--- /dev/null
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-vga.ppm
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index 9329cd2e52..296c312d58 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
-PR = "r18"
+PR = "r19"
 
 SRC_URI = "\
   file://Xdefaults \
@@ -15,6 +15,11 @@ SRC_URI = "\
   file://90xXWindowManager \
   "
 
+SRC_URI_append_openmoko = "\
+  file://xsplash-vga.ppm \
+  file://xsplash-qvga.ppm \
+"
+
 etcFiles = "\
   Xdefaults \
   Xinit \
@@ -29,8 +34,6 @@ sessionFiles = "\
 
 S = "${WORKDIR}"
 
-PACKAGE_ARCH = "all"
-
 do_install() {
     install -d ${D}/${sysconfdir}/X11/Xsession.d
     for i in ${etcFiles}; do
@@ -39,4 +42,15 @@ do_install() {
     for i in ${sessionFiles}; do
         install -m 0755 ${WORKDIR}/$i ${D}/${sysconfdir}/X11/Xsession.d/
     done
+
+    # branding-foo. yes, /usr/share/pixmaps is hardcoded here, since it's
+    # also hardcoded in the Xserver script...
+    if [ "x${DISTRO}" = "xopenmoko" ]; then
+        install -d ${D}/usr/share/pixmaps
+        install -m 0755 ${WORKDIR}/*.ppm ${D}/usr/share/pixmaps
+	fi
 }
+
+PACKAGE_ARCH = "all"
+PACKAGE_ARCH_openmoko = "openmoko"
+