merge of 'ad0c1c90501edf142b7f2f658fe2c819ce9e0608'

     and 'd8704c548ce3f4b681847003a642608d26644766'

2 files changed, 10 insertions, 10 deletions

diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index 396350066c..efa622d236 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -35,16 +35,16 @@ do_report_success() {
 for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie spitz 
 do
         BUILD_MACHINE=$machine
-	BUILD_CLEAN="libtool-cross"
+	BUILD_CLEAN="libtool-cross qmake2-native"
         BUILD_TARGETS="gcc binutils automake autoconf m4 pkgconfig \
 	               task-proper-tools mc screen \
 	               mono perl python ruby \
 		       gtk+ qt-x11-free qt4-x11-free \
 		       gpe-mini-browser midori minimo openmoko-browser2 webkit-gtklauncher \
-		       boa cherokee lighttpd thttpd \
-		       gpe-gallery gpe-scap pidgin \
+		       apache2 boa cherokee lighttpd thttpd \
+		       gpe-gallery gpe-scap notecase pidgin \
 		       gpsdrive navit \
-		       xmms mplayer \
+		       xmms mplayer quasar \
 		       wpa-gui wifi-radar \
 		       gpe-bluetooth bluez-gnome python-pybluez \
 		       abiword gnumeric evince gimp \
diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh
index 8b30212790..6f86cfe728 100755
--- a/contrib/angstrom/build-release.sh
+++ b/contrib/angstrom/build-release.sh
@@ -95,10 +95,10 @@ do
 done	
 
 # populate feeds
-for machine in ep93xx a780 efika collie ixp4xxbe
-do
-        BUILD_MACHINE=$machine
-        BUILD_TARGETS="meta-angstrom-2007"
-	do_build
-done
+#for machine in ep93xx a780 efika collie ixp4xxbe
+#do
+#        BUILD_MACHINE=$machine
+#        BUILD_TARGETS="meta-angstrom-2007"
+#	do_build
+#done