Pinky 3.1.2 Release

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

bitbake/lib/bb/COW.py

@@ -26,7 +26,7 @@
 from inspect import getmro
 
 import copy
-import types, sets
+import types
 types.ImmutableTypes = tuple([ \
     types.BooleanType, \
     types.ComplexType, \
@@ -35,7 +35,7 @@ types.ImmutableTypes = tuple([ \
     types.LongType, \
     types.NoneType, \
     types.TupleType, \
-    sets.ImmutableSet] + \
+    frozenset] + \
     list(types.StringTypes))
 
 MUTABLE = "__mutable__"

bitbake/lib/bb/cache.py

@@ -31,7 +31,6 @@
 import os, re
 import bb.data
 import bb.utils
-from sets import Set
 
 try:
     import cPickle as pickle
@@ -258,7 +257,7 @@ class Cache:
         pv       = self.getVar('PV', file_name, True)
         pr       = self.getVar('PR', file_name, True)
         dp       = int(self.getVar('DEFAULT_PREFERENCE', file_name, True) or "0")
-        provides  = Set([pn] + (self.getVar("PROVIDES", file_name, True) or "").split())
+        provides  = set([pn] + (self.getVar("PROVIDES", file_name, True) or "").split())
         depends   = bb.utils.explode_deps(self.getVar("DEPENDS", file_name, True) or "")
         packages  = (self.getVar('PACKAGES', file_name, True) or "").split()
         packages_dynamic = (self.getVar('PACKAGES_DYNAMIC', file_name, True) or "").split()
@@ -283,17 +282,17 @@ class Cache:
         # Forward: virtual -> [filenames]
         # Reverse: PN -> [virtuals]
         if pn not in cacheData.pn_provides:
-            cacheData.pn_provides[pn] = Set()
+            cacheData.pn_provides[pn] = set()
         cacheData.pn_provides[pn] |= provides
 
-        cacheData.fn_provides[file_name] = Set()
+        cacheData.fn_provides[file_name] = set()
         for provide in provides:
             if provide not in cacheData.providers:
                 cacheData.providers[provide] = []
             cacheData.providers[provide].append(file_name)
             cacheData.fn_provides[file_name].add(provide)
 
-        cacheData.deps[file_name] = Set()
+        cacheData.deps[file_name] = set()
         for dep in depends:
             cacheData.all_depends.add(dep)
             cacheData.deps[file_name].add(dep)
@@ -417,7 +416,7 @@ class CacheData:
         self.pkg_dp = {}
         self.pn_provides = {}
         self.fn_provides = {}
-        self.all_depends = Set()
+        self.all_depends = set()
         self.deps = {}
         self.rundeps = {}
         self.runrecs = {}
@@ -431,6 +430,6 @@ class CacheData:
         (set elsewhere)
         """
         self.ignored_dependencies = []
-        self.world_target = Set()
+        self.world_target = set()
         self.bbfile_priority = {}
         self.bbfile_config_priorities = []

bitbake/lib/bb/cooker.py

@@ -25,7 +25,6 @@
 import sys, os, getopt, glob, copy, os.path, re, time
 import bb
 from bb import utils, data, parse, event, cache, providers, taskdata, runqueue
-from sets import Set
 import itertools, sre_constants
 
 parsespin = itertools.cycle( r'|/-\\' )
@@ -540,7 +539,7 @@ class BBCooker:
         self.status = bb.cache.CacheData()
 
         ignore = bb.data.getVar("ASSUME_PROVIDED", self.configuration.data, 1) or ""
-        self.status.ignored_dependencies = Set( ignore.split() )
+        self.status.ignored_dependencies = set( ignore.split() )
 
         self.handleCollections( bb.data.getVar("BBFILE_COLLECTIONS", self.configuration.data, 1) )
 

bitbake/lib/bb/data_smart.py

@@ -32,7 +32,6 @@ import copy, os, re, sys, time, types
 import bb
 from bb   import utils, methodpool
 from COW  import COWDictBase
-from sets import Set
 from new  import classobj
 
 
@@ -142,7 +141,7 @@ class DataSmart:
             try:
                 self._special_values[keyword].add( base )
             except:
-                self._special_values[keyword] = Set()
+                self._special_values[keyword] = set()
                 self._special_values[keyword].add( base )
 
             return
@@ -157,7 +156,7 @@ class DataSmart:
         if '_' in var:
             override = var[var.rfind('_')+1:]
             if not self._seen_overrides.has_key(override):
-                self._seen_overrides[override] = Set()
+                self._seen_overrides[override] = set()
             self._seen_overrides[override].add( var )
 
         # setting var

bitbake/lib/bb/runqueue.py

@@ -23,7 +23,6 @@ Handles preparation and execution of a queue of tasks
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 from bb import msg, data, event, mkdirhier, utils
-from sets import Set 
 import bb, os, sys
 import signal
 
@@ -484,8 +483,8 @@ class RunQueue:
 
             self.runq_fnid.append(taskData.tasks_fnid[task])
             self.runq_task.append(taskData.tasks_name[task])
-            self.runq_depends.append(Set(depends))
-            self.runq_revdeps.append(Set())
+            self.runq_depends.append(set(depends))
+            self.runq_revdeps.append(set())
 
             runq_build.append(0)
 
@@ -579,7 +578,7 @@ class RunQueue:
                 if maps[origdep] == -1:
                     bb.msg.fatal(bb.msg.domain.RunQueue, "Invalid mapping - Should never happen!")
                 newdeps.append(maps[origdep])
-            self.runq_depends[listid] = Set(newdeps)
+            self.runq_depends[listid] = set(newdeps)
 
         bb.msg.note(2, bb.msg.domain.RunQueue, "Assign Weightings")
 

meta/classes/base.bbclass

@@ -85,7 +85,7 @@ def base_chk_file(parser, pn, pv, src_uri, localpath, data):
 
 
 def base_dep_prepend(d):
-	import bb;
+	import bb
 	#
 	# Ideally this will check a flag so we will operate properly in
 	# the case where host == build == target, for now we don't work in
@@ -149,6 +149,14 @@ def base_both_contain(variable1, variable2, checkvalue, d):
 
 DEPENDS_prepend="${@base_dep_prepend(d)} "
 
+def base_prune_suffix(var, suffixes, d):
+    # See if var ends with any of the suffixes listed and 
+    # remove it if found
+    for suffix in suffixes:
+        if var.endswith(suffix):
+            return var.replace(suffix, "")
+    return var
+
 def base_set_filespath(path, d):
 	import os, bb
 	filespath = []
@@ -159,7 +167,7 @@ def base_set_filespath(path, d):
 			filespath.append(os.path.join(p, o))
 	return ":".join(filespath)
 
-FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ], d)}"
+FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/${BP}", "${FILE_DIRNAME}/${BPN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ], d)}"
 
 def oe_filter(f, str, d):
 	from re import match
@@ -518,8 +526,16 @@ base_do_buildall() {
 }
 
 
+ 
+def subprocess_setup():
+       import signal
+       # Python installs a SIGPIPE handler by default. This is usually not what
+       # non-Python subprocesses expect.
+       # SIGPIPE errors are known issues with gzip/bash
+       signal.signal(signal.SIGPIPE, signal.SIG_DFL)
+
 def oe_unpack_file(file, data, url = None):
-	import bb, os
+	import bb, os, subprocess
 	if not url:
 		url = "file://%s" % file
 	dots = file.split(".")
@@ -575,9 +591,20 @@ def oe_unpack_file(file, data, url = None):
 		if os.path.samefile(file, dest):
 			return True
 
+	# Change to subdir before executing command
+	save_cwd = os.getcwd();
+	parm = bb.decodeurl(url)[5]
+	if 'subdir' in parm:
+		newdir = ("%s/%s" % (os.getcwd(), parm['subdir']))
+		bb.mkdirhier(newdir)
+		os.chdir(newdir)
+
 	cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', data, 1), cmd)
 	bb.note("Unpacking %s to %s/" % (file, os.getcwd()))
-	ret = os.system(cmd)
+	ret = subprocess.call(cmd, preexec_fn=subprocess_setup, shell=True)
+
+	os.chdir(save_cwd)
+
 	return ret == 0
 
 addtask unpack after do_fetch

meta/classes/distutils.bbclass

@@ -1,12 +1,16 @@
 inherit distutils-base
 
 distutils_do_compile() {
+	 STAGING_INCDIR=${STAGING_INCDIR} \
+	 STAGING_LIBDIR=${STAGING_LIBDIR} \
          BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
          ${STAGING_BINDIR_NATIVE}/python setup.py build || \
          oefatal "python setup.py build_ext execution failed."
 }
 
 distutils_stage_headers() {
+	 STAGING_INCDIR=${STAGING_INCDIR} \
+	 STAGING_LIBDIR=${STAGING_LIBDIR} \
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
         ${STAGING_BINDIR_NATIVE}/python setup.py install_headers --install-dir=${STAGING_INCDIR}/${PYTHON_DIR} || \
         oefatal "python setup.py install_headers execution failed."
@@ -14,6 +18,8 @@ distutils_stage_headers() {
 
 distutils_stage_all() {
         install -d ${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages
+	STAGING_INCDIR=${STAGING_INCDIR} \
+	STAGING_LIBDIR=${STAGING_LIBDIR} \
         PYTHONPATH=${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages \
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
         ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${STAGING_DIR_HOST}${layout_prefix} --install-data=${STAGING_DATADIR} || \
@@ -22,6 +28,8 @@ distutils_stage_all() {
 
 distutils_do_install() {
         install -d ${D}${libdir}/${PYTHON_DIR}/site-packages
+	STAGING_INCDIR=${STAGING_INCDIR} \
+	STAGING_LIBDIR=${STAGING_LIBDIR} \
         PYTHONPATH=${D}/${libdir}/${PYTHON_DIR}/site-packages \
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
         ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir} || \

meta/classes/image.bbclass

@@ -88,6 +88,8 @@ fakeroot do_rootfs () {
 	rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/lists/*
 	
 	${IMAGE_PREPROCESS_COMMAND}
+
+	export ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{size = ${IMAGE_EXTRA_SPACE} + $1; print (size > ${IMAGE_ROOTFS_SIZE} ? size : ${IMAGE_ROOTFS_SIZE}) }'`
 		
 	export TOPDIR=${TOPDIR}
 	export MACHINE=${MACHINE}

meta/classes/kernel.bbclass

@@ -390,7 +390,7 @@ python populate_packages_prepend () {
 	metapkg = "kernel-modules"
 	bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d)
 	bb.data.setVar('FILES_' + metapkg, "", d)
-	blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base' ]
+	blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux' ]
 	for l in module_deps.values():
 		for i in l:
 			pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1))

meta/classes/package.bbclass

@@ -21,7 +21,7 @@ def legitimize_package_name(s):
 	# Remaining package name validity fixes
 	return s.lower().replace('_', '-').replace('@', '+').replace(',', '+').replace('/', '-')
 
-def do_split_packages(d, root, file_regex, output_pattern, description, postinst=None, recursive=False, hook=None, extra_depends=None, aux_files_pattern=None, postrm=None, allow_dirs=False, prepend=False, match_path=False, aux_files_pattern_verbatim=None):
+def do_split_packages(d, root, file_regex, output_pattern, description, postinst=None, recursive=False, hook=None, extra_depends=None, aux_files_pattern=None, postrm=None, allow_dirs=False, prepend=False, match_path=False, aux_files_pattern_verbatim=None, allow_links=False):
 	"""
 	Used in .bb files to split up dynamically generated subpackages of a 
 	given package, usually plugins or modules.
@@ -70,7 +70,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
 			continue
 		f = os.path.join(dvar + root, o)
 		mode = os.lstat(f).st_mode
-		if not (stat.S_ISREG(mode) or (allow_dirs and stat.S_ISDIR(mode))):
+		if not (stat.S_ISREG(mode) or (allow_links and stat.S_ISLNK(mode)) or (allow_dirs and stat.S_ISDIR(mode))):
 			continue
 		on = legitimize_package_name(m.group(1))
 		pkg = output_pattern % on

meta/classes/patch.bbclass

@@ -7,10 +7,18 @@ def patch_init(d):
 	import os, sys
 
 	def md5sum(fname):
-		import md5, sys
+		import sys
+
+		# when we move to Python 2.5 as minimal supported
+		# we can kill that try/except as hashlib is 2.5+
+		try:
+			import hashlib
+			m = hashlib.md5()
+		except ImportError:
+			import md5
+			m = md5.new()
 
 		f = file(fname, 'rb')
-		m = md5.new()
 		while True:
 			d = f.read(8096)
 			if not d:

meta/classes/poky-image.bbclass

@@ -81,4 +81,4 @@ SATO_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-sato apps-x11-games apps-x
 inherit image
 
 # Create /etc/timestamp during image construction to give a reasonably sane default time setting
-ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp"
+ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ;"

meta/classes/poky.bbclass

@@ -1,4 +1,4 @@
 MIRRORS_append () {
-ftp://.*/.*/    http://www.o-hand.com/~richard/poky/sources/
-http://.*/.*/   http://www.o-hand.com/~richard/poky/sources/
+ftp://.*/.*    http://www.o-hand.com/~richard/poky/sources/
+http://.*/.*   http://www.o-hand.com/~richard/poky/sources/
 }

meta/classes/rootfs_deb.bbclass

@@ -39,7 +39,7 @@ fakeroot rootfs_deb_do_rootfs () {
 	tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_ETCDIR_NATIVE}/apt/sources.list
 
 	cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \
-		| sed -e 's#Architecture ".*";#Architecture "${TARGET_ARCH}";#' \
+		| sed -e 's#Architecture ".*";#Architecture "${DPKG_ARCH}";#' \
 		> "${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf"
 
 	export APT_CONFIG="${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf"

meta/classes/sanity.bbclass

@@ -96,6 +96,12 @@ def check_sanity(e):
 		if not check_app_exists("qemu-arm", e.data):
 			messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries (qemu-arm) can't be found in PATH"
 
+	if os.path.exists("/proc/sys/vm/mmap_min_addr"):
+		f = file("/proc/sys/vm/mmap_min_addr", "r")
+		if (f.read().strip() != "0"):
+			messages = messages + "/proc/sys/vm/mmap_min_addr is not 0. This will cause problems with qemu so please fix the value (as root).\n\nTo fix this in later reboots, set vm.mmap_min_addr = 0 in /etc/sysctl.conf.\n"
+		f.close()
+
 	for util in required_utilities.split():
 		if not check_app_exists( util, e.data ):
 			missing = missing + "%s," % util

meta/conf/bitbake.conf

@@ -135,13 +135,20 @@ EXTENDPEVER = "${@['','${PE\x7d:'][bb.data.getVar('PE',d,1) > 0]}"
 DEBPV = "${EXTENDPEVER}${PV}-${PR}"
 P = "${PN}-${PV}"
 
+# Base package name
+# Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial"
+# otherwise it is the same as PN and P
+SPECIAL_PKGSUFFIX = "-native -cross-sdk -cross -sdk -initial -intermediate"
+BPN = "${@base_prune_suffix(bb.data.getVar('PN', d, True), bb.data.getVar('SPECIAL_PKGSUFFIX', d, True).split(), d)}"
+BP = "${BPN}-${PV}"
+
 # Package info.
 
 SECTION = "base"
 PRIORITY = "optional"
 DESCRIPTION = "Version ${PV}-${PR} of package ${PN}"
 LICENSE = "unknown"
-MAINTAINER = "OpenedHand <poky@openedhand.com>"
+MAINTAINER = "Poky Team <poky@openedhand.com>"
 HOMEPAGE = "unknown"
 
 # Package dependencies and provides.
@@ -217,7 +224,7 @@ STAMP = "${TMPDIR}/stamps/${PF}"
 WORKDIR = "${TMPDIR}/work/${PF}"
 T = "${WORKDIR}/temp"
 D = "${WORKDIR}/image"
-S = "${WORKDIR}/${P}"
+S = "${WORKDIR}/${BP}"
 B = "${S}"
 
 STAGING_DIR = "${TMPDIR}/staging"
@@ -269,15 +276,16 @@ IMAGE_ROOTFS = "${TMPDIR}/rootfs"
 IMAGE_BASENAME = "${PN}"
 IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}"
 IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}"
+IMAGE_EXTRA_SPACE = "10240"
 
 IMAGE_CMD = ""
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
 IMAGE_CMD_yaffs2 = "mkyaffs2image ${EXTRA_IMAGECMD} ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.yaffs2"
 IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}"
-IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}"
-IMAGE_CMD_ext2.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz"
-IMAGE_CMD_ext3 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
-IMAGE_CMD_ext3.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz"
+IMAGE_CMD_ext2 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}"
+IMAGE_CMD_ext2.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz"
+IMAGE_CMD_ext3 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
+IMAGE_CMD_ext3.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz"
 IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
 IMAGE_CMD_squashfs-lzma = "mksquashfs-lzma ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend"
 IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ."
@@ -562,6 +570,7 @@ IMAGE_FSTYPES ?= "jffs2"
 PCMCIA_MANAGER ?= "pcmcia-cs"
 DEFAULT_TASK_PROVIDER ?= "task-base"
 MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}"
+IMAGE_ROOTFS_SIZE ?= "65536"
 IMAGE_ROOTFS_SIZE_ext2 ?= "65536"
 IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536"
 IMAGE_ROOTFS_SIZE_ext3 ?= "65536"

meta/conf/distro/poky.conf

@@ -3,7 +3,7 @@
 
 DISTRO = "poky"
 DISTRO_NAME = "OpenedHand Linux (Poky)"
-DISTRO_VERSION = "3.1"
+DISTRO_VERSION = "3.1.2"
 #DISTRO_VERSION = "3.2+snapshot-${DATE}"
 
 MAINTAINER = "OpenedHand <poky@openedhand.com>"

meta/packages/binutils/binutils-cross-sdk.inc

@@ -2,7 +2,8 @@ inherit sdk
 DEPENDS += "flex-native bison-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
 EXTRA_OECONF = "--with-sysroot=${prefix}/${TARGET_SYS} \
-		--program-prefix=${TARGET_PREFIX}"
+		--program-prefix=${TARGET_PREFIX} \
+		--disable-werror"
 
 do_stage() {
 	:

meta/packages/binutils/binutils-cross-sdk_2.18.bb

@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-sdk.inc
-PR = "r3"
+PR = "r4"

meta/packages/binutils/binutils-cross.inc

@@ -4,7 +4,9 @@ DEPENDS += "flex-native bison-native"
 PROVIDES = "virtual/${TARGET_PREFIX}binutils"
 PACKAGES = ""
 EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \
-		--program-prefix=${TARGET_PREFIX}"
+		--program-prefix=${TARGET_PREFIX} \
+		--enable-install-libbfd \
+                --disable-werror"
 
 do_stage () {
 	oe_runmake install
@@ -16,13 +18,17 @@ do_stage () {
 	rm -rf ${CROSS_DIR}/share/man
 	rmdir ${CROSS_DIR}/share || :
 	rmdir ${CROSS_DIR}/${libdir}/gcc-lib || :
+	rmdir ${CROSS_DIR}/${libdir}64/gcc-lib || :
 	rmdir ${CROSS_DIR}/${libdir} || :
+	rmdir ${CROSS_DIR}/${libdir}64 || :
 	rmdir ${CROSS_DIR}/${prefix} || :
 
 	# We want to move this into the target specific location
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
-	mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib
+	mkdir -p ${STAGING_DIR_TARGET}/lib
+	mv -f ${CROSS_DIR}/lib/libiberty.a ${STAGING_DIR_TARGET}/lib/lib || \
+		mv -f ${CROSS_DIR}/lib64/libiberty.a ${STAGING_DIR_TARGET}/lib/lib
 	rmdir ${CROSS_DIR}/lib || :
+	rmdir ${CROSS_DIR}/lib64 || :
 }
 
 do_install () {

meta/packages/db/db_4.1.25.bb

@@ -10,11 +10,11 @@
 # same system at the same time if really necessary.
 SECTION = "libs"
 DESCRIPTION = "Berkeley DB v4."
-HOMEPAGE = "http://www.sleepycat.com"
+HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
 LICENSE = "BSD Sleepycat"
-PR = "r2"
+PR = "r3"
 
-SRC_URI = "http://downloads.sleepycat.com/${P}.tar.gz"
+SRC_URI = "http://download.oracle.com/berkeley-db/${P}.tar.gz"
 
 inherit autotools
 

meta/packages/db/db_4.2.52.bb

@@ -10,13 +10,13 @@
 # same system at the same time if really necessary.
 SECTION = "libs"
 DESCRIPTION = "Berkeley DB v4."
-HOMEPAGE = "http://www.sleepycat.com"
+HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
 LICENSE = "BSD Sleepycat"
 VIRTUAL_NAME ?= "virtual/db"
 CONFLICTS = "db3"
-PR = "r7"
+PR = "r8"
 
-SRC_URI = "http://downloads.sleepycat.com/db-${PV}.tar.gz \
+SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz \
            file://configure_fixes.patch;patch=1 "
 #SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5"
 #TODO SRC_URI += "file://arm-thumb-mutex.patch;patch=1"

meta/packages/db/db_4.3.29.bb

@@ -13,13 +13,13 @@ DEFAULT_PREFERENCE = "-1"
 # same system at the same time if really necessary.
 SECTION = "libs"
 DESCRIPTION = "Berkeley DB v4."
-HOMEPAGE = "http://www.sleepycat.com"
+HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
 LICENSE = "BSD Sleepycat"
 VIRTUAL_NAME ?= "virtual/db"
 CONFLICTS = "db3"
-PR = "r7"
+PR = "r8"
 
-SRC_URI = "http://downloads.sleepycat.com/db-${PV}.tar.gz"
+SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
 #SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5"
 SRC_URI += "file://arm-thumb-mutex.patch;patch=1"
 

meta/packages/dbus/dbus-1.0.3/fix-cr-size.patch

@@ -0,0 +1,24 @@
+Dbus-native fails to build on few systems:
+
+- Debian 'sid' post-Lenny release
+- Fedora 9
+
+Bug was reported in OE bugtracker: http://bugs.openembedded.net/show_bug.cgi?id=4334
+
+| dbus-sysdeps-unix.c: In function '_dbus_read_credentials_unix_socket':
+| dbus-sysdeps-unix.c:1002: error: storage size of 'cr' isn't known
+| dbus-sysdeps-unix.c:1005: warning: pointer targets in passing argument 5 of 'getsockopt' differ in signedness
+| dbus-sysdeps-unix.c:1002: warning: unused variable 'cr'
+
+diff -urN dbus-1.0.1.orig/dbus/dbus-sysdeps-unix.c dbus-1.0.1/dbus/dbus-sysdeps-unix.c
+--- dbus-1.0.1.orig/dbus/dbus-sysdeps-unix.c	2009-01-01 03:50:33.000000000 +0200
++++ dbus-1.0.1/dbus/dbus-sysdeps-unix.c	2009-01-01 04:09:24.000000000 +0200
+@@ -992,7 +992,7 @@
+   _dbus_verbose ("read credentials byte\n");
+ 
+   {
+-#ifdef SO_PEERCRED
++#if defined(SO_PEERCRED) && defined(HAVE_GETPEERUCRED)
+     struct ucred cr;   
+     int cr_len = sizeof (cr);
+    

meta/packages/dbus/dbus-native_1.0.3.bb

@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 LICENSE = "GPL"
 SECTION = "base"
 
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "glib-2.0-native libxml2-native expat-native"
 
@@ -12,6 +12,7 @@ DEFAULT_PREFERENCE = "-1"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}"
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
 	   file://cross.patch;patch=1 \
+	   file://fix-cr-size.patch;patch=1 \
 	   "
 
 inherit autotools pkgconfig gettext native

meta/packages/dbus/dbus.inc

@@ -3,7 +3,7 @@ PR = "r0"
 HOMEPAGE = "http://dbus.freedesktop.org"
 DESCRIPTION = "Message bus system for applications to talk to one another"
 LICENSE = "GPL"
-DEPENDS = "expat glib-2.0 virtual/libintl virtual/libx11"
+DEPENDS = "expat glib-2.0 virtual/libintl virtual/libx11 libsm"
 
 DEFAULT_PREFERENCE = "-1"
 

meta/packages/e2fsprogs/e2fsprogs.inc

@@ -4,7 +4,8 @@ LICENSE = "GPL"
 SECTION = "base"
 DEPENDS = "gettext"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
+           file://ubuntu904.patch;patch=1"
 
 inherit autotools
 

meta/packages/e2fsprogs/e2fsprogs/ubuntu904.patch

@@ -0,0 +1,13 @@
+Index: e2fsprogs-1.38/lib/ext2fs/ismounted.c
+===================================================================
+--- e2fsprogs-1.38.orig/lib/ext2fs/ismounted.c	2009-07-28 13:48:34.000000000 +0200
++++ e2fsprogs-1.38/lib/ext2fs/ismounted.c	2009-07-28 13:49:10.000000000 +0200
+@@ -147,7 +147,7 @@
+ is_root:
+ #define TEST_FILE "/.ismount-test-file"		
+ 		*mount_flags |= EXT2_MF_ISROOT;
+-		fd = open(TEST_FILE, O_RDWR|O_CREAT);
++		fd = open(TEST_FILE, O_RDWR|O_CREAT, 0600);
+ 		if (fd < 0) {
+ 			if (errno == EROFS)
+ 				*mount_flags |= EXT2_MF_READONLY;

meta/packages/eds/eds-dbus/r683-force-libsoup22.patch

@@ -0,0 +1,21 @@
+Index: trunk/configure.in
+===================================================================
+--- trunnk/configure.in	(revision 682)
++++ trunnk/configure.in	(revision 683)
+@@ -1243,14 +1243,8 @@
+ 
+ dnl --- Groupwise flags
+ if test "x${with_soup}" != "xno"; then
+-PKG_CHECK_MODULES(SOUPTEMP, libsoup-2.4, have_libsoup_24=yes, have_libsoup_24=no)
+-if test $have_libsoup_24 = yes; then
+-    LIBSOUP_REQUIRED=2.3.0
+-    LIBSOUP=libsoup-2.4
+-else
+-    LIBSOUP_REQUIRED=2.2.2
+-    LIBSOUP=libsoup-2.2
+-fi
++LIBSOUP_REQUIRED=2.2.2
++LIBSOUP=libsoup-2.2
+ AC_SUBST(LIBSOUP_REQUIRED)
+ AC_SUBST(LIBSOUP)
+ EVO_SET_COMPILE_FLAGS(SOUP, $LIBSOUP >= $LIBSOUP_REQUIRED)

meta/packages/eds/eds-dbus_svn.bb

@@ -4,13 +4,14 @@ LICENSE = "LGPL"
 DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib libsoup"
 
 PV = "1.4.0+svnr${SRCREV}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
            file://oh-contact.patch;patch=1;pnum=0 \
            file://no_libdb.patch;patch=1 \
            file://no_iconv_test.patch;patch=1 \
            file://no_libedataserverui.patch;patch=1 \
+           file://r683-force-libsoup22.patch;patch=1 \
            file://iconv-detect.h"
 
 S = "${WORKDIR}/trunk"

meta/packages/exmap-console/exmap-console.inc

@@ -2,7 +2,7 @@ DESCRIPTION = "Console based version of exmap, a memory usage analysis tool"
 HOMEPAGE = "http://projects.o-hand.com/exmap-console"
 SECTION = "devel"
 LICENSE = "GPL"
-DEPENDS = "virtual/kernel readline"
+DEPENDS = "virtual/kernel readline glib-2.0"
 
 SRC_URI = "http://projects.o-hand.com/sources/exmap-console/exmap-console-${PV}.tgz"
 

meta/packages/gcc/gcc-3.4.4/hrw-open-needs-3-args.patch

@@ -0,0 +1,13 @@
+Index: gcc-3.4.4/gcc/collect2.c
+===================================================================
+--- gcc-3.4.4.orig/gcc/collect2.c	2009-11-02 20:40:02.874934378 +0100
++++ gcc-3.4.4/gcc/collect2.c	2009-11-02 20:41:12.458939528 +0100
+@@ -1534,7 +1534,7 @@
+   if (redir)
+     {
+       /* Open response file.  */
+-      redir_handle = open (redir, O_WRONLY | O_TRUNC | O_CREAT);
++      redir_handle = open (redir, O_WRONLY | O_TRUNC | O_CREAT, 0666);
+ 
+       /* Duplicate the stdout and stderr file handles
+ 	 so they can be restored later.  */

meta/packages/gcc/gcc_3.4.4.bb

@@ -1,4 +1,4 @@
-PR = "r6"
+PR = "r7"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
@@ -22,7 +22,8 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://GCC3.4.0VisibilityPatch.diff;patch=1 \
 	   file://15342.patch;patch=1 \
 	   file://jarfix.patch;patch=1 \
-	   file://always-fixincperm.patch;patch=1"
+	   file://always-fixincperm.patch;patch=1 \
+           file://hrw-open-needs-3-args.patch"
 
 SRC_URI += "file://gcc34-configure.in.patch;patch=1"
 SRC_URI += "file://gcc34-thumb-support.patch;patch=1"

meta/packages/gdb/gdb-cross.inc

@@ -4,7 +4,7 @@ DEPENDS = "ncurses-native"
 
 EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils' LDFLAGS='${BUILD_LDFLAGS}'"
 
-EXTRA_OECONF = "--with-curses --with-readline"
+EXTRA_OECONF = "--with-curses --with-readline --disable-werror"
 
 do_configure () {
 # override this function to avoid the autoconf/automake/aclocal/autoheader

meta/packages/glibc/ldconfig-native_2.5.bb

@@ -5,6 +5,8 @@ SRC_URI = "file://ldconfig-native-2.5.tar.bz2 \
 
 inherit native
 
+S = "${WORKDIR}/${P}"
+
 do_compile () {
 	$CC ldconfig.c -std=gnu99 chroot_canon.c xmalloc.c xstrdup.c cache.c readlib.c  -I. dl-cache.c -o ldconfig
 }

meta/packages/gmp/gmp-4.2.2/configure.patch

@@ -2,11 +2,11 @@
  configure.in |   24 +++++++++---------------
  2 files changed, 23 insertions(+), 27 deletions(-)
 
-Index: gmp-4.2.1/acinclude.m4
+Index: gmp-4.2.2/acinclude.m4
 ===================================================================
---- gmp-4.2.1.orig/acinclude.m4	2006-05-04 17:39:01.000000000 +0100
-+++ gmp-4.2.1/acinclude.m4	2006-11-06 20:36:14.000000000 +0000
-@@ -32,20 +32,20 @@ dnl    a_out.exe - OpenVMS DEC C called 
+--- gmp-4.2.2.orig/acinclude.m4	2007-09-01 11:09:03.000000000 +0100
++++ gmp-4.2.2/acinclude.m4	2008-04-30 17:19:16.000000000 +0100
+@@ -30,20 +30,20 @@
  dnl    conftest.exe - various DOS compilers
  
  
@@ -31,7 +31,7 @@ Index: gmp-4.2.1/acinclude.m4
  [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-*]])
  
  
-@@ -64,7 +64,7 @@ dnl      x86         ->  x86
+@@ -62,7 +62,7 @@
  dnl      x86/k6      ->  k6
  dnl      x86/k6/mmx  ->  k6_mmx
  
@@ -40,7 +40,7 @@ Index: gmp-4.2.1/acinclude.m4
  [[$1=`echo $2 | sed -e '/\//s:^[^/]*/::' -e 's:[\\/]:_:g'`]])
  
  
-@@ -73,7 +73,7 @@ dnl  ----------------------------------
+@@ -71,7 +71,7 @@
  dnl  Emit code to remove any occurance of ITEM from $LISTVAR.  ITEM can be a
  dnl  shell expression like $foo if desired.
  
@@ -49,9 +49,9 @@ Index: gmp-4.2.1/acinclude.m4
  [remove_from_list_tmp=
  for remove_from_list_i in $[][$1]; do
    if test $remove_from_list_i = [$2]; then :;
-@@ -89,12 +89,12 @@ dnl  GMP_STRIP_PATH(subdir)
+@@ -87,12 +87,12 @@
  dnl  ----------------------
- dnl  Strip entries */subdir from $path and $fat_path.
+ dnl  Strip entries subdir from $path and $fat_path.
  
 -define(GMP_STRIP_PATH,
 +define([GMP_STRIP_PATH],
@@ -64,7 +64,7 @@ Index: gmp-4.2.1/acinclude.m4
  [tmp_path=
  for i in $[][$1]; do
    case $i in
-@@ -115,7 +115,7 @@ dnl
+@@ -113,7 +113,7 @@
  dnl  Dummy values for __GMP_BITS_PER_MP_LIMB and GMP_LIMB_BITS are enough
  dnl  for all current configure-time uses of gmp.h.
  
@@ -73,7 +73,7 @@ Index: gmp-4.2.1/acinclude.m4
  [[#define __GMP_WITHIN_CONFIGURE 1   /* ignore template stuff */
  #define GMP_NAIL_BITS $GMP_NAIL_BITS
  #define __GMP_BITS_PER_MP_LIMB 123 /* dummy for GMP_NUMB_BITS etc */
-@@ -131,7 +131,7 @@ dnl  Expand at autoconf time to the valu
+@@ -129,7 +129,7 @@
  dnl  FILE.  The regexps here aren't very rugged, but are enough for gmp.
  dnl  /dev/null as a parameter prevents a hang if $2 is accidentally omitted.
  
@@ -82,7 +82,7 @@ Index: gmp-4.2.1/acinclude.m4
  [patsubst(patsubst(
  esyscmd([grep "^#define $1 " $2 /dev/null 2>/dev/null]),
  [^.*$1[ 	]+],[]),
-@@ -145,7 +145,7 @@ dnl  The gmp version number, extracted f
+@@ -143,7 +143,7 @@
  dnl  autoconf time.  Two digits like 3.0 if patchlevel <= 0, or three digits
  dnl  like 3.0.1 if patchlevel > 0.
  
@@ -91,10 +91,10 @@ Index: gmp-4.2.1/acinclude.m4
  [GMP_HEADER_GETVAL(__GNU_MP_VERSION,gmp-h.in)[]dnl
  .GMP_HEADER_GETVAL(__GNU_MP_VERSION_MINOR,gmp-h.in)[]dnl
  ifelse(m4_eval(GMP_HEADER_GETVAL(__GNU_MP_VERSION_PATCHLEVEL,gmp-h.in) > 0),1,
-@@ -1491,7 +1491,9 @@ esac
+@@ -1489,7 +1489,9 @@
  echo ["define(<CONFIG_TOP_SRCDIR>,<\`$tmp'>)"] >>$gmp_tmpconfigm4
  
- # All CPUs use asm-defs.m4 
+ # All CPUs use asm-defs.m4
 -echo ["include][(CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4')"] >>$gmp_tmpconfigm4i
 +echo -n ["include("] >>$gmp_tmpconfigm4i
 +echo -n ["CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4'"] >>$gmp_tmpconfigm4i
@@ -102,11 +102,11 @@ Index: gmp-4.2.1/acinclude.m4
  ])
  
  
-Index: gmp-4.2.1/configure.in
+Index: gmp-4.2.2/configure.in
 ===================================================================
---- gmp-4.2.1.orig/configure.in	2006-04-30 00:31:08.000000000 +0100
-+++ gmp-4.2.1/configure.in	2006-11-06 20:39:17.000000000 +0000
-@@ -31,12 +31,6 @@ AC_REVISION($Revision: 1.11 $)
+--- gmp-4.2.2.orig/configure.in	2007-09-09 17:39:14.000000000 +0100
++++ gmp-4.2.2/configure.in	2008-04-30 17:09:10.000000000 +0100
+@@ -29,12 +29,6 @@
  AC_PREREQ(2.59)
  AC_INIT(GNU MP, GMP_VERSION, gmp-bugs@swox.com, gmp)
  AC_CONFIG_SRCDIR(gmp-impl.h)
@@ -119,7 +119,7 @@ Index: gmp-4.2.1/configure.in
  
  # If --target is not used then $target_alias is empty, but if say
  # "./configure athlon-pc-freebsd3.5" is used, then all three of
-@@ -277,7 +271,7 @@ AH_VERBATIM([HAVE_HOST_CPU_1],
+@@ -275,7 +269,7 @@
  # After GMP specific searches and tests, the standard autoconf AC_PROG_CC is
  # called.  User selections of CC etc are respected.
  #
@@ -128,7 +128,7 @@ Index: gmp-4.2.1/configure.in
  # pre-testing, since they of course depend on AC_PROG_CC, and also some of
  # them cache their results, which is not wanted.
  #
-@@ -369,7 +363,7 @@ abilist="standard"
+@@ -367,7 +361,7 @@
  # FIXME: We'd like to prefer an ANSI compiler, perhaps by preferring
  # c89 over cc here.  But note that on HP-UX c89 provides a castrated
  # environment, and would want to be excluded somehow.  Maybe
@@ -137,7 +137,7 @@ Index: gmp-4.2.1/configure.in
  # we don't need to worry.
  #
  cclist="gcc cc"
-@@ -1498,7 +1492,7 @@ esac
+@@ -1518,7 +1512,7 @@
  CFLAGS_or_unset=${CFLAGS-'(unset)'}
  CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'}
  
@@ -146,7 +146,7 @@ Index: gmp-4.2.1/configure.in
  User:
  ABI=$ABI
  CC=$CC
-@@ -1869,7 +1863,6 @@ AC_SUBST(DEFN_LONG_LONG_LIMB)
+@@ -1889,7 +1883,6 @@
  
  # The C compiler and preprocessor, put into ANSI mode if possible.
  AC_PROG_CC
@@ -154,7 +154,7 @@ Index: gmp-4.2.1/configure.in
  AC_PROG_CPP
  GMP_H_ANSI
  
-@@ -1892,11 +1885,11 @@ AC_SUBST(CCAS)
+@@ -1912,11 +1905,11 @@
  
  # The C++ compiler, if desired.
  want_cxx=no
@@ -168,7 +168,7 @@ Index: gmp-4.2.1/configure.in
    cxxflags_ac_prog_cxx=$CXXFLAGS
    cxxflags_list=ac_prog_cxx
  
-@@ -2002,7 +1995,7 @@ case $host in
+@@ -2022,7 +2015,7 @@
  esac
  
  
@@ -177,7 +177,7 @@ Index: gmp-4.2.1/configure.in
  Decided:
  ABI=$ABI
  CC=$CC
-@@ -3175,7 +3168,7 @@ GMP_FINISH
+@@ -3199,7 +3192,7 @@
  # FIXME: Upcoming version of autoconf/automake may not like broken lines.
  #        Right now automake isn't accepting the new AC_CONFIG_FILES scheme.
  
@@ -186,7 +186,7 @@ Index: gmp-4.2.1/configure.in
    mpbsd/Makefile mpf/Makefile mpn/Makefile mpq/Makefile			\
    mpz/Makefile printf/Makefile scanf/Makefile cxx/Makefile		\
    tests/Makefile tests/devel/Makefile tests/mpbsd/Makefile		\
-@@ -3184,4 +3177,5 @@ AC_OUTPUT(Makefile							\
+@@ -3208,4 +3201,5 @@
    tests/cxx/Makefile							\
    doc/Makefile tune/Makefile						\
    demos/Makefile demos/calc/Makefile demos/expr/Makefile		\

meta/packages/gmp/gmp-native_4.2.2.bb

@@ -1,2 +1,2 @@
-PV = "4.2.1"
+PV = "4.2.2"
 require gmp-native.inc

meta/packages/gmp/gmp.inc

@@ -9,6 +9,8 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/gmp/gmp-${PV}.tar.bz2 \
 
 inherit autotools 
 
+ARM_INSTRUCTION_SET = "arm"
+
 acpaths = ""
 
 do_stage () {

meta/packages/gnome/libsoup_2.2.100.bb

@@ -3,17 +3,18 @@ LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
 
 DEPENDS = "glib-2.0 gnutls libxml2"
+PR = "r2"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2"
 
-inherit autotools pkgconfig
+inherit autotools
 
 FILES_${PN} = "${libdir}/lib*.so.*"
 FILES_${PN}-dev = "${includedir}/ ${libdir}/"
 FILES_${PN}-doc = "${datadir}/"
 
 do_stage() {
-	rm -f ${PKG_CONFIG_DIR}/libsoup*
 	autotools_stage_all
-	ln -sf ${PKG_CONFIG_DIR}/libsoup.pc ${PKG_CONFIG_DIR}/libsoup-2.2.pc
+	install -d ${PKG_CONFIG_DIR}
+	install -m 0644 ${S}/libsoup.pc ${PKG_CONFIG_DIR}/libsoup-2.2.pc
 }

meta/packages/gstreamer/gst-plugins-bad_0.10.5.bb

@@ -1,8 +1,8 @@
 require gst-plugins.inc
 DEPENDS += "gst-plugins-base libmusicbrainz tremor"
-PR = "r4"
+PR = "r5"
 
-EXTRA_OECONF += "--disable-examples --disable-experimental --disable-sdl \
+EXTRA_OECONF += "--disable-examples --disable-experimental --disable-sdl --disable-cdaudio \
 		--with-plugins=musicbrainz,wavpack,ivorbis"
 
 SRC_URI += " file://ivorbisdec.patch;patch=1;pnum=0"

meta/packages/icu/files/gccfix.patch

@@ -0,0 +1,13 @@
+Index: source/layoutex/ParagraphLayout.cpp
+===================================================================
+--- source.orig/layoutex/ParagraphLayout.cpp	2009-06-30 11:48:47.000000000 +0100
++++ source/layoutex/ParagraphLayout.cpp	2009-06-30 11:49:06.000000000 +0100
+@@ -798,7 +798,7 @@
+ 
+     return nullLanguageCode;
+ }
+-#elif
++#else
+ 
+ // TODO - dummy implementation for right now...
+ le_int32 ParagraphLayout::getLanguageCode(const Locale *locale)

meta/packages/icu/icu-3.6.inc

@@ -1,7 +1,8 @@
 
 LICENSE = "ICU"
 
-SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz"
+SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz \
+           file://gccfix.patch;patch=1"
 
 S = "${WORKDIR}/icu/source"
 

meta/packages/icu/icu-native_3.6.bb

@@ -1,3 +1,5 @@
 require icu-3.6.inc
 
 inherit native
+
+PR = "r1"

meta/packages/icu/icu_3.6.bb

@@ -1,7 +1,7 @@
 require icu-3.6.inc
 
 DEPENDS += "icu-native"
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://use-g++-for-linking.patch;patch=1"
 

meta/packages/ipkg/ipkg-collateral.bb

@@ -1,7 +1,7 @@
 DESCRIPTION = "ipkg configuration files"
 SECTION = "base"
 LICENSE = "MIT"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = " \
 file://ipkg.conf.comments	\

meta/packages/ipkg/ipkg-collateral/lists

@@ -1,2 +1,2 @@
-lists_dir ext /var/lib/ipkg
+lists_dir /var/lib/ipkg
 

meta/packages/libxml/files/libxml-nanohttp.patch

@@ -0,0 +1,13 @@
+Index: libxml2-2.6.29/nanohttp.c
+===================================================================
+--- libxml2-2.6.29.orig/nanohttp.c	2008-10-30 10:12:11.000000000 +0800
++++ libxml2-2.6.29/nanohttp.c	2008-10-30 10:12:30.000000000 +0800
+@@ -1585,7 +1585,7 @@
+     if (!strcmp(filename, "-")) 
+         fd = 0;
+     else {
+-        fd = open(filename, O_CREAT | O_WRONLY);
++        fd = open(filename, O_CREAT | O_WRONLY, 0644);
+ 	if (fd < 0) {
+ 	    xmlNanoHTTPClose(ctxt);
+ 	    return(-1);

meta/packages/libxml/libxml2-native_2.6.29.bb

@@ -1,6 +1,6 @@
 require libxml2.inc
 
-PR = "r4"
+PR = "r8"
 
 DEPENDS += "python-native-runtime"
 

meta/packages/libxml/libxml2.inc

@@ -4,7 +4,8 @@ PRIORITY = "optional"
 LICENSE = "MIT"
 
 SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz \
-           file://libxml-64bit.patch;patch=1"
+           file://libxml-64bit.patch;patch=1 \
+	    file://libxml-nanohttp.patch;patch=1"
 
 inherit autotools pkgconfig binconfig
 

meta/packages/libxml/libxml2_2.6.29.bb

@@ -1,6 +1,6 @@
 require libxml2.inc
 
-PR = "r6"
+PR = "r7"
 
 export LDFLAGS += "-ldl"
 

meta/packages/linux-libc-headers/files/unifdef.patch

@@ -0,0 +1,31 @@
+Index: linux-2.6.20/scripts/unifdef.c
+===================================================================
+--- linux-2.6.20.orig/scripts/unifdef.c
++++ linux-2.6.20/scripts/unifdef.c
+@@ -206,7 +206,7 @@ static void             done(void);
+ static void             error(const char *);
+ static int              findsym(const char *);
+ static void             flushline(bool);
+-static Linetype         getline(void);
++static Linetype         parseline(void);
+ static Linetype         ifeval(const char **);
+ static void             ignoreoff(void);
+ static void             ignoreon(void);
+@@ -512,7 +512,7 @@ process(void)
+ 
+ 	for (;;) {
+ 		linenum++;
+-		lineval = getline();
++		lineval = parseline();
+ 		trans_table[ifstate[depth]][lineval]();
+ 		debug("process %s -> %s depth %d",
+ 		    linetype_name[lineval],
+@@ -526,7 +526,7 @@ process(void)
+  * help from skipcomment().
+  */
+ static Linetype
+-getline(void)
++parseline(void)
+ {
+ 	const char *cp;
+ 	int cursym;

meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb

@@ -2,10 +2,11 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-           file://procinfo.h"
+           file://procinfo.h \
+           file://unifdef.patch;patch=1"
 
 S = "${WORKDIR}/linux-${PV}"
 

meta/packages/mtd/mtd-utils/fix-new-glibc.patch

@@ -0,0 +1,64 @@
+commit e6088d987c545d60a86e1f44836ab8ba072fffd9
+Author: David Woodhouse <dwmw2@infradead.org>
+Date:   Sat Feb 23 22:28:36 2008 +0900
+
+    Fix recv_image compilation with new glibc
+    
+    struct ip_mreq is hidden behind __USE_MISC now
+
+diff --git a/recv_image.c b/recv_image.c
+index 028635a..3b79304 100644
+--- a/recv_image.c
++++ b/recv_image.c
+@@ -1,5 +1,6 @@
+ 
+ #define _XOPEN_SOURCE 500
++#define _USE_MISC
+ 
+ #include <errno.h>  	
+ #include <error.h> 	
+
+commit b995f89a81589be8d8a41c374a6df109d0ee12b3
+Author: David Woodhouse <dwmw2@infradead.org>
+Date:   Thu May 22 12:44:14 2008 +0100
+
+    Fix recv_image build harder
+    
+    Signed-off-by: David Woodhouse <dwmw2@infradead.org>
+
+diff --git a/recv_image.c b/recv_image.c
+index 3b79304..d65aa2a 100644
+--- a/recv_image.c
++++ b/recv_image.c
+@@ -1,14 +1,14 @@
+ 
+ #define _XOPEN_SOURCE 500
+-#define _USE_MISC
+ 
+-#include <errno.h>  	
+-#include <error.h> 	
+-#include <netdb.h> 	
+-#include <stdio.h> 	
+-#include <stdlib.h> 	
++#include <errno.h>
++#include <error.h>
++#include <stdio.h>
++#define __USE_GNU
++#include <netdb.h>
++#include <stdlib.h>
+ #include <string.h>
+-#include <unistd.h> 	
++#include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -307,7 +307,7 @@ int main(int argc, char **argv)
+ 						~(meminfo.erasesize - 1);
+ 					erase.length = meminfo.erasesize;
+ 
+-					printf("Will erase at %08lx len %08lx (bad write was at %08lx)\n", 
++					printf("Will erase at %08x len %08x (bad write was at %08x)\n", 
+ 					       erase.start, erase.length, eraseblocks[block_nr].flash_offset);
+ 					if (ioctl(flfd, MEMERASE, &erase)) {
+ 						perror("MEMERASE");
+

meta/packages/mtd/mtd-utils_1.0.0+git.bb

@@ -3,11 +3,12 @@ SECTION = "base"
 DEPENDS = "zlib lzo"
 HOMEPAGE = "http://www.linux-mtd.infradead.org/"
 LICENSE = "GPLv2"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=2a032bca585e27ceb0f293905718b416bc297ce2 \
            file://add-exclusion-to-mkfs-jffs2-git.patch;patch=1 \
-	   file://fix-ignoreerrors-git.patch;patch=1"
+	   file://fix-ignoreerrors-git.patch;patch=1 \
+	   file://fix-new-glibc.patch;patch=1"
 
 S = "${WORKDIR}/git/"
 

meta/packages/opensync/libopensync-plugin-syncml_0.22.bb

@@ -1,5 +1,6 @@
 
 require libopensync-plugin.inc
+require libopensync-plugin_0.22.inc
 
 DEPENDS += " libsyncml"
 

meta/packages/opensync/libopensync-plugin_0.22.inc

@@ -1,12 +1,6 @@
 PV = "0.22"
 PLUGIN_ARCHIVE ?= "${@bb.data.getVar('PLUGIN_NAME', d, 1).replace('-sync','')}"
-SRC_URI = "http://www.opensync.org/attachment/wiki/download/libopensync-plugin-${PLUGIN_ARCHIVE}-${PV}.tar.bz2?format=raw"
+SRC_URI = "http://www.opensync.org/download/releases/0.22/libopensync-plugin-${PLUGIN_ARCHIVE}-${PV}.tar.bz2"
 
 S = "${WORKDIR}/libopensync-plugin-${PLUGIN_ARCHIVE}-${PV}/"
 
-do_unpack2() {
-    cd ${WORKDIR} && tar jxf libopensync-plugin-${PLUGIN_ARCHIVE}-${PV}.tar.bz2?format=raw
-}
-
-addtask unpack2 after do_unpack before do_patch
-

meta/packages/opensync/libopensync_0.22.bb

@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.opensync.org/"
 
 DEPENDS = "sqlite3 libxml2 zlib glib-2.0"
 
-SRC_URI = "http://www.opensync.org/attachment/wiki/download/libopensync-0.22.tar.bz2?format=raw"
+SRC_URI = "http://www.opensync.org/download/releases/0.22/libopensync-0.22.tar.bz2"
 
 inherit autotools pkgconfig lib_package
 
@@ -13,9 +13,7 @@ LEAD_SONAME = "libopensync.so"
 FILES_${PN} += " ${libdir}/opensync/formats/*.so"
 FILES_${PN}-dbg += " ${libdir}/opensync/formats/.debug/*.so"
 
-require opensync-unpack.inc
-
 do_stage() {
-autotools_stage_all
+	autotools_stage_all
 }
 

meta/packages/opensync/libopensync_svn.bb

@@ -9,6 +9,8 @@ SRC_URI = "svn://svn.opensync.org;module=trunk;proto=http \
 	   file://zlib.patch;patch=1 \
 	   file://no-werror.patch;patch=1"
 
+DEFAULT_PREFERENCE = "-1"
+
 inherit scons
 
 S = "${WORKDIR}/trunk"

meta/packages/opensync/msynctool_0.22.bb

@@ -1,9 +1,7 @@
-SRC_URI = "http://www.opensync.org/attachment/wiki/download/msynctool-0.22.tar.bz2?format=raw"
+SRC_URI = "http://www.opensync.org/download/releases/0.22/msynctool-0.22.tar.bz2"
 
 LICENSE = "GPL"
 DEPENDS = "libopensync"
 HOMEPAGE = "http://www.opensync.org/"
 
 inherit autotools pkgconfig
-
-require opensync-unpack.inc

meta/packages/opensync/msynctool_svn.bb

@@ -3,7 +3,9 @@ DEPENDS = "libopensync"
 HOMEPAGE = "http://www.opensync.org/"
 PV = "0.22+svnr${SRCREV}"
 
+DEFAULT_PREFERENCE = "-1"
+
 SRC_URI = "svn://svn.opensync.org/multisync;module=trunk;proto=http"
 S = "${WORKDIR}/trunk"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig scons

meta/packages/opensync/opensync-unpack.inc

@@ -1,5 +0,0 @@
-do_unpack2() {
-    cd ${WORKDIR} && tar jxf ${PN}-${PV}.tar.bz2?format=raw
-}
-
-addtask unpack2 after do_unpack before do_patch

meta/packages/qemu/qemu-0.9.1/fix-dirent.h-location.diff

@@ -0,0 +1,22 @@
+On Debian 'sid' systems there is no linux/dirent.h header when
+linux-libc-headers 2.6.28 are installed.
+
+---
+ linux-user/syscall.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- qemu-0.9.1.orig/linux-user/syscall.c
++++ qemu-0.9.1/linux-user/syscall.c
+@@ -74,11 +74,11 @@
+ #include <linux/unistd.h>
+ #include <linux/utsname.h>
+ #include <linux/cdrom.h>
+ #include <linux/hdreg.h>
+ #include <linux/soundcard.h>
+-#include <linux/dirent.h>
++#include <dirent.h>
+ #include <linux/kd.h>
+ 
+ #include "qemu.h"
+ #include "qemu_spinlock.h"
+ 

meta/packages/qemu/qemu_0.9.1.bb

@@ -1,12 +1,12 @@
 LICENSE = "GPL"
 DEPENDS = "zlib"
-PR = "r7"
+PR = "r9"
 
 FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
 FILESDIR = "${WORKDIR}"
 
 SRC_URI = "\
-    http://fabrice.bellard.free.fr/qemu/qemu-0.9.1.tar.gz \
+    http://bellard.org/qemu/qemu-0.9.1.tar.gz \
     file://02_snapshot_use_tmpdir.patch;patch=1;pnum=0 \
     file://04_do_not_print_rtc_freq_if_ok.patch;patch=1;pnum=1 \
     file://05_non-fatal_if_linux_hd_missing.patch;patch=1;pnum=1 \
@@ -34,6 +34,7 @@ SRC_URI = "\
     file://writev_fix.patch;patch=1 \
     file://configure_symlinkpath_fix.patch;patch=1 \
     file://disable-error-in-configure.patch;patch=1 \
+    file://fix-dirent.h-location.diff;patch=1 \
     file://no-strip.patch;patch=1"
 
 S = "${WORKDIR}/qemu-${PV}"

meta/packages/tasks/task-base.bb

@@ -90,9 +90,6 @@ python __anonymous () {
 
     import bb
 
-    if not hasattr(__builtins__, 'set'):
-	from sets import Set as set
-
     distro_features = set(bb.data.getVar("DISTRO_FEATURES", d, 1).split())
     machine_features= set(bb.data.getVar("MACHINE_FEATURES", d, 1).split())
 

meta/packages/tasks/task-poky.bb

@@ -3,7 +3,7 @@
 #
 
 DESCRIPTION = "Tasks for OpenedHand Poky"
-PR = "r21"
+PR = "r22"
 
 PACKAGES = "\
     task-poky-apps-console \
@@ -44,12 +44,13 @@ XSERVER ?= "xserver-kdrive-fbdev"
 
 ALLOW_EMPTY = "1"
 
+SPLASH ?= "psplash"
 
 RDEPENDS_task-poky-apps-console = "\
     avahi-daemon \
     dropbear \
     portmap \
-    psplash"
+    ${SPLASH}"
 
 
 RDEPENDS_task-poky-x11-base = "\

meta/packages/unifdef/files/unifdef.c

@@ -206,7 +206,7 @@ static void             done(void);
 static void             error(const char *);
 static int              findsym(const char *);
 static void             flushline(bool);
-static Linetype         getline(void);
+static Linetype         getline34(void);
 static Linetype         ifeval(const char **);
 static void             ignoreoff(void);
 static void             ignoreon(void);
@@ -512,7 +512,7 @@ process(void)
 
 	for (;;) {
 		linenum++;
-		lineval = getline();
+		lineval = getline34();
 		trans_table[ifstate[depth]][lineval]();
 		debug("process %s -> %s depth %d",
 		    linetype_name[lineval],
@@ -526,7 +526,7 @@ process(void)
  * help from skipcomment().
  */
 static Linetype
-getline(void)
+getline34(void)
 {
 	const char *cp;
 	int cursym;

meta/packages/xorg-lib/libice-native_1.0.3.bb

@@ -0,0 +1,8 @@
+require libice_${PV}.bb
+
+DEPENDS = "libx11-native xproto-native xtrans-native"
+PROVIDES = "ice-native"
+
+inherit native
+
+XORG_PN = "libICE"

meta/packages/xorg-lib/libsm-native_1.0.3.bb

@@ -0,0 +1,7 @@
+require libsm_${PV}.bb
+
+inherit native
+
+DEPENDS = "libx11-native libice-native xproto-native xtrans-native"
+
+XORG_PN = "libSM"

meta/packages/xorg-lib/libx11-native_1.1.2.bb

@@ -3,5 +3,6 @@ require libx11_${PV}.bb
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
 
 DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
+PROVIDES = ""
 
 inherit native

meta/packages/xorg-lib/libxdmcp-native_1.0.2.bb

@@ -1,5 +1,6 @@
 require libxdmcp_${PV}.bb
 
 DEPENDS = "xproto-native util-macros-native"
+PROVIDES = ""
 
 inherit native

meta/packages/xorg-lib/libxt-native_1.0.5.bb

@@ -0,0 +1,8 @@
+require libxt_${PV}.bb
+
+DEPENDS = "libx11-native libsm-native kbproto-native"
+PROVIDES = "xt-native"
+
+inherit native
+
+XORG_PN = "libXt"