[oe-commits] org.oe.dev merge of '9bacfdd26bdeaacd4a971d85fd05e2db9d7a3018'

[oe commit]

merge of '9bacfdd26bdeaacd4a971d85fd05e2db9d7a3018'
     and 'f09c276e8987c4e22f71952b3b817240241941a3'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: ad4a79b0b93f2289e959119feaf319b8d5b3ac2f
ViewMTN: http://monotone.openembedded.org/revision/info/ad4a79b0b93f2289e959119feaf319b8d5b3ac2f
Files:
1
conf/machine/include/motorola-ezx-base.inc
packages/images/fso-image.bb
Diffs:

#
# mt diff -r9bacfdd26bdeaacd4a971d85fd05e2db9d7a3018 -rad4a79b0b93f2289e959119feaf319b8d5b3ac2f
#
#
#
# patch "conf/machine/include/motorola-ezx-base.inc"
#  from [110c709cf7f23dd101d3f5d0637d361d93fa163a]
#    to [28864b40bfccdef2bc58e78166ec75925ea5eff1]
# 
# patch "packages/images/fso-image.bb"
#  from [b642168db79fee366c057fbed18ca29fa62e262a]
#    to [e1bf5a82d7ebd7bf4877f36ed0c8991c1dba8fbf]
#
============================================================
--- conf/machine/include/motorola-ezx-base.inc	110c709cf7f23dd101d3f5d0637d361d93fa163a
+++ conf/machine/include/motorola-ezx-base.inc	28864b40bfccdef2bc58e78166ec75925ea5eff1
@@ -14,12 +14,13 @@ MACHINE_FEATURES += " iwmmxt"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen phone"
 MACHINE_FEATURES += " iwmmxt"
 
-
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "180"
 
+XSERVER = "xserver-kdrive-fbdev"
+
 ROOT_FLASH_SIZE = "24"
 
 IMAGE_FSTYPES ?= "jffs2"
============================================================
--- packages/images/fso-image.bb	b642168db79fee366c057fbed18ca29fa62e262a
+++ packages/images/fso-image.bb	e1bf5a82d7ebd7bf4877f36ed0c8991c1dba8fbf
@@ -46,11 +46,17 @@ AUDIO_INSTALL = "\
 
 # audio
 AUDIO_INSTALL = "\
-  openmoko-alsa-scenarios \
   openmoko-sound-system2 \
   openmoko-sound-theme-standard2 \
 "
 
+AUDIO_INSTALL_append_om-gta01 = "\
+  openmoko-alsa-scenarios \
+"
+AUDIO_INSTALL_append_om-gta02 = "\
+  openmoko-alsa-scenarios \
+"
+
 # python
 PYTHON_INSTALL = "\
   task-python-efl \


#
# mt diff -rf09c276e8987c4e22f71952b3b817240241941a3 -rad4a79b0b93f2289e959119feaf319b8d5b3ac2f
#
#
# no changes
#