[oe-commits] org.oe.dev merge of '3e6216a45414da116d701e5ace53a09e1c10f258'

[oe commit]

merge of '3e6216a45414da116d701e5ace53a09e1c10f258'
     and 'e42568a54d15c18dcefabdfde6196ebefc9febe1'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 3ee21fd3d6d6a0cddf83ef3711c24b4d6d7d7451
ViewMTN: http://monotone.openembedded.org/revision/info/3ee21fd3d6d6a0cddf83ef3711c24b4d6d7d7451
Files:
1
packages/speech-dispatcher/files/confSpeechd.conf_00.patch
contrib/angstrom/build-release.sh
Diffs:

#
# mt diff -r3e6216a45414da116d701e5ace53a09e1c10f258 -r3ee21fd3d6d6a0cddf83ef3711c24b4d6d7d7451
#
# 
# 
# add_file "packages/speech-dispatcher/files/confSpeechd.conf_00.patch"
#  content [5bed98a093c466a9bdc46c9b0e8c257398e39c24]
# 
============================================================
--- packages/speech-dispatcher/files/confSpeechd.conf_00.patch	5bed98a093c466a9bdc46c9b0e8c257398e39c24
+++ packages/speech-dispatcher/files/confSpeechd.conf_00.patch	5bed98a093c466a9bdc46c9b0e8c257398e39c24
@@ -0,0 +1,26 @@
+--- speech-dispatcher-0.6.5/config/speechd.conf.in.orig	2008-01-04 13:45:43.000000000 +0000
++++ speech-dispatcher-0.6.5/config/speechd.conf.in	2008-01-04 13:47:31.000000000 +0000
+@@ -129,10 +129,10 @@
+ #  - configuration is the path to the config file of this module,
+ #    either relative (to etc/speechd/modules/) or absolute
+ 
+-AddModule "espeak"       "sd_espeak"   "espeak.conf"
+-AddModule "festival"     "sd_festival"  "festival.conf"
+-AddModule "flite"        "sd_flite"     "flite.conf"
+-#AddModule "espeak-generic" "sd_generic" "espeak-generic.conf"
++#AddModule "espeak"       "sd_espeak"   "espeak.conf"
++#AddModule "festival"     "sd_festival"  "festival.conf"
++#AddModule "flite"        "sd_flite"     "flite.conf"
++AddModule "espeak-generic" "sd_generic" "espeak-generic.conf"
+ #AddModule "epos-generic" "sd_generic"   "epos-generic.conf"
+ #AddModule "dtk-generic"  "sd_generic"   "dtk-generic.conf"
+ #AddModule "ibmtts"       "sd_ibmtts"    "ibmtts.conf"
+@@ -172,6 +172,6 @@
+ 
+ # There are some sample client settings
+ 
+-Include "clients/emacs.conf"
+-Include "clients/gnome-speech.conf"
++#Include "clients/emacs.conf"
++#Include "clients/gnome-speech.conf"
+ 


#
# mt diff -re42568a54d15c18dcefabdfde6196ebefc9febe1 -r3ee21fd3d6d6a0cddf83ef3711c24b4d6d7d7451
#
# 
# 
# patch "contrib/angstrom/build-release.sh"
#  from [4b487748d08b4825735633a40285fee332e77b98]
#    to [b708ec70fd4e4e0c2756d122aa95b1d653019a9e]
# 
============================================================
--- contrib/angstrom/build-release.sh	4b487748d08b4825735633a40285fee332e77b98
+++ contrib/angstrom/build-release.sh	b708ec70fd4e4e0c2756d122aa95b1d653019a9e
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DO_UCLIBC=0
+DO_UCLIBC=1
 
 do_build() {
 	echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf
@@ -20,6 +20,12 @@ do_build() {
 	then
 		BUILD_MODE="uclibc"
 		echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf
+		
+		if [ "$BUILD_CLEAN" != "" ]
+        	then
+                	bitbake -c clean $BUILD_CLEAN
+        	fi
+
 		for target in $BUILD_TARGETS
 		do
 			bitbake $target && do_report_success
@@ -43,7 +49,7 @@ do_report_success() {
 
 
 # No graphics
-for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk
+for machine in ep93xx gumstix-connex gumstix-verdex efika dht-walnut omap5912osk
 do
 	BUILD_MACHINE=$machine
 	BUILD_CLEAN="libtool-cross base-files"