merge of '26501141207c84e31e0f43c5795a15c0f16dbce5'

     and '86618f966282489d43b51fbf0ee93b954ac615ae'

2 files changed, 27 insertions, 25 deletions

diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh
index 2f882450c8..cf5af3073e 100755
--- a/contrib/angstrom/build-release.sh
+++ b/contrib/angstrom/build-release.sh
@@ -5,7 +5,26 @@ 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
+
+                if [ "$BUILD_CLEAN" != "" ]
+                then
+                        bitbake -c clean $BUILD_CLEAN
+                fi
+
+                for target in $BUILD_TARGETS
+                do
+                        bitbake $target && do_report_success
+                done
+        fi
+
 	BUILD_MODE="glibc"
+        echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf
+        echo 'ANGSTROM_MODE = "glibc"' >> conf/auto.conf
+
 	if [ "$BUILD_CLEAN" != "" ]
 	then
 		bitbake -c clean $BUILD_CLEAN
@@ -15,22 +34,6 @@ do_build() {
 	do
 		bitbake $target && do_report_success
 	done
-
-	if [ $DO_UCLIBC = 1 ]
-	then
-		BUILD_MODE="uclibc"
-		echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf
-		
-		if [ "$BUILD_CLEAN" != "" ]
-        	then
-                	bitbake -c clean $BUILD_CLEAN
-        	fi
-
-		for target in $BUILD_TARGETS
-		do
-			bitbake $target && do_report_success
-		done
-	fi
 }
 
 do_report_success() {
@@ -79,7 +82,7 @@ for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 h5000 pood
 do
 	BUILD_CLEAN="base-files"
 	BUILD_MACHINE=$machine
-	BUILD_TARGETS="base-image console-image minimal-gpe-image x11-image"
+	BUILD_TARGETS="initramfs-bootmenu-image base-image console-image minimal-gpe-image x11-image"
 	do_build
 done
 
diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py
index 3419cab2e5..94ae5ce4fd 100755
--- a/contrib/python/generate-manifest-2.5.py
+++ b/contrib/python/generate-manifest-2.5.py
@@ -9,12 +9,11 @@ import os
 import sys
 import time
 
-VERSION = "2.5.1"
-# increase when touching python-core, this should be the same ml version as in python_2.5.x.bb
-BASEREV = 7
+VERSION = "2.5.2"
+BASEREV = 0
 
 __author__ = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
-__version__ = "20080122"
+__version__ = "20080306"
 
 class MakefileMaker:
 
@@ -188,7 +187,7 @@ if __name__ == "__main__":
     m.addPackage( 0, "python-compression", "Python High Level Compression Support", "python-core python-zlib",
     "gzip.* zipfile.*" )
 
-    m.addPackage( 0, "python-crypt", "Python Basic Cryptographic and Hashing Support", "python-core",
+    m.addPackage( 1, "python-crypt", "Python Basic Cryptographic and Hashing Support", "python-core",
     "hashlib.* md5.* sha.* lib-dynload/crypt.so lib-dynload/_hashlib.so lib-dynload/_sha256.so lib-dynload/_sha512.so" )
 
     m.addPackage( 0, "python-textutils", "Python Option Parsing, Text Wrapping and Comma-Separated-Value Support", "python-core python-io python-re python-stringold",
@@ -295,13 +294,13 @@ if __name__ == "__main__":
     m.addPackage( 0, "python-subprocess", "Python Subprocess Support", "python-core python-io python-re python-fcntl python-pickle",
     "subprocess.*" )
 
-    m.addPackage( 0, "python-sqlite3", "Python Sqlite3 Database Support", "python-core",
-    "sqlite3" ) # package
+    m.addPackage( 1, "python-sqlite3", "Python Sqlite3 Database Support", "python-core",
+    "lib-dynload/_sqlite3.so sqlite3" ) # package
 
     m.addPackage( 0, "python-stringold", "Python String APIs [deprecated]", "python-core python-re",
     "lib-dynload/strop.so string.*" )
 
-    m.addPackage( 0, "python-syslog", "Python's syslog Interface", "python-core",
+    m.addPackage( 0, "python-syslog", "Python's Syslog Interface", "python-core",
     "lib-dynload/syslog.so" )
 
     m.addPackage( 0, "python-terminal", "Python Terminal Controlling Support", "python-core python-io",