aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-02-17 00:14:46 +0000
committerPaul Eggleton <paul.eggleton@linux.intel.com>2014-02-17 00:17:07 +0000
commit10d6da25aad665c072113af623a6ed94c235968b (patch)
treeb4d108ef7db17ac5cc1391546f26c2fe6cc4387c
parentd37da6652ca647adf09c6ba130e989e8176f5dcd (diff)
downloadmeta-opie-10d6da25aad665c072113af623a6ed94c235968b.tar.gz
meta-opie-10d6da25aad665c072113af623a6ed94c235968b.tar.bz2
meta-opie-10d6da25aad665c072113af623a6ed94c235968b.zip
opie-button-settings: install button config file for Zaurus/iPAQ models
This file is required with current Opie Git master to enable the default button actions for each device. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--recipes-opie/opie-button-settings/opie-button-settings.inc42
-rw-r--r--recipes-opie/opie-button-settings/opie-button-settings_git.bb1
2 files changed, 38 insertions, 5 deletions
diff --git a/recipes-opie/opie-button-settings/opie-button-settings.inc b/recipes-opie/opie-button-settings/opie-button-settings.inc
index 15b46ee..7205746 100644
--- a/recipes-opie/opie-button-settings/opie-button-settings.inc
+++ b/recipes-opie/opie-button-settings/opie-button-settings.inc
@@ -3,23 +3,53 @@ SECTION = "opie/settings"
LICENSE = "GPLv2"
# FIXME stopgap until split archives have license files included
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-RDEPENDS_${PN} = "opie-button-settings-pics"
APPNAME = "buttonsettings"
S = "${WORKDIR}/button"
inherit opie
+# Select which config file in the Opie source tree to use for each machine
+OPIE_BUTTONCONFIG = ""
+OPIE_BUTTONCONFIG_h1910 = "ipaq"
+OPIE_BUTTONCONFIG_h1940 = "ipaq"
+OPIE_BUTTONCONFIG_h2200 = "ipaq_norecord"
+OPIE_BUTTONCONFIG_h3600 = "ipaq_h3600"
+OPIE_BUTTONCONFIG_h3800 = "ipaq_old"
+OPIE_BUTTONCONFIG_h3900 = "ipaq_old"
+OPIE_BUTTONCONFIG_h5000 = "ipaq_old"
+OPIE_BUTTONCONFIG_hx4700 = "ipaq"
+OPIE_BUTTONCONFIG_h4000 = "ipaq"
+OPIE_BUTTONCONFIG_rx1950 = "ipaq_rx1950"
+OPIE_BUTTONCONFIG_rx3000 = "ipaq_norecord"
+OPIE_BUTTONCONFIG_collie = "zaurus"
+OPIE_BUTTONCONFIG_akita = "zaurus_c700"
+OPIE_BUTTONCONFIG_c7x0 = "zaurus_c700"
+OPIE_BUTTONCONFIG_spitz = "zaurus_c3xxx"
+OPIE_BUTTONCONFIG_tosa = "zaurus_6000"
+
do_install() {
- install -d ${D}${palmtopdir}/pics/${APPNAME}/
+ install -d ${D}${palmtopdir}/pics/${APPNAME}/
install -d ${D}${palmtopdir}/pics/devicebuttons/
- install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+ install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
install -m 0644 ${WORKDIR}/pics/devicebuttons/*.png ${D}${palmtopdir}/pics/devicebuttons/
+
+ if [ -d ${WORKDIR}/etc/buttons ] ; then
+ if [ "${OPIE_BUTTONCONFIG}" != "" ] ; then
+ # Yes, this is /etc in the Opie source, not sysconfdir
+ install -d ${D}/etc
+ install -m 0644 ${WORKDIR}/etc/buttons/${OPIE_BUTTONCONFIG} ${D}/etc/opie_buttons.conf
+ fi
+ fi
}
-PACKAGES_prepend = "opie-button-settings-pics "
PACKAGE_ARCH = "${MACHINE_ARCH}"
-FILES_opie-button-settings-pics = "${palmtopdir}/pics/devicebuttons/z*"
+
+PACKAGES =. "opie-button-settings-pics opie-button-settings-config "
+RDEPENDS_${PN} = "opie-button-settings-pics"
+RRECOMMENDS_${PN} = "opie-button-settings-config"
+
+FILES_opie-button-settings-pics = "${palmtopdir}/pics/devicebuttons/z*"
FILES_opie-button-settings-pics_h1910 = "${palmtopdir}/pics/devicebuttons/ipaq*"
FILES_opie-button-settings-pics_h1940 = "${palmtopdir}/pics/devicebuttons/ipaq*"
FILES_opie-button-settings-pics_h3600 = "${palmtopdir}/pics/devicebuttons/ipaq*"
@@ -30,3 +60,5 @@ FILES_opie-button-settings-pics_h6300 = "${palmtopdir}/pics/devicebuttons/ipaq*"
FILES_opie-button-settings-pics_hx2000 = "${palmtopdir}/pics/devicebuttons/ipaq*"
FILES_opie-button-settings-pics_hx4700 = "${palmtopdir}/pics/devicebuttons/ipaq*"
FILES_opie-button-settings-pics_simpad = "${palmtopdir}/pics/devicebuttons/simpad*"
+
+FILES_opie-button-settings-config = "/etc/opie_buttons.conf"
diff --git a/recipes-opie/opie-button-settings/opie-button-settings_git.bb b/recipes-opie/opie-button-settings/opie-button-settings_git.bb
index dd68c0b..47b1a55 100644
--- a/recipes-opie/opie-button-settings/opie-button-settings_git.bb
+++ b/recipes-opie/opie-button-settings/opie-button-settings_git.bb
@@ -4,4 +4,5 @@ inherit opie_git
SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/settings/button;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
+ ${OPIE_GIT};protocol=git;subpath=etc \
${OPIE_GIT};protocol=git;subpath=apps"