merge of '7b528e427242c4fc04839c0b8e3f065248b5c0dc'

     and 'd8bfa63aa913e7227790ba2d02253cfbecce61ab'

3 files changed, 83 insertions, 17 deletions

diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
new file mode 100755
index 0000000000..fb117d6c11
--- /dev/null
+++ b/contrib/angstrom/build-feeds.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+DO_UCLIBC=0
+
+do_build() {
+	echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf
+
+	BUILD_MODE="glibc"
+	if [ "$BUILD_CLEAN" != "" ]
+	then
+		bitbake -c clean $BUILD_CLEAN
+	fi
+
+	for target in $BUILD_TARGETS
+	do
+		bitbake $target && do_report_success
+	done
+
+	if [ $DO_UCLIBC = 1 ]
+	then
+		BUILD_MODE="uclibc"
+		echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf
+		for target in $BUILD_TARGETS
+		do
+			bitbake $target && do_report_success
+		done
+	fi
+}
+
+do_report_success() {
+
+	echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder-feed.log
+}
+
+for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700  
+do
+        BUILD_MACHINE=$machine
+	BUILD_CLEAN="libtool-cross qmake-native qmake2-native"
+        BUILD_TARGETS="texinfo flex bison gcc binutils automake autoconf m4 pkgconfig \
+	               task-proper-tools mc screen emacs \
+	               mono perl python ruby \
+		       gtk+ qt-x11-free qt4-x11-free \
+		       gpe-mini-browser midori minimo openmoko-browser2 webkit-gtklauncher \
+		       samba \
+		       apache2 boa cherokee lighttpd thttpd \
+		       gpe-gallery gpe-scap notecase \
+		       pidgin irssi \
+		       roadmap-gtk2 gpsdrive navit \
+		       xmms mplayer quasar \
+		       wpa-gui wifi-radar kismet aircrack-ng dsniff \
+		       gpe-bluetooth bluez-gnome python-pybluez \
+		       abiword gnumeric evince epdfview gimp \
+		       flite \
+		       ctorrent \
+		       gnuplot octave fftw fftwf fftwl \
+		       gphoto2 gqview imagemagick ufraw \
+		       tzdata \
+		      "
+	do_build
+done
+
diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh
index 1d778db69c..54c9fb4fa4 100755
--- a/contrib/angstrom/build-release.sh
+++ b/contrib/angstrom/build-release.sh
@@ -32,41 +32,55 @@ 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_CLEAN="libtool-cross"
-	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="minimal-image nslu2-base-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 h3900 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 simpad 
 do
+	BUILD_CLEAN="base-files"
 	BUILD_MACHINE=$machine
-	BUILD_TARGETS="minimal-image console-image minimal-gpe-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"
 	do_build
@@ -81,19 +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
-
-#cross toolchain
 #for machine in ep93xx a780 efika collie ixp4xxbe
 #do
 #        BUILD_MACHINE=$machine
-#        BUILD_TARGETS="meta-toolchain"
-#	BUILD_CLEAN="meta-toolchain"
-#        do_build
+#        BUILD_TARGETS="meta-angstrom-2007"
+#	do_build
 #done
 
diff --git a/contrib/mtn2cl/mtn2cl.sh b/contrib/mtn2cl/mtn2cl.sh
index 416d393ccd..15d2722a8b 100755
--- a/contrib/mtn2cl/mtn2cl.sh
+++ b/contrib/mtn2cl/mtn2cl.sh
@@ -11,7 +11,7 @@ else
     export OLD_REV="l:\"1 week ago\""
 fi
 
-for i in `mtn log --brief --no-graph --no-merges --to ${OLD_REV} --from ${REV_NOW}| awk '{print $2 ":" $1}'` ; do \
+for i in `mtn log --brief --no-graph --no-merges --to "${OLD_REV}" --from "${REV_NOW}"| awk '{print $2 ":" $1}'` ; do \
         export REV=`echo $i | awk -F: '{print $2}'`
         export AUTHOR=`echo $i | awk -F: '{print $1}'`
         export CL=`mtn ls certs ${REV} | grep -A 1 changelog | grep -v changelog | gawk -F'Value : '  '{ print $2 }'`