merge of '074f227db84b62ec3c531c61efcd62fc6b429dc3'

     and '5af64e0f29377b9ebbc655af469dd70d6a2f6dfb'

1 files changed, 23 insertions, 10 deletions

diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh
index efaaecf110..8b30212790 100755
--- a/contrib/angstrom/build-release.sh
+++ b/contrib/angstrom/build-release.sh
@@ -32,43 +32,57 @@ do_report_success() {
 	echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder.log
 }
 
+#cross toolchain
+#for machine in ep93xx a780 efika collie ixp4xxbe
+#do
+#        BUILD_MACHINE=$machine
+#        BUILD_TARGETS="meta-toolchain"
+#       BUILD_CLEAN="meta-toolchain"
+#        do_build
+#done
+
+
 # No graphics
 for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk
 do
 	BUILD_MACHINE=$machine
-	BUILD_TARGETS="minimal-image console-image"
+	BUILD_CLEAN="libtool-cross base-files"
+	BUILD_TARGETS="base-image console-image"
 	do_build
 done
 
 for machine in ixp4xxle ixp4xxbe 
 do
+	BUILD_CLEAN="base-files"
 	BUILD_MACHINE=$machine
-	BUILD_TARGETS="nslu2-minimal-image"
+	BUILD_TARGETS="base-image nslu2-base-image"
 	do_build
 done	 
 
 # build altboot images for zaurus
 for machine in c7x0 poodle tosa akita spitz collie
 do
+	BUILD_CLEAN="base-files"
 	BUILD_MACHINE=$machine
 	BUILD_TARGETS="altboot-console-image"
 	do_build
 done  
 
 # graphics, flash storage
-for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h4000 poodle tosa hx4700 c7x0 spitz akita collie 
+for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie 
 do
+	BUILD_CLEAN="base-files"
 	BUILD_MACHINE=$machine
-	BUILD_TARGETS="minimal-image console-image x11-image"
+	BUILD_TARGETS="base-image console-image minimal-gpe-image x11-image"
 	do_build
 done
 
 # graphics, disk storage	
 for machine in spitz 
 do
+	BUILD_CLEAN="base-files"
 	BUILD_MACHINE=$machine
 	BUILD_TARGETS="x11-gpe-image x11-pimlico-image x11-office-image"
-	BUILD_CLEAN="qmake2-native"
 	do_build
 done 
 
@@ -76,16 +90,15 @@ done
 for machine in fic-gta01 a780 
 do
 	BUILD_MACHINE=$machine
-	BUILD_TARGETS="openmoko-image"
-	BUILD_CLEAN="qmake2-native"
+	BUILD_TARGETS="minimal-openmoko-image openmoko-image"
 	do_build
 done	
 
-#native toolchain
+# populate feeds
 for machine in ep93xx a780 efika collie ixp4xxbe
 do
         BUILD_MACHINE=$machine
-        BUILD_TARGETS="gcc binutils pkgconfig make automake autoconf libtool m4 perl python gdb strace screen"
-        do_build
+        BUILD_TARGETS="meta-angstrom-2007"
+	do_build
 done