merge of '4b614ea9dfb14d8f67ed00b35c59a2f23b49e2da'

     and '9a0857ebdef17f18989f0702e43595ce522a7a24'

2 files changed, 19 insertions, 4 deletions

diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index 2b00692625..7fc40a0a64 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -70,7 +70,12 @@ do
 		       xserver-kdrive xserver-xorg \
 		       xf86-video-fbdev xf86-video-ati xf86-video-vesa \
 		       xf86-input-evdev xf86-input-keyboard xf86-input-mouse \
-		       task-opie task-opie-all \
+		       task-opie task-opie-games task-opie-apps task-opie-all \
+		       konqueror-embedded ubahnnav freenote inkwp opie-notes mileage pocketcellar timesleuth zgscore \
+		       zlapspeed zuc zddice camera-assistant slcalc sliderulez resistorui qpe-nmap \
+		       atomic checkers fish glider hexatrolic icebloxx labyrinth mahjongg maki nmm pairs pdamaze \
+		       pipeman shisensho sokoban tron win4 zauralign ziq zrev7 zsubhunt ztappy zudoku iaimaster \
+		       qmatrix qfish2 froot \
 		       task-openmoko-base task-openmoko-debug task-openmoko-examples task-openmoko-feed task-openmoko-games task-openmoko-linux task-openmoko-native-sdk task-openmoko-net task-openmoko-phone task-openmoko-pim task-openmoko-ui \
 		       gsm0710muxd frameworkd zhone \
                gnome-games \
diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh
index 044b64ef07..8ede764894 100755
--- a/contrib/angstrom/sort.sh
+++ b/contrib/angstrom/sort.sh
@@ -3,6 +3,11 @@
 # Angstrom feed sorting script
 # This must be run in unstable/ directory 
 
+if [ $(basename $PWD) != "unsorted" ] ; then
+	echo "Not in feed dir! Exiting"
+	exit 1
+fi	
+
 rm Packages* >& /dev/null
 
 # Find ipkg files in unsorted/ and remove stale ones
@@ -64,6 +69,8 @@ case "$arch" in
 			machines="dht-walnut" ;;
 	"ppc603e")
 			machines="efika" ;;
+	"ppce300c3")
+			machines="mpc8313e-rdb mpc8315e-rdb" ;;
 	"sparc")
 			machines="" ;;
 esac
@@ -73,7 +80,7 @@ for i in `find . -name  "*.ipk"| grep $arch` ; do mkdir -p ../$archdir/base/ ||
         for machine in $machines ; do
                 for i in `find . -name  "*_$machine.ipk"| grep $machine` ; do mkdir -p ../$archdir/machine/$machine || true ;mv $i ../$archdir/machine/$machine ; done
 	done
-(cd ../$archdir && do_index )
+( mkdir -p ../$archdir ; cd ../$archdir && do_index )
 
 }
 
@@ -83,6 +90,7 @@ echo "Processing $(basename $PWD) packages...."
 
 BPWD=`pwd`
 
+mkdir -p base
 cd base
 
 mkdir -p ../debug ../perl ../python ../gstreamer ../locales/en || true
@@ -101,6 +109,7 @@ for i in ../* ; do
       echo " DONE"
   fi
 done
+mkdir -p  ${BPWD}/machine
 cd ${BPWD}/machine
 
 for i in ./* ; do
@@ -113,6 +122,7 @@ for i in ./* ; do
   fi
 done
 
+mkdir -p ${BPWD}/locales/en/
 cd ${BPWD}/locales/en/
 echo -n "building index for locales:"
 for i in ../* ; do
@@ -132,7 +142,7 @@ echo " DONE"
 
 echo "Processing 'all' feed"
 for i in `find . -name  "*.ipk"| grep _all` ; do mkdir -p ../all/ || true ;mv $i ../all/ ; done
- (cd ../all && ipkg-make-index -p Packages -m . >& /dev/null ; touch Packages.sig )  
+ (mkdir -p ../all ; cd ../all && ipkg-make-index -p Packages -m . >& /dev/null ; touch Packages.sig )  
 
 for arch in arm-oabi armv4t armv5teb armv5te armv6 armv7a armv7 avr32 bfin geode i486 i586 i686 iwmmxt ppc405 ppc603e sparc ; do 
 	do_sort
@@ -143,4 +153,4 @@ if [ "$1" != "--skip-sorted-list" ]; then
     for i in $(find ../ -name "*.ipk"| grep -v unsorted) ; do basename $i ; done > files-sorted
 fi
 
-(cd ~/website/repo ; php update.php)
+#(cd ~/website/repo ; php update.php)