Merge commit 'origin/org.openembedded.dev' into holger/openmoko-merges

6 files changed, 58 insertions, 41 deletions

diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index 428ddd2146..653d0b941f 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -57,8 +57,9 @@ do_build
 # * armv7a:    beagleboard
 # * ppc405:    dht-walnut
 # * ppc603e:   efika
+# * i586:      qemux86
 
-for machine in simpad om-gta01 c7x0 nokia800 beagleboard dht-walnut efika
+for machine in simpad om-gta01 c7x0 nokia800 beagleboard dht-walnut efika qemux86
 do
 	BUILD_MACHINE=$machine
 	BUILD_CLEAN="qmake-native qmake2-native qt-x11-free python gnome-icon-theme"
@@ -79,8 +80,8 @@ do
 		      checkers \
 		      cherokee \
 		      claws-mail \
-              ctorrent \
-		      distcc \
+		      cvs \
+              distcc \
 		      dsniff \
 		      duke3d \
 		      e-wm \
@@ -124,7 +125,8 @@ do
 		      gpe-mini-browser2 \
 		      gpe-scap \
 		      gpe-sketchbook \
-		      gperf \
+		      git \
+              gperf \
 		      gphoto2 \
 		      gpsdrive \
 		      gqview \
@@ -150,7 +152,8 @@ do
 		      lighttpd \
 		      links-x11 \
               m4 \
-		      mahjongg \
+		      madplay \
+              mahjongg \
 		      make \
 		      maki \
 		      mc \
@@ -160,7 +163,8 @@ do
 		      mono \
 		      mousepad \
               mpfr \
-		      mplayer \
+		      mpg123 \
+              mplayer \
 		      mtd-utils \
 		      mutt \
               mythtv \
@@ -169,7 +173,8 @@ do
 		      nmap \
 		      nmm \
 		      notecase \
-		      openmoko-browser2 \
+		      numptyphysics \
+	          openmoko-browser2 \
 		      openredalert \
 		      openvpn \
 		      opie-notes \
@@ -197,6 +202,7 @@ do
 		      rdesktop \
 		      resistorui \
 		      roadmap-gtk2 \
+		      rtorrent \
 		      ruby \
 		      samba \
 		      screen \
@@ -208,7 +214,8 @@ do
 		      sliderulez \
 		      sokoban \
 		      strace \
-		      sugar \
+		      subversion \
+              sugar \
 		      sylpheed \
               task-gpe-pim \
 		      task-openmoko-feed \
@@ -238,7 +245,8 @@ do
 		      xf86-input-evdev \
 		      xf86-input-keyboard \
 		      xf86-input-mouse \
-		      xf86-video-ati \
+		      xf86-input-tslib \
+              xf86-video-ati \
 		      xf86-video-fbdev \
 		      xf86-video-vesa \
 		      xfce-mcs-manager
@@ -276,7 +284,7 @@ done
 
 # machine packages (machine specific (sub)packages)
 
-for machine in beagleboard omap3evm neuros-osd2 efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 nokia800 
+for machine in beagleboard omap3evm neuros-osd2 efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 nokia800 qemux86  
 do
         BUILD_MACHINE=$machine
 	BUILD_CLEAN=""
@@ -284,7 +292,9 @@ do
                        task-opie task-opie-all \
 		       task-openmoko-base task-openmoko-debug task-openmoko-examples task-openmoko-linux task-openmoko-native-sdk task-openmoko-net task-openmoko-phone task-openmoko-pim task-openmoko-ui \
                        angstrom-x11-base-depends angstrom-gpe-task-settings \
+                       xserver-xorg-conf \ 
                        "
+
 	do_build
 done
 
diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh
index bb903b236a..402f20dd8e 100755
--- a/contrib/angstrom/build-release.sh
+++ b/contrib/angstrom/build-release.sh
@@ -3,36 +3,33 @@
 DO_UCLIBC=1
 
 do_build() {
-	echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf
-
         if [ $DO_UCLIBC = 1 ]
         then
                 BUILD_MODE="uclibc"
-                echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf
+                echo 'ANGSTROM_MODE = "uclibc"' > conf/auto.conf
 
                 if [ "$BUILD_CLEAN" != "" ]
                 then
-                        bitbake -c clean $BUILD_CLEAN
+                        MACHINE=$BUILD_MACHINE bitbake -c clean $BUILD_CLEAN
                 fi
 
                 for target in $BUILD_TARGETS
                 do
-                        bitbake $target && do_report_success
+                        MACHINE=$BUILD_MACHINE bitbake $target && do_report_success
                 done
         fi
 
 	BUILD_MODE="glibc"
-        echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf
-        echo 'ANGSTROM_MODE = "glibc"' >> conf/auto.conf
+        echo 'ANGSTROM_MODE = "glibc"' > conf/auto.conf
 
 	if [ "$BUILD_CLEAN" != "" ]
 	then
-		bitbake -c clean $BUILD_CLEAN
+		MACHINE=$BUILD_MACHINE bitbake -c clean $BUILD_CLEAN
 	fi
 
 	for target in $BUILD_TARGETS
 	do
-		bitbake $target && do_report_success
+		MACHINE=$BUILD_MACHINE bitbake $target && do_report_success
 	done
 }
 
@@ -52,10 +49,10 @@ do_report_success() {
 
 
 # No graphics
-for machine in ep93xx gumstix-connex gumstix-verdex efika dht-walnut omap5912osk
+for machine in gumstix-connex gumstix-verdex efika dht-walnut omap5912osk
 do
 	BUILD_MACHINE=$machine
-	BUILD_CLEAN="libtool-cross base-files"
+	BUILD_CLEAN="base-files"
 	BUILD_TARGETS="base-image console-image"
 	do_build
 done
@@ -78,7 +75,7 @@ do
 done  
 
 # graphics, flash storage
-for machine in om-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 h5000 poodle tosa hx4700 c7x0 spitz akita collie simpad 
+for machine in beagleboard omap3evm om-gta01 om-gta02 a780 at91sam9263ek qemuarm qemux86 h2200 h3900 h4000 h5000 poodle tosa hx4700 c7x0 spitz akita collie simpad 
 do
 	BUILD_CLEAN="base-files"
 	BUILD_MACHINE=$machine
@@ -87,7 +84,7 @@ do
 done
 
 # graphics, disk storage	
-for machine in spitz 
+for machine in spitz beagleboard omap3evm 
 do
 	BUILD_CLEAN="base-files"
 	BUILD_MACHINE=$machine
@@ -96,18 +93,17 @@ do
 done 
 
 #phones
-for machine in om-gta01 a780 
+for machine in om-gta01 om-gta02 a780  
 do
 	BUILD_MACHINE=$machine
-	BUILD_TARGETS="minimal-openmoko-image openmoko-image"
+	BUILD_TARGETS="minimal-openmoko-image openmoko-image fso-console-image fso-illume-image fso-image-light fso-image-nox fso-image"
 	do_build
 done	
 
-# populate feeds
-#for machine in ep93xx a780 efika collie ixp4xxbe
-#do
-#        BUILD_MACHINE=$machine
-#        BUILD_TARGETS="meta-angstrom-2007"
-#	do_build
-#done
-
+# omap3 boards
+for machine in beagleboard omap3evm
+do
+	BUILD_MACHINE=$machine
+	BUILD_TARGETS="beagleboard-demo-image"
+	do_build
+done
diff --git a/contrib/angstrom/source-mirror.txt b/contrib/angstrom/source-mirror.txt
index 524134779e..2c450ff134 100644
--- a/contrib/angstrom/source-mirror.txt
+++ b/contrib/angstrom/source-mirror.txt
@@ -1,6 +1,6 @@
 #To populate the source mirror the autobuilder uses the following command:
 
-rsync ~/OE/downloads/ angstrom@linuxtogo.org:~/website/unstable/sources/ -av \
+rsync ~/OE/downloads/ angstrom@linuxtogo.org:~/website/unstable/sources/ -aPvz \
 	--exclude "*.md5" \
 	--exclude "svn" \
 	--exclude "hg" \
@@ -11,6 +11,5 @@ rsync ~/OE/downloads/ angstrom@linuxtogo.org:~/website/unstable/sources/ -av \
 	--exclude "IPL_ixp400NpeLibrary-2_3_2.zip" \
 	--exclude "*.lock" \
 	--exclude "codec_*" \
-	--exclude "dsplink*" \
-	--progress
+	--exclude "dsplink*" 
 
diff --git a/contrib/feed-browser/includes/functions.inc b/contrib/feed-browser/includes/functions.inc
index d4454ca708..4c7841f797 100644
--- a/contrib/feed-browser/includes/functions.inc
+++ b/contrib/feed-browser/includes/functions.inc
@@ -428,7 +428,7 @@ function check_database()
 {
 	$db_exists = FALSE;
 
-	if(file_exists(DB_FILENAME) AND $db = sqlite_open(DB_FILENAME))
+	if($db = sqlite_open(DB_FILENAME))
 	{
 		$db_exists = TRUE;
 
@@ -461,7 +461,7 @@ function check_database()
 				f_id         int(8),
 				f_name       varchar(32),
 				f_uri        varchar(100),
-				f_type		 varchar(16)
+				f_type		 varchar(16),
 				f_comments   varchar(500))");
 
 			insert_feeds ($db) ;
diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py
index f33ba7e23d..8054608ce9 100755
--- a/contrib/python/generate-manifest-2.5.py
+++ b/contrib/python/generate-manifest-2.5.py
@@ -13,7 +13,7 @@ VERSION = "2.5.2"
 BASEREV = 0
 
 __author__ = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
-__version__ = "20080722"
+__version__ = "20081102"
 
 class MakefileMaker:
 
@@ -277,8 +277,8 @@ if __name__ == "__main__":
     m.addPackage( 0, "python-pprint", "Python Pretty-Print Support", "python-core",
     "pprint.*" )
 
-    m.addPackage( 0, "python-profile", "Python Basic Profiling Support", "python-core",
-    "profile.* pstats.*" )
+    m.addPackage( 0, "python-profile", "Python Basic Profiling Support", "python-core python-textutils",
+    "profile.* pstats.* cProfile.* lib-dynload/_lsprof.so" )
 
     m.addPackage( 0, "python-re", "Python Regular Expression APIs", "python-core",
     "re.* sre.* sre_compile.* sre_constants* sre_parse.*" ) # _sre is builtin
diff --git a/contrib/weekly-changelog-report.py b/contrib/weekly-changelog-report.py
index 101de2919b..22535f32b1 100755
--- a/contrib/weekly-changelog-report.py
+++ b/contrib/weekly-changelog-report.py
@@ -25,4 +25,16 @@ print "OE weekly changelog %s to %s\n" % (start_day.isoformat(), end_day.isoform
 
 os.system("git-shortlog --since=%s --until=%s | grep -v \"Merge branch\" | grep -v \"Merge commit\"" % (start_day.isoformat(), end_day.isoformat()))
 
+os.system("wget 'http://bugs.openembedded.net/buglist.cgi?bug_file_loc=&bug_file_loc_type=allwordssubstr&bug_id=&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&bugidtype=include&chfieldfrom=7d&chfieldto=Now&chfieldvalue=&email1=&email2=&emailassigned_to1=1&emailassigned_to2=1&emailcc2=1&emailqa_contact2=1&emailreporter2=1&emailtype1=substring&emailtype2=substring&field-1-0-0=bug_status&field0-0-0=noop&known_name=1WFixed&long_desc=&long_desc_type=substring&query_format=advanced&remaction=&short_desc=&short_desc_type=allwordssubstr&type-1-0-0=anyexact&type0-0-0=noop&value-1-0-0=RESOLVED%2CVERIFIED%2CCLOSED&value0-0-0=&ctype=csv' -O resolved-bugs.csv >& /dev/null")
+os.system("wget 'http://bugs.openembedded.net/buglist.cgi?bug_file_loc=&bug_file_loc_type=allwordssubstr&bug_id=&bug_status=NEW&bugidtype=include&chfield=%5BBug%20creation%5D&chfieldfrom=7d&chfieldto=Now&chfieldvalue=&email1=&email2=&emailassigned_to1=1&emailassigned_to2=1&emailcc2=1&emailqa_contact2=1&emailreporter2=1&emailtype1=substring&emailtype2=substring&field-1-0-0=bug_status&field0-0-0=noop&long_desc=&long_desc_type=substring&query_format=advanced&remaction=&short_desc=&short_desc_type=allwordssubstr&type-1-0-0=anyexact&type0-0-0=noop&value-1-0-0=NEW&value0-0-0=&ctype=csv' -O new-bugs.csv &> /dev/null")
+
+
+print "Bugs fixed:\n"
+
+os.system("cat resolved-bugs.csv | awk -F, '{print $1 \" \" $7 \"\t \" $8}' | sed s:\\\"::g")
+
+print "\nBugs opened:\n"
+
+os.system("cat new-bugs.csv | awk -F, '{print $1 \" \" $7 \"\t \" $8}' | sed s:\\\"::g")
+