From 6e623cf1d0976f933d03d0efb79546f43253660f Mon Sep 17 00:00:00 2001
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Sun, 5 Aug 2012 00:04:15 +0100
Subject: opie-sysinfo: split out machine-specific images

This saves ~600k of space on the target by only installing the image
appropriate for the machine. If there is no specific image then the
opie-sysinfo-images package will be empty and not produced, which is OK
since opie-sysinfo only RRECOMMENDS it.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 recipes-opie/opie-sysinfo/opie-sysinfo-images.inc  | 45 ++++++++++++++++++++++
 .../opie-sysinfo/opie-sysinfo-images_1.2.5.bb      |  5 +++
 .../opie-sysinfo/opie-sysinfo-images_git.bb        |  5 +++
 recipes-opie/opie-sysinfo/opie-sysinfo.inc         |  7 +++-
 recipes-opie/opie-sysinfo/opie-sysinfo_1.2.5.bb    |  2 +
 recipes-opie/opie-sysinfo/opie-sysinfo_git.bb      |  2 +
 6 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 recipes-opie/opie-sysinfo/opie-sysinfo-images.inc
 create mode 100644 recipes-opie/opie-sysinfo/opie-sysinfo-images_1.2.5.bb
 create mode 100644 recipes-opie/opie-sysinfo/opie-sysinfo-images_git.bb

diff --git a/recipes-opie/opie-sysinfo/opie-sysinfo-images.inc b/recipes-opie/opie-sysinfo/opie-sysinfo-images.inc
new file mode 100644
index 0000000..ba40030
--- /dev/null
+++ b/recipes-opie/opie-sysinfo/opie-sysinfo-images.inc
@@ -0,0 +1,45 @@
+SUMMARY = "Machine-specific images for System Info"
+# Dummy section so we don't get app symlink
+SECTION = "opie/base"
+LICENSE = "GPLv2"
+# FIXME stopgap until split archives have license files included
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+APPNAME = "sysinfo"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+do_configure() {
+	:
+}
+
+MACHINEPIC = "${MACHINE}"
+MACHINEPIC_h3600 = "ipaq3600"
+MACHINEPIC_h3800 = "ipaqh3800h3900"
+MACHINEPIC_h3900 = "ipaqh3800h3900"
+MACHINEPIC_h4000 = "ipaqh4100"
+MACHINEPIC_h2200 = "ipaqh2200"
+MACHINEPIC_h1910 = "ipaqh1900"
+MACHINEPIC_h1940 = "ipaqh1900"
+MACHINEPIC_rx1950 = "ipaqh4100"
+MACHINEPIC_hx4700 = "ipaqhx4700"
+MACHINEPIC_h5000 = "ipaqh5000"
+MACHINEPIC_akita = "zaurusc700"
+MACHINEPIC_c7x0 = "zaurusc700"
+MACHINEPIC_spitz = "zaurusc700"
+MACHINEPIC_collie = "zaurus5500"
+MACHINEPIC_poodle = "zaurus5500"
+MACHINEPIC_jornada6xx = "jornada720"
+MACHINEPIC_jornada7xx = "jornada720"
+
+do_install() {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	if [ -f "${WORKDIR}/pics/${APPNAME}/${MACHINEPIC}.png" ] ; then
+		install -m 0644 ${WORKDIR}/pics/${APPNAME}/${MACHINEPIC}.png ${D}${palmtopdir}/pics/${APPNAME}/
+	fi
+}
+
+PACKAGES = "${PN}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
diff --git a/recipes-opie/opie-sysinfo/opie-sysinfo-images_1.2.5.bb b/recipes-opie/opie-sysinfo/opie-sysinfo-images_1.2.5.bb
new file mode 100644
index 0000000..391d7ec
--- /dev/null
+++ b/recipes-opie/opie-sysinfo/opie-sysinfo-images_1.2.5.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+SRC_URI = "http://sources.openembedded.org/opie-1.2.5-split_pics.tar.bz2;name=split_pics"
+SRC_URI[split_pics.md5sum] = "e9b68749d67295f7080a23e39b17335e"
+SRC_URI[split_pics.sha256sum] = "0a7aab6d0bce04d6a9c257d768d8a1a481d38ba527d6e6e50723973789954b4a"
diff --git a/recipes-opie/opie-sysinfo/opie-sysinfo-images_git.bb b/recipes-opie/opie-sysinfo/opie-sysinfo-images_git.bb
new file mode 100644
index 0000000..c5cc473
--- /dev/null
+++ b/recipes-opie/opie-sysinfo/opie-sysinfo-images_git.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+inherit opie_git
+
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=pics;name=first"
diff --git a/recipes-opie/opie-sysinfo/opie-sysinfo.inc b/recipes-opie/opie-sysinfo/opie-sysinfo.inc
index 69eaf53..e8d9a7f 100644
--- a/recipes-opie/opie-sysinfo/opie-sysinfo.inc
+++ b/recipes-opie/opie-sysinfo/opie-sysinfo.inc
@@ -5,13 +5,18 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 APPNAME = "sysinfo"
 
+RRECOMMENDS_${PN} += "opie-sysinfo-images"
+
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
 
 do_install() {
         install -d ${D}${palmtopdir}/pics/${APPNAME}/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/SystemInfo.png ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*icon.png ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/pattern.png ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/pda.png ${D}${palmtopdir}/pics/${APPNAME}/
         install -d ${D}${palmtopdir}/share/sysinfo/
         install -m 0644 ${WORKDIR}/share/sysinfo/results ${D}${palmtopdir}/share/sysinfo/results
 }
diff --git a/recipes-opie/opie-sysinfo/opie-sysinfo_1.2.5.bb b/recipes-opie/opie-sysinfo/opie-sysinfo_1.2.5.bb
index 319096f..8eb19b5 100644
--- a/recipes-opie/opie-sysinfo/opie-sysinfo_1.2.5.bb
+++ b/recipes-opie/opie-sysinfo/opie-sysinfo_1.2.5.bb
@@ -1,5 +1,7 @@
 require ${PN}.inc
 
+PR = "r1"
+
 SRC_URI = "http://sources.openembedded.org/opie-1.2.5-split_noncore_settings_sysinfo.tar.bz2;name=split_noncore_settings_sysinfo \
            http://sources.openembedded.org/opie-1.2.5-split_pics.tar.bz2;name=split_pics \
            http://sources.openembedded.org/opie-1.2.5-split_apps.tar.bz2;name=split_apps \
diff --git a/recipes-opie/opie-sysinfo/opie-sysinfo_git.bb b/recipes-opie/opie-sysinfo/opie-sysinfo_git.bb
index 33cd798..8c6d4f3 100644
--- a/recipes-opie/opie-sysinfo/opie-sysinfo_git.bb
+++ b/recipes-opie/opie-sysinfo/opie-sysinfo_git.bb
@@ -1,5 +1,7 @@
 require ${PN}.inc
 
+PR = "r1"
+
 inherit opie_git
 
 SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/sysinfo;name=first \
-- 
cgit 1.2.3-korg