[oe-commits] org.oe.dev merge of 'b96a1271f00720aba73dc0f7c2b08974c38252ac'

[slapin commit]

merge of 'b96a1271f00720aba73dc0f7c2b08974c38252ac'
     and 'c43653bfb560ae719097dc966db74985b9b905ba'

Author: slapin at openembedded.org
Branch: org.openembedded.dev
Revision: d94271d90df576fb623a5afb9f75864f7ec34546
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d94271d90df576fb623a5afb9f75864f7ec34546
Files:
1
packages/alsa/alsa-states
packages/alsa/alsa-states/fic-gta01
packages/alsa/alsa-states_0.0.0.bb
packages/alsa/alsa-states/fic-gta01/capturehandset.state
packages/alsa/alsa-state/fic-gta01/capturehandset.state
packages/alsa/alsa-states/fic-gta01/captureheadset.state
packages/alsa/alsa-state/fic-gta01/captureheadset.state
packages/alsa/alsa-states/fic-gta01/gsmbluetooth.state
packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state
packages/alsa/alsa-states/fic-gta01/gsmhandset.state
packages/alsa/alsa-state/fic-gta01/gsmhandset.state
packages/alsa/alsa-states/fic-gta01/gsmheadset.state
packages/alsa/alsa-state/fic-gta01/gsmheadset.state
packages/alsa/alsa-states/fic-gta01/stereoout.state
packages/alsa/alsa-state/fic-gta01/stereoout.state
packages/alsa/alsa-state.bb
conf/machine/palmld.conf
Diffs:

#
# mt diff -rb96a1271f00720aba73dc0f7c2b08974c38252ac -rd94271d90df576fb623a5afb9f75864f7ec34546
#
# 
# 
# delete "packages/alsa/alsa-states"
# 
# delete "packages/alsa/alsa-states/fic-gta01"
# 
# delete "packages/alsa/alsa-states_0.0.0.bb"
# 
# rename "packages/alsa/alsa-states/fic-gta01/capturehandset.state"
#     to "packages/alsa/alsa-state/fic-gta01/capturehandset.state"
# 
# rename "packages/alsa/alsa-states/fic-gta01/captureheadset.state"
#     to "packages/alsa/alsa-state/fic-gta01/captureheadset.state"
# 
# rename "packages/alsa/alsa-states/fic-gta01/gsmbluetooth.state"
#     to "packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state"
# 
# rename "packages/alsa/alsa-states/fic-gta01/gsmhandset.state"
#     to "packages/alsa/alsa-state/fic-gta01/gsmhandset.state"
# 
# rename "packages/alsa/alsa-states/fic-gta01/gsmheadset.state"
#     to "packages/alsa/alsa-state/fic-gta01/gsmheadset.state"
# 
# rename "packages/alsa/alsa-states/fic-gta01/stereoout.state"
#     to "packages/alsa/alsa-state/fic-gta01/stereoout.state"
# 
# patch "packages/alsa/alsa-state.bb"
#  from [6674988c91d8b1501ec9a8967baf1226e06cbc7a]
#    to [481e31f5bed1ac2d402c743d5464c9a931503c91]
# 
============================================================
--- packages/alsa/alsa-state.bb	6674988c91d8b1501ec9a8967baf1226e06cbc7a
+++ packages/alsa/alsa-state.bb	481e31f5bed1ac2d402c743d5464c9a931503c91
@@ -9,26 +9,38 @@ LICENSE = "GPL"
 
 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
 
 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"


#
# mt diff -rc43653bfb560ae719097dc966db74985b9b905ba -rd94271d90df576fb623a5afb9f75864f7ec34546
#
# 
# 
# patch "conf/machine/palmld.conf"
#  from [5733d4803a281832c68a5a1ff2eb4ead15b8fbba]
#    to [36ef525ef87ccfbc617c0404c26bd3a750a58c1b]
# 
============================================================
--- conf/machine/palmld.conf	5733d4803a281832c68a5a1ff2eb4ead15b8fbba
+++ conf/machine/palmld.conf	36ef525ef87ccfbc617c0404c26bd3a750a58c1b
@@ -24,7 +24,6 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 	kernel-module-pxapwm-bl \
 	kernel-module-snd-pxa2xx-ac97 \
 	kernel-module-snd-pxa2xx-pcm \
-	kernel-module-wm97xx-ts \		
 	"
 
 #