14 files changed, 54 insertions, 30 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index dcdc18c322..36e1287d03 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -422,7 +422,7 @@ require conf/sanity.conf
 
 IMAGE_FSTYPES ?= "jffs2"
 PCMCIA_MANAGER ?= "pcmcia-cs"
-MACHINE_TASK_PROVIDER ?= "task-bootstrap"
+MACHINE_TASK_PROVIDER ?= "task-base"
 IMAGE_ROOTFS_SIZE_ext2 ?= "65536"
 IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536"
 
diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf
index 08104624ca..abae748589 100644
--- a/conf/machine/h1940.conf
+++ b/conf/machine/h1940.conf
@@ -4,17 +4,24 @@
 
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 TARGET_ARCH = "arm"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-h1940"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
-BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel kernel-modules modutils-collateral module-init-tools"
+#BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel kernel-modules modutils-collateral module-init-tools"
+
+# Set features for task-base
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen"
 
+# Empty modules list for now
 HANDHELD_MODULES = ""
 
-BOOTSTRAP_EXTRA_RDEPENDS +=  "apm apmd network-suspend-scripts"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
+#BOOTSTRAP_EXTRA_RDEPENDS +=  "apm apmd network-suspend-scripts"
+#BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
 
-INHERIT += "linux-kernel-base"
+#INHERIT += "linux-kernel-base"
 
+# Some extra configuration
 GUI_MACHINE_CLASS = "smallscreen"
+SERIAL_CONSOLE = "115200 ttySAC2 vt100"
+USE_VT = "0"
 
diff --git a/conf/machine/include/tune-thumb.conf b/conf/machine/include/tune-thumb.conf
index 2a12443b3d..48003571f1 100644
--- a/conf/machine/include/tune-thumb.conf
+++ b/conf/machine/include/tune-thumb.conf
@@ -23,8 +23,8 @@ OVERRIDES += "${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}"
 #    Compiler and linker options for application code and kernel code.  These
 #    options ensure that the compiler has the correct settings for the selected
 #    instruction set and interworking.
-ARM_INTERWORK_M_OPT = "${@['-mno-thumb-interwork', '-mthumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
-ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
+ARM_INTERWORK_M_OPT = "${@['', '-mthumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
+ARM_THUMB_M_OPT = "${@['', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
 
 #
 TARGET_CC_ARCH +=  "${ARM_INTERWORK_M_OPT} ${ARM_THUMB_M_OPT}"
diff --git a/contrib/python/generate-manifest.py b/contrib/python/generate-manifest.py
index 9810c7b1ae..ec65d221c3 100755
--- a/contrib/python/generate-manifest.py
+++ b/contrib/python/generate-manifest.py
@@ -8,12 +8,12 @@ import os
 import sys
 import time
 
-VERSION = "2.4.3"
+VERSION = "2.4.4"
 # increase when touching python-core
 BASEREV = 0
 
 __author__ = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-__version__ = "$Revision: 1.20 $"
+__version__ = "$Revision: 1.21 $"
 
 class MakefileMaker:
 
@@ -24,7 +24,7 @@ class MakefileMaker:
         self.targetPrefix = "${libdir}/python%s" % VERSION[:3]
         self.output = outfile
         self.out( "#" * 120 )
-        self.out( "### AUTO-GENERATED by '%s' [(C) 2002-2006 Michael 'Mickey' Lauer <mickey@Vanille.de>] on %s" % ( sys.argv[0], time.asctime() ) )
+        self.out( "### AUTO-GENERATED by '%s' [(C) 2002-2007 Michael 'Mickey' Lauer <mickey@Vanille.de>] on %s" % ( sys.argv[0], time.asctime() ) )
         self.out( "###" )
         self.out( "### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy" )
         self.out( "###" )
@@ -158,7 +158,7 @@ if __name__ == "__main__":
 
     m.setPrefix( "/", "/usr/" )
 
-    m.addPackage( 1, "python-core", "Python Interpreter and core modules (needed!)", "",
+    m.addPackage( 0, "python-core", "Python Interpreter and core modules (needed!)", "",
     "lib/python2.4/__future__.* lib/python2.4/copy.* lib/python2.4/copy_reg.* lib/python2.4/ConfigParser.py " +
     "lib/python2.4/getopt.* lib/python2.4/linecache.* lib/python2.4/new.* " +
     "lib/python2.4/os.* lib/python2.4/posixpath.* " +
@@ -202,7 +202,7 @@ if __name__ == "__main__":
     m.addPackage( 0, "python-textutils", "Python Option Parsing, Text Wrapping and Comma-Separated-Value Support", "python-core, python-io, python-re, python-stringold",
     "lib-dynload/_csv.so csv.* optparse.* textwrap.*" )
 
-    m.addPackage( 1, "python-curses", "Python Curses Support", "python-core",
+    m.addPackage( 0, "python-curses", "Python Curses Support", "python-core",
     "curses lib-dynload/_curses.so lib-dynload/_curses_panel.so" ) # package
 
     m.addPackage( 0, "python-datetime", "Python Calendar and Time support", "python-core, python-codecs",
@@ -236,7 +236,7 @@ if __name__ == "__main__":
     "lib-dynload/_socket.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so "
     "pipes.* socket.* tempfile.* StringIO.* " )
 
-    m.addPackage( 1, "python-lang", "Python Low-Level Language Support", "python-core",
+    m.addPackage( 0, "python-lang", "Python Low-Level Language Support", "python-core",
     "lib-dynload/array.so lib-dynload/parser.so lib-dynload/operator.so lib-dynload/_weakref.so " +
     "lib-dynload/itertools.so lib-dynload/collections.so lib-dynload/_bisect.so lib-dynload/_heapq.so " +
     "atexit.* bisect.* code.* codeop.* dis.* heapq.* inspect.* keyword.* opcode.* repr.* token.* tokenize.* " + 
@@ -263,14 +263,14 @@ if __name__ == "__main__":
     m.addPackage( 0, "python-unixadmin", "Python Unix Administration Support", "python-core",
     "lib-dynload/nis.so lib-dynload/grp.so lib-dynload/pwd.so getpass.*" )
 
-    m.addPackage( 1, "python-netclient", "Python Internet Protocol Clients", "python-core, python-datetime, python-io, python-lang, python-logging, python-mime",
+    m.addPackage( 0, "python-netclient", "Python Internet Protocol Clients", "python-core, python-datetime, python-io, python-lang, python-logging, python-mime",
     "*Cookie*.* " + 
     "base64.* cookielib.* ftplib.* gopherlib.* hmac.* httplib.* mimetypes.* nntplib.* poplib.* smtplib.* telnetlib.* urllib.* urllib2.* urlparse.*" )
 
     m.addPackage( 0, "python-netserver", "Python Internet Protocol Servers", "python-core, python-netclient",
     "cgi.* BaseHTTPServer.* SimpleHTTPServer.* SocketServer.*" )
 
-    m.addPackage( 1, "python-pickle", "Python Persistence Support", "python-core, python-codecs, python-io, python-re",
+    m.addPackage( 0, "python-pickle", "Python Persistence Support", "python-core, python-codecs, python-io, python-re",
     "pickle.* shelve.* lib-dynload/cPickle.so" )
 
     m.addPackage( 0, "python-pprint", "Python Pretty-Print Support", "python-core",
@@ -306,7 +306,7 @@ if __name__ == "__main__":
     m.addPackage( 0, "python-tests", "Python Tests", "python-core",
     "test" ) # package
 
-    m.addPackage( 1, "python-threading", "Python Threading & Synchronization Support", "python-core, python-lang",
+    m.addPackage( 0, "python-threading", "Python Threading & Synchronization Support", "python-core, python-lang",
     "_threading_local.* dummy_thread.* dummy_threading.* mutex.* threading.* Queue.*" )
 
     m.addPackage( 0, "python-unittest", "Python Unit Testing Framework", "python-core, python-stringold, python-lang",
@@ -318,7 +318,7 @@ if __name__ == "__main__":
     m.addPackage( 0, "python-xmlrpc", "Python XMLRPC Support", "python-core, python-xml, python-netserver, python-lang",
     "xmlrpclib.* SimpleXMLRPCServer.*" )
 
-    m.addPackage( 1, "python-zlib", "Python zlib Support.", "python-core",
+    m.addPackage( 0, "python-zlib", "Python zlib Support.", "python-core",
     "lib-dynload/zlib.so" )
 
     m.addPackage( 0, "python-mailbox", "Python Mailbox Format Support", "python-core, python-mime",
diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb
index 838ad249c0..d4ce272558 100644
--- a/packages/angstrom/angstrom-bootstrap-image.bb
+++ b/packages/angstrom/angstrom-bootstrap-image.bb
@@ -1,9 +1,14 @@
 #Angstrom bootstrap image
 LICENSE = "MIT"
-PR = "r2"
+PR = "r3"
+
+ANGSTROM_EXTRA_INSTALL ?= ""
 
 DEPENDS = "task-base"
-RDEPENDS = "task-base-core-default task-base"
+RDEPENDS = "task-base-core-default \
+	    task-base \
+	    ${ANGSTROM_EXTRA_INSTALL} \
+	   "
 
 export IMAGE_BASENAME = "bootstrap-image"
 export IMAGE_LINGUAS = ""
diff --git a/packages/gnome/gnomebaker_0.6.0.bb b/packages/gnome/gnomebaker_0.6.0.bb
new file mode 100644
index 0000000000..692ed2ee6c
--- /dev/null
+++ b/packages/gnome/gnomebaker_0.6.0.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Gnomebaker is a GTK2/GNOME cd burning application. "
+LICENSE = "GPLv2"
+
+DEPENDS = "gtk+ libnotify libgnome libgnomeui libxml2 libglade gstreamer"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += "${datadir}/icons"
+
+
diff --git a/packages/python/python-2.4.3-manifest.inc b/packages/python/python-2.4.4-manifest.inc
index c116628678..35017aefe7 100644
--- a/packages/python/python-2.4.3-manifest.inc
+++ b/packages/python/python-2.4.4-manifest.inc
@@ -1,5 +1,5 @@
 ########################################################################################################################
-### AUTO-GENERATED by './generate-manifest.py' [(C) 2002-2006 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Mon Nov  6 00:30:11 2006
+### AUTO-GENERATED by '/local/pkg/oe/org.openembedded.dev/contrib/python/generate-manifest.py' [(C) 2002-2007 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Mon Dec 25 00:05:05 2006
 ###
 ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
 ###
@@ -18,7 +18,7 @@ RDEPENDS_python-profile="python-core"
 FILES_python-profile="${libdir}/python2.4/profile.* ${libdir}/python2.4/pstats.* "
 
 DESCRIPTION_python-threading="Python Threading & Synchronization Support"
-PR_python-threading="ml1"
+PR_python-threading="ml0"
 RDEPENDS_python-threading="python-core python-lang"
 FILES_python-threading="${libdir}/python2.4/_threading_local.* ${libdir}/python2.4/dummy_thread.* ${libdir}/python2.4/dummy_threading.* ${libdir}/python2.4/mutex.* ${libdir}/python2.4/threading.* ${libdir}/python2.4/Queue.* "
 
@@ -38,7 +38,7 @@ RDEPENDS_python-codecs="python-core"
 FILES_python-codecs="${libdir}/python2.4/codecs.* ${libdir}/python2.4/encodings ${libdir}/python2.4/gettext.* ${libdir}/python2.4/locale.* ${libdir}/python2.4/lib-dynload/_locale.so ${libdir}/python2.4/lib-dynload/unicodedata.so ${libdir}/python2.4/stringprep.* ${libdir}/python2.4/xdrlib.* "
 
 DESCRIPTION_python-pickle="Python Persistence Support"
-PR_python-pickle="ml1"
+PR_python-pickle="ml0"
 RDEPENDS_python-pickle="python-core python-codecs python-io python-re"
 FILES_python-pickle="${libdir}/python2.4/pickle.* ${libdir}/python2.4/shelve.* ${libdir}/python2.4/lib-dynload/cPickle.so "
 
@@ -48,7 +48,7 @@ RDEPENDS_python-datetime="python-core python-codecs"
 FILES_python-datetime="${libdir}/python2.4/_strptime.* ${libdir}/python2.4/calendar.* ${libdir}/python2.4/lib-dynload/datetime.so "
 
 DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
-PR_python-core="ml1"
+PR_python-core="ml0"
 RDEPENDS_python-core=""
 FILES_python-core="/usr/lib/python2.4/__future__.* /usr/lib/python2.4/copy.* /usr/lib/python2.4/copy_reg.* /usr/lib/python2.4/ConfigParser.py /usr/lib/python2.4/getopt.* /usr/lib/python2.4/linecache.* /usr/lib/python2.4/new.* /usr/lib/python2.4/os.* /usr/lib/python2.4/posixpath.* /usr/lib/python2.4/warnings.* /usr/lib/python2.4/site.* /usr/lib/python2.4/stat.* /usr/lib/python2.4/UserDict.* /usr/lib/python2.4/UserList.* /usr/lib/python2.4/UserString.* /usr/lib/python2.4/lib-dynload/binascii.so /usr/lib/python2.4/lib-dynload/struct.so /usr/lib/python2.4/lib-dynload/time.so /usr/lib/python2.4/lib-dynload/xreadlines.so /usr/lib/python2.4/types.* /usr/bin/python "
 
@@ -133,7 +133,7 @@ RDEPENDS_python-fcntl="python-core"
 FILES_python-fcntl="${libdir}/python2.4/lib-dynload/fcntl.so "
 
 DESCRIPTION_python-netclient="Python Internet Protocol Clients"
-PR_python-netclient="ml1"
+PR_python-netclient="ml0"
 RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime"
 FILES_python-netclient="${libdir}/python2.4/*Cookie*.* ${libdir}/python2.4/base64.* ${libdir}/python2.4/cookielib.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* "
 
@@ -148,7 +148,7 @@ RDEPENDS_python-netserver="python-core python-netclient"
 FILES_python-netserver="${libdir}/python2.4/cgi.* ${libdir}/python2.4/BaseHTTPServer.* ${libdir}/python2.4/SimpleHTTPServer.* ${libdir}/python2.4/SocketServer.* "
 
 DESCRIPTION_python-curses="Python Curses Support"
-PR_python-curses="ml1"
+PR_python-curses="ml0"
 RDEPENDS_python-curses="python-core"
 FILES_python-curses="${libdir}/python2.4/curses ${libdir}/python2.4/lib-dynload/_curses.so ${libdir}/python2.4/lib-dynload/_curses_panel.so "
 
@@ -238,7 +238,7 @@ RDEPENDS_python-mmap="python-core python-io"
 FILES_python-mmap="${libdir}/python2.4/lib-dynload/mmap.so "
 
 DESCRIPTION_python-zlib="Python zlib Support."
-PR_python-zlib="ml1"
+PR_python-zlib="ml0"
 RDEPENDS_python-zlib="python-core"
 FILES_python-zlib="${libdir}/python2.4/lib-dynload/zlib.so "
 
@@ -258,7 +258,7 @@ RDEPENDS_python-idle="python-core python-tkinter"
 FILES_python-idle="/usr/bin/idle /usr/lib/python2.4/idlelib "
 
 DESCRIPTION_python-lang="Python Low-Level Language Support"
-PR_python-lang="ml1"
+PR_python-lang="ml0"
 RDEPENDS_python-lang="python-core"
 FILES_python-lang="${libdir}/python2.4/lib-dynload/array.so ${libdir}/python2.4/lib-dynload/parser.so ${libdir}/python2.4/lib-dynload/operator.so ${libdir}/python2.4/lib-dynload/_weakref.so ${libdir}/python2.4/lib-dynload/itertools.so ${libdir}/python2.4/lib-dynload/collections.so ${libdir}/python2.4/lib-dynload/_bisect.so ${libdir}/python2.4/lib-dynload/_heapq.so ${libdir}/python2.4/atexit.* ${libdir}/python2.4/bisect.* ${libdir}/python2.4/code.* ${libdir}/python2.4/codeop.* ${libdir}/python2.4/dis.* ${libdir}/python2.4/heapq.* ${libdir}/python2.4/inspect.* ${libdir}/python2.4/keyword.* ${libdir}/python2.4/opcode.* ${libdir}/python2.4/repr.* ${libdir}/python2.4/token.* ${libdir}/python2.4/tokenize.* ${libdir}/python2.4/traceback.* ${libdir}/python2.4/linecache.* ${libdir}/python2.4/weakref.* "
 
diff --git a/packages/python/python-2.4.3/.mtn2git_empty b/packages/python/python-2.4.4/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/python/python-2.4.3/.mtn2git_empty
+++ b/packages/python/python-2.4.4/.mtn2git_empty
diff --git a/packages/python/python-2.4.3/autohell.patch b/packages/python/python-2.4.4/autohell.patch
index b0eebb9ce8..b0eebb9ce8 100644
--- a/packages/python/python-2.4.3/autohell.patch
+++ b/packages/python/python-2.4.4/autohell.patch
diff --git a/packages/python/python-2.4.3/bindir-libdir.patch b/packages/python/python-2.4.4/bindir-libdir.patch
index 27ae5dce5b..27ae5dce5b 100644
--- a/packages/python/python-2.4.3/bindir-libdir.patch
+++ b/packages/python/python-2.4.4/bindir-libdir.patch
diff --git a/packages/python/python-2.4.3/crosscompile.patch b/packages/python/python-2.4.4/crosscompile.patch
index f917bb2567..f917bb2567 100644
--- a/packages/python/python-2.4.3/crosscompile.patch
+++ b/packages/python/python-2.4.4/crosscompile.patch
diff --git a/packages/python/python-2.4.3/fix-tkinter-detection.patch b/packages/python/python-2.4.4/fix-tkinter-detection.patch
index 602aa8e021..602aa8e021 100644
--- a/packages/python/python-2.4.3/fix-tkinter-detection.patch
+++ b/packages/python/python-2.4.4/fix-tkinter-detection.patch
diff --git a/packages/python/python-2.4.3/sitebranding.patch b/packages/python/python-2.4.4/sitebranding.patch
index 85bb83a506..85bb83a506 100644
--- a/packages/python/python-2.4.3/sitebranding.patch
+++ b/packages/python/python-2.4.4/sitebranding.patch
diff --git a/packages/python/python_2.4.3.bb b/packages/python/python_2.4.4.bb
index dfa828bcd9..1a565875c8 100644
--- a/packages/python/python_2.4.3.bb
+++ b/packages/python/python_2.4.4.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 DEPENDS = "python-native readline zlib gdbm openssl tcl tk"
 DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
-PR = "ml8"
+PR = "ml0"
 
 PYTHON_MAJMIN = "2.4"