libphone-ui: move config files back to libphone-ui repo

* install right one in do_install_append if machine specific is available
* this helps keeping OE config and libphone-ui sources consistent

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

3 files changed, 14 insertions, 115 deletions

diff --git a/recipes/shr/libphone-ui/libphoneui.conf b/recipes/shr/libphone-ui/libphoneui.conf
deleted file mode 100644
index ae7005413e..0000000000
--- a/recipes/shr/libphone-ui/libphoneui.conf
+++ /dev/null
@@ -1,82 +0,0 @@
-# The following sections are "view" specific settings
-# every view must have a "module" field that specifies the name of the
-# module that should be used for that view, and additional view specific
-# settings if supported by that view.
-[dialer]
-module = shr
-
-[messages]
-module = shr
-request_message_receipt = 0
-
-[contacts]
-module = shr
-
-[calls]
-module = shr
-
-[phonelog]
-module = shr
-
-[notification]
-module = shr
-
-[idle_screen]
-module = shr
-
-[settings]
-module = shr
-
-#Alsa configuration for the sound utility functions
-# The general alsa section
-[alsa]
-hardware_control_name = hw:0
-
-#Each section describs a sound state
-#each section can accept the following fields:
-#speaker: the name of the corrosponding alsa control
-#microphone: the name of the corrosponding alsa control
-#speaker_min: the wanted lower bound to allow setting this control to
-#speaker_max: the wanted upper bound to allow setting this control to
-#microphone_min: the wanted lower bound to allow setting this control to
-#microphone_max: the wanted upper bound to allow setting this control to
-
-[alsa_control_idle]
-#speaker = PCM Volume
-
-[alsa_control_speaker]
-speaker = Headphone Playback Volume
-microphone = Mono Playback Volume
-microphone_mute = Mono Mixer Sidetone Playback Switch
-
-[alsa_control_handset]
-speaker = Speaker Playback Volume
-speaker_min = 90
-microphone = Mono Playback Volume
-microphone_mute = Mono Mixer Sidetone Playback Switch
-
-[alsa_control_headset]
-speaker = Headphone Playback Volume
-microphone = Mono Playback Volume
-microphone_mute = Mono Mixer Sidetone Playback Switch
-
-[alsa_control_bluetooth]
-speaker = Speaker Playback Volume
-microphone = Mono Playback Volume
-
-#Remove the segfaulting stuff
-#[device]
-# sysfs node for the vibrator to use
-#vibrator = /sys/class/leds/neo1973:vibrator/brightness
-# sysfs node to set the backlight brightness
-#backlight = /sys/class/backlight/gta02-bl
-
-
-#[feedback_error]
-
-#[feedback_warning]
-
-#[feedback_notice]
-
-#[feedback_click]
-
diff --git a/recipes/shr/libphone-ui/palmpre/libphoneui.conf b/recipes/shr/libphone-ui/palmpre/libphoneui.conf
deleted file mode 100644
index 14db6bf521..0000000000
--- a/recipes/shr/libphone-ui/palmpre/libphoneui.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# The following sections are "view" specific settings
-# every view must have a "module" field that specifies the name of the
-# module that should be used for that view, and additional view specific
-# settings if supported by that view.
-[dialer]
-module = shr
-
-[messages]
-module = shr
-request_message_receipt = 0
-
-[contacts]
-module = shr
-
-[calls]
-module = shr
-
-[phonelog]
-module = shr
-
-[notification]
-module = shr
-
-[idle_screen]
-module = shr
-
-[settings]
-module = shr
diff --git a/recipes/shr/libphone-ui_git.bb b/recipes/shr/libphone-ui_git.bb
index 1bd11f5560..e73aa1eab2 100644
--- a/recipes/shr/libphone-ui_git.bb
+++ b/recipes/shr/libphone-ui_git.bb
@@ -2,15 +2,14 @@ DESCRIPTION = "A generic framework for phone ui"
 HOMEPAGE = "http://shr-project.org/"
 LICENSE = "GPL"
 SECTION = "libs"
-SRCREV = "304538f6296b1da8390783d9c2a2f83435599e70"
+SRCREV = "5567443a48599c22c362fb28924701f81627c8dc"
 PV = "0.0.1+gitr${SRCPV}"
-PR = "r2"
+PR = "r3"
 
 DEPENDS="glib-2.0 libshr-glib libfso-glib libfsoframework libphone-utils alsa-lib"
 
 SRC_URI = " \
  git://git.shr-project.org/repo/libphone-ui.git;protocol=http;branch=master \
- file://libphoneui.conf \
 "
 
 S = "${WORKDIR}/git"
@@ -18,8 +17,18 @@ S = "${WORKDIR}/git"
 inherit autotools pkgconfig
 
 do_install_append() {
-	install -d ${D}${sysconfdir}
-	install -m 0644 ${WORKDIR}/libphoneui.conf ${D}${sysconfdir}/libphoneui.conf
+	libphone_ui_install_machine_specific_configs
+}
+
+libphone_ui_install_machine_specific_configs() {
+        # Check for machine specific conf.
+        CONF_PATH="${S}/conf"
+        CONF_PATH_MACHINE="${CONF_PATH}"
+        if [ -d "${CONF_PATH}/${MACHINE}" ] ; then
+                CONF_PATH_MACHINE="${CONF_PATH}/${MACHINE}"
+        fi
+        install -d ${D}${sysconfdir}
+        install -m 0644 ${CONF_PATH_MACHINE}/libphoneui.conf ${D}${sysconfdir}/libphoneui.conf
 }
 
 PACKAGES =+ "${PN}-config"