xserver-kdrive-[splash|common]: refactor splash images into a seperate recipe -- patch courtesy Rasterman

6 files changed, 24 insertions, 17 deletions

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 738bb3f6fc..ff05e38454 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -1,8 +1,7 @@
 DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPL"
 SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
-PR = "r30"
+PR = "r31"
 
 SRC_URI = "\
   file://Xdefaults \
@@ -14,11 +13,7 @@ SRC_URI = "\
   file://60xXDefaults \
   file://90xXWindowManager \
   "
-
-SRC_URI_append_openmoko = "\
-  file://xsplash-vga.ppm \
-  file://xsplash-qvga.ppm \
-"
+S = "${WORKDIR}"
 
 etcFiles = "\
   Xdefaults \
@@ -32,8 +27,6 @@ sessionFiles = "\
   90xXWindowManager \
   "
 
-S = "${WORKDIR}"
-
 do_install() {
     install -d ${D}/${sysconfdir}/X11/Xsession.d
     for i in ${etcFiles}; do
@@ -42,14 +35,9 @@ 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"
-
+RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
+# openmoko uses a splash image for kdrive
+RRECOMMENDS_${PN}_openmoko = "xserver-kdrive-splash"
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-qvga.ppm b/packages/xserver-kdrive-common/xserver-kdrive-splash/openmoko/xsplash-qvga.ppm
index 88df5e5476..88df5e5476 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-qvga.ppm
+++ b/packages/xserver-kdrive-common/xserver-kdrive-splash/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-splash/openmoko/xsplash-vga.ppm
index 90eb056056..90eb056056 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-vga.ppm
+++ b/packages/xserver-kdrive-common/xserver-kdrive-splash/openmoko/xsplash-vga.ppm
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-splash/xsplash-qvga.ppm b/packages/xserver-kdrive-common/xserver-kdrive-splash/xsplash-qvga.ppm
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xserver-kdrive-common/xserver-kdrive-splash/xsplash-qvga.ppm
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-splash/xsplash-vga.ppm b/packages/xserver-kdrive-common/xserver-kdrive-splash/xsplash-vga.ppm
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xserver-kdrive-common/xserver-kdrive-splash/xsplash-vga.ppm
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-splash_1.0.bb b/packages/xserver-kdrive-common/xserver-kdrive-splash_1.0.bb
new file mode 100644
index 0000000000..2c145dbdd1
--- /dev/null
+++ b/packages/xserver-kdrive-common/xserver-kdrive-splash_1.0.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "X11 Splash screen"
+LICENSE = "GPL"
+SECTION = "x11"
+PR = "r0"
+
+SRC_URI = "\
+  file://xsplash-vga.ppm \
+  file://xsplash-qvga.ppm \
+"
+S = "${WORKDIR}"
+
+do_install() {
+  # branding-foo. yes, /usr/share/pixmaps is hardcoded here, since it's
+  # also hardcoded in the Xserver script...
+  install -d ${D}/usr/share/pixmaps
+  install -m 0755 ${WORKDIR}/*.ppm ${D}/usr/share/pixmaps
+}
+
+PACKAGE_ARCH = "all"