aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/distro/include/moko-autorev.inc1
-rw-r--r--conf/distro/include/sane-srcrevs.inc1
-rw-r--r--packages/alsa/alsa-state.bb3
-rw-r--r--packages/openmoko2/openmoko-alsa-scenarios.bb21
4 files changed, 25 insertions, 1 deletions
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 8a923b98e9..985963b538 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -17,6 +17,7 @@ SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
SRCREV_pn-multitap-pad ?= "${AUTOREV}"
SRCREV_pn-neod ?= "${AUTOREV}"
SRCREV_pn-openmoko-agpsui ?= "${AUTOREV}"
+SRCREV_pn-openmoko-alsa-scenarios ?= "${AUTOREV}"
SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 8219e35f36..6143c51c1d 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -86,6 +86,7 @@ SRCREV_pn-osb-jscore ?= "117"
SRCREV_pn-osb-nrcit ?= "125"
SRCREV_pn-osb-nrcore ?= "126"
SRCREV_pn-openmoko-agpsui ?= "7"
+SRCREV_pn-openmoko-alsa-scenarios ?= "4317"
SRCREV_pn-openmoko-appearance ?= "3262"
SRCREV_pn-openmoko-appmanager ?= "1851"
SRCREV_pn-openmoko-appmanager2 ?= "3442"
diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb
index 1d31bd765e..7d57364292 100644
--- a/packages/alsa/alsa-state.bb
+++ b/packages/alsa/alsa-state.bb
@@ -7,8 +7,9 @@
DESCRIPTION = "Default ALSA configuration"
LICENSE = "GPL"
RRECOMMENDS_alsa-state = "alsa-states"
+RRECOMMENDS_${PN}_openmoko = "openmoko-alsa-scenarios"
PV = "0.1.0"
-PR = "r11"
+PR = "r12"
SRC_URI = " \
file://asoundrc \
diff --git a/packages/openmoko2/openmoko-alsa-scenarios.bb b/packages/openmoko2/openmoko-alsa-scenarios.bb
new file mode 100644
index 0000000000..7aa76a8443
--- /dev/null
+++ b/packages/openmoko2/openmoko-alsa-scenarios.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Package for the different scenarios used by OpenMoko"
+SECTION = "openmoko/base"
+PV = "1.0+svnr${SRCREV}"
+PR = "r1"
+
+COMPATIBLE_MACHINE = "(om-gta01|om-gta02)"
+
+SRC_URI_${MACHINE_ARCH} = "svn://svn.openmoko.org/trunk/src/target/audio/;module=${MACHINE_ARCH};proto=http"
+
+S = "${WORKDIR}/${MACHINE_ARCH}"
+
+do_install() {
+ install -d ${D}${datadir}/openmoko/scenarios/
+ install -m 644 ${S}/*.state ${D}${datadir}/openmoko/scenarios/
+ install -d ${D}${sysconfdir}/
+ install -m 644 ${S}/stereoout.state ${D}${sysconfdir}/asound.state
+}
+
+PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
+
+FILES_${PN} += "${datadir}/openmoko"