[oe-commits] org.oe.dev xserver-kdrive-common: install xsplash ppms for branding

[mickeyl commit]

xserver-kdrive-common: install xsplash ppms for branding

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 91b1890c469c39d7efcba63967f106bf6efd0c4f
ViewMTN: http://monotone.openembedded.org/revision/info/91b1890c469c39d7efcba63967f106bf6efd0c4f
Files:
1
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-qvga.ppm
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-vga.ppm
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
mtn:manual_merge
true
Diffs:

#
# mt diff -racf317108a72dd5947e1ba73510ea29a82e75cb4 -r91b1890c469c39d7efcba63967f106bf6efd0c4f
#
# 
# 
# add_file "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-qvga.ppm"
#  content [01cb2d765905e52f4a87fb84a3736f5025e20ba8]
# 
# add_file "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-vga.ppm"
#  content [67e567a6535ec794e565e89b8e882fa10c20cacf]
# 
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
#  from [1e3ac3df8b80313d192e4b3b31e1228b4154186f]
#    to [7e9b719553b5e77b1e579024abf0be3c694dce4f]
# 
# patch "packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb"
#  from [fdeb17ae69a5b4e0f75d5465ad49c3c492da548f]
#    to [eced316f2258d6c425f8c597ae8e6163bf6d55e7]
# 
#   set "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-qvga.ppm"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-vga.ppm"
#  attr "mtn:manual_merge"
# value "true"
# 
============================================================
# packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-qvga.ppm is binary
============================================================
# packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-vga.ppm is binary
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver	1e3ac3df8b80313d192e4b3b31e1228b4154186f
+++ packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver	7e9b719553b5e77b1e579024abf0be3c694dce4f
@@ -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" ;;
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb	fdeb17ae69a5b4e0f75d5465ad49c3c492da548f
+++ packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb	eced316f2258d6c425f8c597ae8e6163bf6d55e7
@@ -1,8 +1,8 @@ RDEPENDS_${PN} = "xmodmap libxrandr xdpy
 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 @@ S = "${WORKDIR}"
 
 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"
+