alsa: integrate alsa-states recipe into alsa-state

diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb
index 4953294..35c8f5d 100644 (file)
--- a/packages/alsa/alsa-state.bb
+++ b/packages/alsa/alsa-state.bb
@@ -9,12 +9,20 @@
 
 DESCRIPTION = "Default ALSA configuration"
 LICENSE = "GPL"
-
+RRECOMMENDS_alsa-state = "alsa-states"
 PV = "0.0.4"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "file://asound.state \
-          file://alsa-state"
+           file://alsa-state "
+
+SRC_URI_append_fic-gta01 = " \
+  file://capturehandset.state \
+  file://captureheadset.state \
+  file://gsmbluetooth.state \
+  file://gsmhandset.state \
+  file://gsmheadset.state \
+  file://stereoout.state"
 
 inherit update-rc.d
 
@@ -22,13 +30,17 @@ INITSCRIPT_NAME = "alsa-state"
 INITSCRIPT_PARAMS = "defaults 10"
 
 do_install() {
-       install -d ${D}${sysconfdir}/init.d
+    install -d ${D}${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d
        
-       install -m 0644 ${WORKDIR}/asound.state ${D}${sysconfdir}
-       install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d
+       install -m 0644 ${WORKDIR}/*.state ${D}${sysconfdir}
 }
 
-FILES_${PN} = "${sysconfdir}/*"
+PACKAGES += "alsa-states"
+FILES_${PN} = "${sysconfdir}/init.d"
+FILES_alsa-states = "${sysconfdir}/*.state"
+PACKAGE_ARCH_${PN} = "all"
+PACKAGE_ARCH_alsa-states = "${MACHINE}"
 
 pkg_postinst_${PN}() {
        if test -z "$D"

diff --git a/packages/alsa/alsa-states/fic-gta01/capturehandset.state b/packages/alsa/alsa-state/fic-gta01/capturehandset.state
similarity index 100%
rename from packages/alsa/alsa-states/fic-gta01/capturehandset.state
rename to packages/alsa/alsa-state/fic-gta01/capturehandset.state

diff --git a/packages/alsa/alsa-states/fic-gta01/captureheadset.state b/packages/alsa/alsa-state/fic-gta01/captureheadset.state
similarity index 100%
rename from packages/alsa/alsa-states/fic-gta01/captureheadset.state
rename to packages/alsa/alsa-state/fic-gta01/captureheadset.state

diff --git a/packages/alsa/alsa-states/fic-gta01/gsmbluetooth.state b/packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state
similarity index 100%
rename from packages/alsa/alsa-states/fic-gta01/gsmbluetooth.state
rename to packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state

diff --git a/packages/alsa/alsa-states/fic-gta01/gsmhandset.state b/packages/alsa/alsa-state/fic-gta01/gsmhandset.state
similarity index 100%
rename from packages/alsa/alsa-states/fic-gta01/gsmhandset.state
rename to packages/alsa/alsa-state/fic-gta01/gsmhandset.state

diff --git a/packages/alsa/alsa-states/fic-gta01/gsmheadset.state b/packages/alsa/alsa-state/fic-gta01/gsmheadset.state
similarity index 100%
rename from packages/alsa/alsa-states/fic-gta01/gsmheadset.state
rename to packages/alsa/alsa-state/fic-gta01/gsmheadset.state

diff --git a/packages/alsa/alsa-states/fic-gta01/stereoout.state b/packages/alsa/alsa-state/fic-gta01/stereoout.state
similarity index 100%
rename from packages/alsa/alsa-states/fic-gta01/stereoout.state
rename to packages/alsa/alsa-state/fic-gta01/stereoout.state

diff --git a/packages/alsa/alsa-states/.mtn2git_empty b/packages/alsa/alsa-states/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/alsa/alsa-states/dummy.state b/packages/alsa/alsa-states/dummy.state
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/alsa/alsa-states/fic-gta01/.mtn2git_empty b/packages/alsa/alsa-states/fic-gta01/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/alsa/alsa-states_0.0.0.bb b/packages/alsa/alsa-states_0.0.0.bb
deleted file mode 100644 (file)
index 8bf8f80..0000000
--- a/packages/alsa/alsa-states_0.0.0.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Machine specific alsa state files"
-SECTION = "base"
-LICENSE = "MIT"
-PR = "r1"
-
-SRC_URI = "file://*.state"
-
-do_install () {
-    install -d ${D}${sysconfdir}/alsa
-    install -m 0644 ${WORKDIR}/*.state ${D}${sysconfdir}/alsa
-}
-
-ALLOW_EMPTY = "1"
-FILES_${PN} += "${sysconfdir}/alsa/*"