57 files changed, 368 insertions, 295 deletions

diff --git a/bitbake-dev/bin/bitbake b/bitbake-dev/bin/bitbake
index d85135a117..920877e4d8 100755
--- a/bitbake-dev/bin/bitbake
+++ b/bitbake-dev/bin/bitbake
@@ -69,6 +69,9 @@ Default BBFILES are the .bb files in the current directory.""" )
     parser.add_option( "-k", "--continue", help = "continue as much as possible after an error. While the target that failed, and those that depend on it, cannot be remade, the other dependencies of these targets can be processed all the same.",
                action = "store_false", dest = "abort", default = True )
 
+    parser.add_option( "-a", "--tryaltconfigs", help = "continue with builds by trying to use alternative providers where possible.",
+               action = "store_true", dest = "tryaltconfigs", default = False )
+
     parser.add_option( "-f", "--force", help = "force run of specified cmd, regardless of stamp status",
                action = "store_true", dest = "force", default = False )
 
@@ -130,17 +133,13 @@ Default BBFILES are the .bb files in the current directory.""" )
     # of the UIs (e.g. for DISPLAY, etc.)
     bb.utils.clean_environment()
 
-    cooker.parseConfiguration()
+    cooker.parseCommandLine()
     host = cooker.server.host
     port = cooker.server.port
 
-    # Save a logfile for cooker somewhere
-    t = bb.data.getVar('TMPDIR', cooker.configuration.data, True)
-    if not t:
-       bb.msg.fatal(bb.msg.domain.Build, "TMPDIR not set")
-    t = os.path.join(t, "cooker")
-    bb.mkdirhier(t)
-    cooker_logfile = "%s/log.cooker.%s" % (t, str(os.getpid()))
+    # Save a logfile for cooker into the current working directory. When the
+    # server is daemonized this logfile will be truncated.
+    cooker_logfile = os.path.join (os.getcwd(), "cooker.log")
 
     daemonize.createDaemon(cooker.serve, cooker_logfile)
     del cooker
diff --git a/bitbake-dev/lib/bb/cooker.py b/bitbake-dev/lib/bb/cooker.py
index c9afadbc97..ead76ca6ba 100644
--- a/bitbake-dev/lib/bb/cooker.py
+++ b/bitbake-dev/lib/bb/cooker.py
@@ -86,10 +86,31 @@ class BBCooker:
 
         self.configuration.data = bb.data.init()
 
-    def parseConfiguration(self):
-
         bb.data.inheritFromOS(self.configuration.data)
 
+        # TOSTOP must not be set or our children will hang when they output
+        fd = sys.stdout.fileno()
+        if os.isatty(fd):
+            import termios
+            tcattr = termios.tcgetattr(fd)
+            if tcattr[3] & termios.TOSTOP:
+                bb.msg.note(1, bb.msg.domain.Build, "The terminal had the TOSTOP bit set, clearing...")
+                tcattr[3] = tcattr[3] & ~termios.TOSTOP
+                termios.tcsetattr(fd, termios.TCSANOW, tcattr)
+
+        self.command = bb.command.Command(self)
+        self.cookerIdle = True
+        self.cookerState = cookerClean
+        self.cookerAction = cookerRun
+        self.server.register_idle_function(self.runCommands, self)
+
+    def parseConfiguration(self):
+        #
+        # Special updated configuration we use for firing events
+        #
+        self.configuration.event_data = bb.data.createCopy(self.configuration.data)
+        bb.data.update_data(self.configuration.event_data)
+
         for f in self.configuration.file:
             self.parseConfigurationFile( f )
 
@@ -102,29 +123,14 @@ class BBCooker:
         if bbpkgs:
             self.configuration.pkgs_to_build.extend(bbpkgs.split())
 
-        #
-        # Special updated configuration we use for firing events
-        #
-        self.configuration.event_data = bb.data.createCopy(self.configuration.data)
-        bb.data.update_data(self.configuration.event_data)
-
-        # TOSTOP must not be set or our children will hang when they output
-        fd = sys.stdout.fileno()
-        if os.isatty(fd):
-            import termios
-            tcattr = termios.tcgetattr(fd)
-            if tcattr[3] & termios.TOSTOP:
-                bb.msg.note(1, bb.msg.domain.Build, "The terminal had the TOSTOP bit set, clearing...")
-                tcattr[3] = tcattr[3] & ~termios.TOSTOP
-                termios.tcsetattr(fd, termios.TCSANOW, tcattr)
-
         # Change nice level if we're asked to
         nice = bb.data.getVar("BB_NICE_LEVEL", self.configuration.data, True)
         if nice:
             curnice = os.nice(0)
             nice = int(nice) - curnice
             bb.msg.note(2, bb.msg.domain.Build, "Renice to %s " % os.nice(nice))
- 
+
+    def parseCommandLine(self):
         # Parse any commandline into actions
         if self.configuration.show_environment:
             self.commandlineAction = None
@@ -156,17 +162,6 @@ class BBCooker:
                 self.commandlineAction = None
                 bb.error("Nothing to do.  Use 'bitbake world' to build everything, or run 'bitbake --help' for usage information.")
 
-        # FIXME - implement
-        #if self.configuration.interactive:
-        #    self.interactiveMode()
-
-        self.command = bb.command.Command(self)
-        self.cookerIdle = True
-        self.cookerState = cookerClean
-        self.cookerAction = cookerRun
-        self.server.register_idle_function(self.runCommands, self)
-
-
     def runCommands(self, server, data, abort):
         """
         Run any queued asynchronous command
@@ -310,6 +305,10 @@ class BBCooker:
         # Need files parsed
         self.updateCache()
 
+        # If we are told to do the None task then query the default task
+        if (task == None):
+            task = self.configuration.cmd
+
         pkgs_to_build = self.checkPackages(pkgs_to_build)
 
         localdata = data.createCopy(self.configuration.data)
@@ -615,6 +614,14 @@ class BBCooker:
         Build the file matching regexp buildfile
         """
 
+        # Parse the configuration here. We need to do it explicitly here since
+        # buildFile() doesn't use the cache
+        self.parseConfiguration()
+
+        # If we are told to do the None task then query the default task
+        if (task == None):
+            task = self.configuration.cmd
+
         fn = self.matchFile(buildfile)
         self.buildSetVars()
 
@@ -685,6 +692,10 @@ class BBCooker:
         # Need files parsed
         self.updateCache()
 
+        # If we are told to do the NULL task then query the default task
+        if (task == None):
+            task = self.configuration.cmd
+
         targets = self.checkPackages(targets)
 
         def buildTargetsIdle(server, rq, abort):
@@ -731,6 +742,7 @@ class BBCooker:
 
     def updateCache(self):
 
+        self.parseConfiguration ()
         if self.cookerState == cookerParsed:
             return
 
diff --git a/bitbake-dev/lib/bb/runqueue.py b/bitbake-dev/lib/bb/runqueue.py
index 1c911ef0c8..01452d2f33 100644
--- a/bitbake-dev/lib/bb/runqueue.py
+++ b/bitbake-dev/lib/bb/runqueue.py
@@ -869,7 +869,7 @@ class RunQueue:
             self.finish_runqueue()
 
         if self.state is runQueueFailed:
-            if self.taskData.abort:
+            if not self.taskData.tryaltconfigs:
                 raise bb.runqueue.TaskFailure(self.failed_fnids)
             for fnid in self.failed_fnids:
                 self.taskData.fail_fnid(fnid)
diff --git a/bitbake-dev/lib/bb/taskdata.py b/bitbake-dev/lib/bb/taskdata.py
index 566614ee63..782dfb0b78 100644
--- a/bitbake-dev/lib/bb/taskdata.py
+++ b/bitbake-dev/lib/bb/taskdata.py
@@ -30,7 +30,7 @@ class TaskData:
     """
     BitBake Task Data implementation
     """
-    def __init__(self, abort = True):
+    def __init__(self, abort = True, tryaltconfigs = False):
         self.build_names_index = []
         self.run_names_index = []
         self.fn_index = []
@@ -57,6 +57,7 @@ class TaskData:
         self.failed_fnids = []
 
         self.abort = abort
+        self.tryaltconfigs = tryaltconfigs
 
     def getbuild_id(self, name):
         """
diff --git a/bitbake-dev/lib/bb/ui/depexplorer.py b/bitbake-dev/lib/bb/ui/depexp.py
index 9d92fa0a08..9d92fa0a08 100644
--- a/bitbake-dev/lib/bb/ui/depexplorer.py
+++ b/bitbake-dev/lib/bb/ui/depexp.py
diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index 9a9b6d3bc6..6a69e340f1 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -60,6 +60,9 @@ Default BBFILES are the .bb files in the current directory.""" )
     parser.add_option( "-k", "--continue", help = "continue as much as possible after an error. While the target that failed, and those that depend on it, cannot be remade, the other dependencies of these targets can be processed all the same.",
                action = "store_false", dest = "abort", default = True )
 
+    parser.add_option( "-a", "--tryaltconfigs", help = "continue with builds by trying to use alternative providers where possible.",
+               action = "store_true", dest = "tryaltconfigs", default = False )
+
     parser.add_option( "-f", "--force", help = "force run of specified cmd, regardless of stamp status",
                action = "store_true", dest = "force", default = False )
 
diff --git a/bitbake/doc/bitbake.1 b/bitbake/doc/bitbake.1
index 01172d7412..e687f0a42a 100644
--- a/bitbake/doc/bitbake.1
+++ b/bitbake/doc/bitbake.1
@@ -54,6 +54,9 @@ continue as much as possible after an error. While the target that failed, and
 those that depend on it, cannot be remade, the other dependencies of these
 targets can be processed all the same.
 .TP
+.B \-a, \-\-tryaltconfigs
+continue with builds by trying to use alternative providers where possible.
+.TP
 .B \-f, \-\-force
 force run of specified cmd, regardless of stamp status
 .TP
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 7477ee6c6f..c5d640da80 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -194,7 +194,7 @@ class BBCooker:
             bb.data.update_data(localdata)
             bb.data.expandKeys(localdata)
 
-            taskdata = bb.taskdata.TaskData(self.configuration.abort)
+            taskdata = bb.taskdata.TaskData(self.configuration.abort, self.configuration.tryaltconfigs)
 
             try:
                 taskdata.add_provider(localdata, self.status, pkgs_to_build[0])
@@ -243,7 +243,7 @@ class BBCooker:
         localdata = data.createCopy(self.configuration.data)
         bb.data.update_data(localdata)
         bb.data.expandKeys(localdata)
-        taskdata = bb.taskdata.TaskData(self.configuration.abort)
+        taskdata = bb.taskdata.TaskData(self.configuration.abort, self.configuration.tryaltconfigs)
 
         runlist = []
         try:
@@ -500,7 +500,7 @@ class BBCooker:
             bb.build.del_stamp('do_%s' % self.configuration.cmd, self.configuration.data)
 
         # Setup taskdata structure
-        taskdata = bb.taskdata.TaskData(self.configuration.abort)
+        taskdata = bb.taskdata.TaskData(self.configuration.abort, self.configuration.tryaltconfigs)
         taskdata.add_provider(self.configuration.data, self.status, item)
 
         buildname = bb.data.getVar("BUILDNAME", self.configuration.data)
@@ -534,7 +534,7 @@ class BBCooker:
         bb.data.update_data(localdata)
         bb.data.expandKeys(localdata)
 
-        taskdata = bb.taskdata.TaskData(self.configuration.abort)
+        taskdata = bb.taskdata.TaskData(self.configuration.abort, self.configuration.tryaltconfigs)
 
         runlist = []
         try:
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 62bd10ae24..2df51de75a 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -845,7 +845,7 @@ class RunQueue:
                     failed_fnids = self.finish_runqueue()
             if len(failed_fnids) == 0:
                 return failures
-            if self.taskData.abort:
+            if not self.taskData.tryaltconfigs:
                 raise bb.runqueue.TaskFailure(failed_fnids)
             for fnid in failed_fnids:
                 #print "Failure: %s %s %s" % (fnid, self.taskData.fn_index[fnid],  self.runq_task[fnid])
@@ -970,6 +970,8 @@ class RunQueue:
                     bb.msg.error(bb.msg.domain.RunQueue, "Task %s (%s) failed" % (task, self.get_user_idstring(task)))
                     self.failed_fnids.append(self.runq_fnid[task])
                     self.stats.taskFailed()
+                    if not self.taskData.abort:
+                        continue
                     break
                 self.task_complete(task)
                 self.stats.taskCompleted()
diff --git a/bitbake/lib/bb/taskdata.py b/bitbake/lib/bb/taskdata.py
index 566614ee63..782dfb0b78 100644
--- a/bitbake/lib/bb/taskdata.py
+++ b/bitbake/lib/bb/taskdata.py
@@ -30,7 +30,7 @@ class TaskData:
     """
     BitBake Task Data implementation
     """
-    def __init__(self, abort = True):
+    def __init__(self, abort = True, tryaltconfigs = False):
         self.build_names_index = []
         self.run_names_index = []
         self.fn_index = []
@@ -57,6 +57,7 @@ class TaskData:
         self.failed_fnids = []
 
         self.abort = abort
+        self.tryaltconfigs = tryaltconfigs
 
     def getbuild_id(self, name):
         """
diff --git a/build/conf/local.conf.sample b/build/conf/local.conf.sample
index 478dac9ad0..3e27b2244e 100644
--- a/build/conf/local.conf.sample
+++ b/build/conf/local.conf.sample
@@ -1,6 +1,6 @@
 # Where to cache the files Poky downloads
 DL_DIR ?= "${OEROOT}/sources"
-BBFILES = "\
+BBFILES += "\
     ${OEROOT}/meta/packages/*/*.bb \
     ${OEROOT}/meta-moblin/packages/*/*.bb"
 
diff --git a/meta-moblin/classes/moblin.bbclass b/meta-moblin/classes/moblin.bbclass
new file mode 100644
index 0000000000..aac6957583
--- /dev/null
+++ b/meta-moblin/classes/moblin.bbclass
@@ -0,0 +1,12 @@
+
+PREMIRRORS_append () {
+ftp://.*/.*    http://pokylinux.org/sources/
+http://.*/.*   http://pokylinux.org/sources/
+https://.*/.*   http://pokylinux.org/sources/
+}
+
+MIRRORS_append () {
+ftp://.*/.*    http://pokylinux.org/sources/
+http://.*/.*   http://pokylinux.org/sources/
+https://.*/.*   http://pokylinux.org/sources/
+}
diff --git a/meta-moblin/conf/distro/moblin.conf b/meta-moblin/conf/distro/moblin.conf
new file mode 100644
index 0000000000..20d96cc2a6
--- /dev/null
+++ b/meta-moblin/conf/distro/moblin.conf
@@ -0,0 +1,115 @@
+DISTRO = "moblin"
+DISTRO_NAME = "Moblin (Poky Powered)"
+DISTRO_VERSION = "1.99+snapshot-${DATE}"
+
+MAINTAINER = "Moblin <dev@lists.moblin.org>"
+
+PACKAGE_CLASSES ?= "package_rpm"
+INHERIT_INSANE ?= "insane"
+INHERIT += "${PACKAGE_CLASSES} debian moblin devshell ${INHERIT_INSANE} packaged-staging"
+
+# For some reason, this doesn't work
+# TARGET_OS ?= "linux"
+# TARGET_VENDOR ?= "-poky"
+# Set by POKYMODE instead
+TARGET_OS = "linux"
+
+QA_LOGFILE = "${TMPDIR}/qa.log"
+
+IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
+
+# Metadata is git based
+#METADATA_REVISION = "${@base_get_metadata_git_revision(d)}"
+#FIXME
+METADATA_REVISION = "unknown"
+
+#IPK_FEED_URIS += " \
+#           upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
+#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
+#            machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
+#               base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
+#               libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
+#            console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
+#              devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
+
+#RPM_FEED_URIS += " \
+#           upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
+#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
+#            machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
+#               base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
+#               libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
+#            console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
+#              devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
+
+OEINCLUDELOGS = "yes"
+KERNEL_CONSOLE = "ttyS0"
+#DEBUG_OPTIMIZATION = "-O -g3"
+#DEBUG_BUILD = "1"
+#INHIBIT_PACKAGE_STRIP = "1"
+
+# Default to TARGETOS values for EABI
+GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
+UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
+
+POKYMODE ?= "moblin"
+require conf/distro/include/poky-${POKYMODE}.inc
+
+POKYLIBC ?= "glibc"
+require conf/distro/include/poky-${POKYLIBC}.inc
+
+SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${HOST_ARCH}-${TARGET_ARCH}"
+SDK_PREFIX = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}/${TARGET_ARCH}"
+
+CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}"
+
+#
+# Preferred providers:
+#
+
+# Virtuals:
+PREFERRED_PROVIDER_virtual/db ?= "db"
+PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
+PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet"
+PREFERRED_PROVIDER_xf86-video-intel ?= xf86-video-intel
+
+VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
+
+# Others:
+PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers"
+PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
+PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
+PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
+PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2"
+PREFERRED_PROVIDER_opkg ?= "opkg"
+
+require conf/distro/include/poky-fixed-revisions.inc
+require conf/distro/include/preferred-xorg-versions.inc
+
+PCMCIA_MANAGER ?= "pcmciautils"
+
+CVS_TARBALL_STASH += "http://www.o-hand.com/~richard/poky/sources/"
+
+IMAGE_LINGUAS ?= "en-gb"
+LIMIT_BUILT_LOCALES ?= "en_GB"
+ENABLE_BINARY_LOCALE_GENERATION ?= "1"
+LOCALE_UTF8_ONLY = "1"
+
+DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci"
+
+POKY_EXTRA_RDEPENDS = ""
+POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config"
+POKY_EXTRA_RDEPENDS_qemuarmv6 = "qemu-config"
+POKY_EXTRA_RDEPENDS_qemuarmv7 = "qemu-config"
+POKY_EXTRA_RDEPENDS_qemux86 = "qemu-config"
+
+DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}"
+DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet"
+
+IMAGE_FEATURES ?= ""
+
+require conf/distro/include/world-broken.inc
diff --git a/meta-moblin/packages/images/moblin-image-live.bb b/meta-moblin/packages/images/moblin-image-live.bb
index ff12fd4074..3fcfda7279 100644
--- a/meta-moblin/packages/images/moblin-image-live.bb
+++ b/meta-moblin/packages/images/moblin-image-live.bb
@@ -1,3 +1,7 @@
+#
+# Copyright (C) 2008 Intel Corporation.
+#
+
 DESCRIPTION = "Netbook Bootable Live Image"
 
 require moblin-image-live.inc
diff --git a/meta-moblin/packages/images/moblin-image-live.inc b/meta-moblin/packages/images/moblin-image-live.inc
index 2dd9a8917f..0f401091c1 100644
--- a/meta-moblin/packages/images/moblin-image-live.inc
+++ b/meta-moblin/packages/images/moblin-image-live.inc
@@ -1,3 +1,7 @@
+#
+# Copyright (C) 2008 Intel Corporation.
+#
+
 AUTO_SYSLINUXCFG = "1"
 INITRD = "${DEPLOY_DIR_IMAGE}/moblin-image-minimal-initramfs-${MACHINE}.cpio.gz"
 APPEND += "root=/dev/ram0 "
diff --git a/meta-moblin/packages/images/moblin-image-minimal-initramfs.bb b/meta-moblin/packages/images/moblin-image-minimal-initramfs.bb
index 1626a40678..7331eff150 100644
--- a/meta-moblin/packages/images/moblin-image-minimal-initramfs.bb
+++ b/meta-moblin/packages/images/moblin-image-minimal-initramfs.bb
@@ -1,4 +1,8 @@
-# Simple initramfs image. Mostly used for live images.
+#
+# Copyright (C) 2008 Intel Corporation.
+#
+
+DESCRIPTION = "Simple initramfs image. Mostly used for live images."
 
 IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev"
 
diff --git a/meta-moblin/packages/images/moblin-image-minimal-live.bb b/meta-moblin/packages/images/moblin-image-minimal-live.bb
index 83dab3ecc3..b2c8ff60d2 100644
--- a/meta-moblin/packages/images/moblin-image-minimal-live.bb
+++ b/meta-moblin/packages/images/moblin-image-minimal-live.bb
@@ -1,3 +1,7 @@
+#
+# Copyright (C) 2008 Intel Corporation.
+#
+
 DESCRIPTION = "Minimal Bootable Live Image"
 
 require moblin-image-live.inc
diff --git a/meta-moblin/packages/images/moblin-image-minimal.bb b/meta-moblin/packages/images/moblin-image-minimal.bb
new file mode 100644
index 0000000000..3178fff07f
--- /dev/null
+++ b/meta-moblin/packages/images/moblin-image-minimal.bb
@@ -0,0 +1,12 @@
+#
+# Copyright (C) 2008 Intel Corporation.
+#
+
+IMAGE_INSTALL = "task-moblin-boot ${ROOTFS_PKGMANAGE}"
+
+IMAGE_LINGUAS = " "
+
+inherit moblin-image
+
+# remove not needed ipkg informations
+ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files"
diff --git a/meta-moblin/packages/images/moblin-image-netbook-install.bb b/meta-moblin/packages/images/moblin-image-netbook-install.bb
new file mode 100644
index 0000000000..184a33cb65
--- /dev/null
+++ b/meta-moblin/packages/images/moblin-image-netbook-install.bb
@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2008 Intel Corporation.
+#
+
+DESCRIPTION = "Netbook Bootable Live Image"
+
+require moblin-image-live.inc
+
+LABELS += "install"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-netbook-${MACHINE}.ext3"
+
+do_bootimg[depends] += "moblin-image-netbook:do_rootfs"
diff --git a/meta-moblin/packages/images/moblin-image-netbook-live.bb b/meta-moblin/packages/images/moblin-image-netbook-live.bb
new file mode 100644
index 0000000000..3fcfda7279
--- /dev/null
+++ b/meta-moblin/packages/images/moblin-image-netbook-live.bb
@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2008 Intel Corporation.
+#
+
+DESCRIPTION = "Netbook Bootable Live Image"
+
+require moblin-image-live.inc
+
+LABELS += "boot install"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-netbook-${MACHINE}.ext3"
+
+do_bootimg[depends] += "moblin-image-netbook:do_rootfs"
diff --git a/meta-moblin/packages/images/moblin-image-netbook.bb b/meta-moblin/packages/images/moblin-image-netbook.bb
index a573dbe83f..8cbcf2a5e2 100644
--- a/meta-moblin/packages/images/moblin-image-netbook.bb
+++ b/meta-moblin/packages/images/moblin-image-netbook.bb
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007 OpenedHand Ltd.
+# Copyright (C) 2008 Intel Corporation.
 #
 
 IMAGE_FEATURES += "apps-console-core ${NETBOOK_IMAGE_FEATURES}"
diff --git a/meta-moblin/packages/images/moblin-image-sato-live.bb b/meta-moblin/packages/images/moblin-image-sato-live.bb
deleted file mode 100644
index 81c07b7e50..0000000000
--- a/meta-moblin/packages/images/moblin-image-sato-live.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "Sato Bootable Live Image"
-
-require moblin-image-live.inc
-
-LABELS += "boot install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-sato-${MACHINE}.ext3"
-
-do_bootimg[depends] += "moblin-image-sato:do_rootfs"
diff --git a/meta-moblin/packages/images/moblin-image-sato.bb b/meta-moblin/packages/images/moblin-image-sato.bb
deleted file mode 100644
index 61f97334f7..0000000000
--- a/meta-moblin/packages/images/moblin-image-sato.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (C) 2007 OpenedHand Ltd.
-#
-
-IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
-
-inherit moblin-image
diff --git a/meta-moblin/packages/images/moblin-image-sdk-live.bb b/meta-moblin/packages/images/moblin-image-sdk-live.bb
index 84cf107537..44d2cda950 100644
--- a/meta-moblin/packages/images/moblin-image-sdk-live.bb
+++ b/meta-moblin/packages/images/moblin-image-sdk-live.bb
@@ -1,3 +1,7 @@
+#
+# Copyright (C) 2008 Intel Corporation.
+#
+
 DESCRIPTION = "Bootable Live SDK Image"
 
 require moblin-image-live.inc
diff --git a/meta-moblin/packages/images/moblin-image-sdk.bb b/meta-moblin/packages/images/moblin-image-sdk.bb
index 0ec00f2574..6f42a33d6c 100644
--- a/meta-moblin/packages/images/moblin-image-sdk.bb
+++ b/meta-moblin/packages/images/moblin-image-sdk.bb
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007 OpenedHand Ltd.
+# Copyright (C) 2008 Intel Corporation.
 #
 
 IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} tools-debug tools-profile tools-sdk dev-pkgs dbg-pkgs"
diff --git a/meta-moblin/packages/images/poky-image-live.bb b/meta-moblin/packages/images/poky-image-live.bb
deleted file mode 100644
index a3bfbfc71f..0000000000
--- a/meta-moblin/packages/images/poky-image-live.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "Netbook Bootable Live Image"
-
-require poky-image-live.inc
-
-LABELS += "boot install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-netbook-${MACHINE}.ext3"
-
-do_bootimg[depends] += "poky-image-netbook:do_rootfs"
diff --git a/meta-moblin/packages/images/poky-image-live.inc b/meta-moblin/packages/images/poky-image-live.inc
deleted file mode 100644
index 7f8dd8fba5..0000000000
--- a/meta-moblin/packages/images/poky-image-live.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-AUTO_SYSLINUXCFG = "1"
-INITRD = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-initramfs-${MACHINE}.cpio.gz"
-APPEND += "root=/dev/ram0 "
-TIMEOUT = "10"
-
-EXCLUDE_FROM_WORLD = "1"
-
-do_bootimg[depends] += "poky-image-minimal-initramfs:do_rootfs"
-
-inherit bootimg
-
-do_bootimg_prepend () {
-        import bb
-        fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True)
-        if 'ext3' not in fstypes:
-                bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES")
-}
-
diff --git a/meta-moblin/packages/images/poky-image-minimal-initramfs.bb b/meta-moblin/packages/images/poky-image-minimal-initramfs.bb
deleted file mode 100644
index b2824a7d61..0000000000
--- a/meta-moblin/packages/images/poky-image-minimal-initramfs.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-# Simple initramfs image. Mostly used for live images.
-
-IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev"
-
-export IMAGE_BASENAME = "poky-image-minimal-initramfs"
-IMAGE_LINGUAS = ""
-
-inherit poky-image
diff --git a/meta-moblin/packages/images/poky-image-minimal-live.bb b/meta-moblin/packages/images/poky-image-minimal-live.bb
deleted file mode 100644
index 7d9aa5f154..0000000000
--- a/meta-moblin/packages/images/poky-image-minimal-live.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "Minimal Bootable Live Image"
-
-require poky-image-live.inc
-
-LABELS += "boot install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-${MACHINE}.ext3"
-
-do_bootimg[depends] += "poky-image-minimal:do_rootfs"
diff --git a/meta-moblin/packages/images/poky-image-netbook.bb b/meta-moblin/packages/images/poky-image-netbook.bb
deleted file mode 100644
index 8138e9d598..0000000000
--- a/meta-moblin/packages/images/poky-image-netbook.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (C) 2007 OpenedHand Ltd.
-#
-
-IMAGE_FEATURES += "apps-console-core ${NETBOOK_IMAGE_FEATURES}"
-
-inherit poky-image
diff --git a/meta-moblin/packages/images/poky-image-sato-live.bb b/meta-moblin/packages/images/poky-image-sato-live.bb
deleted file mode 100644
index 9b686e812c..0000000000
--- a/meta-moblin/packages/images/poky-image-sato-live.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "Sato Bootable Live Image"
-
-require poky-image-live.inc
-
-LABELS += "boot install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-${MACHINE}.ext3"
-
-do_bootimg[depends] += "poky-image-sato:do_rootfs"
diff --git a/meta-moblin/packages/tasks/task-moblin-apps-x11-pimlico.bb b/meta-moblin/packages/tasks/task-moblin-apps-x11-pimlico.bb
index 1ab8163fc1..4523196bfe 100644
--- a/meta-moblin/packages/tasks/task-moblin-apps-x11-pimlico.bb
+++ b/meta-moblin/packages/tasks/task-moblin-apps-x11-pimlico.bb
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2008 OpenedHand Ltd.
+# Copyright (C) 2008 Intel Corporation.
 #
 
 DESCRIPTION = "X11 Pimlico Appications List"
diff --git a/meta-moblin/packages/tasks/task-moblin-boot.bb b/meta-moblin/packages/tasks/task-moblin-boot.bb
index a5b78fcf80..015b94bbaa 100644
--- a/meta-moblin/packages/tasks/task-moblin-boot.bb
+++ b/meta-moblin/packages/tasks/task-moblin-boot.bb
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007 OpenedHand Ltd.
+# Copyright (C) 2008 Intel Corporation.
 #
 
 DESCRIPTION = "Task for Moblin - minimal bootable image"
diff --git a/meta-moblin/packages/tasks/task-moblin-sdk.bb b/meta-moblin/packages/tasks/task-moblin-sdk.bb
index 84bb71a848..4b6030e2a5 100644
--- a/meta-moblin/packages/tasks/task-moblin-sdk.bb
+++ b/meta-moblin/packages/tasks/task-moblin-sdk.bb
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007 OpenedHand Ltd.
+# Copyright (C) 2008 Intel Corporation.
 #
 
 DESCRIPTON = "Software Development Tasks for Moblin"
diff --git a/meta-moblin/packages/tasks/task-moblin-standalone-sdk-target.bb b/meta-moblin/packages/tasks/task-moblin-standalone-sdk-target.bb
index e9384f5ecd..c9f118cdf5 100644
--- a/meta-moblin/packages/tasks/task-moblin-standalone-sdk-target.bb
+++ b/meta-moblin/packages/tasks/task-moblin-standalone-sdk-target.bb
@@ -1,4 +1,8 @@
-DESCRIPTION = "Target packages for the standalone SDK"
+#
+# Copyright (C) 2008 Intel Corporation.
+#
+
+DESCRIPTION = "Target packages for the standalone Moblin SDK"
 PR = "r4"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
diff --git a/meta-moblin/packages/tasks/task-moblin-tools-bb b/meta-moblin/packages/tasks/task-moblin-tools-bb
deleted file mode 100644
index 6d5e60cbb8..0000000000
--- a/meta-moblin/packages/tasks/task-moblin-tools-bb
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (C) 2008 OpenedHand Ltd.
-#
-
-DESCRIPTION = "Tools tasks for Moblin"
-PR = "r1"
-
-PACKAGES = "\
-    task-moblin-tools-debug \
-    task-moblin-tools-debug-dbg \
-    task-moblin-tools-debug-dev \
-    task-moblin-tools-profile \
-    task-moblin-tools-profile-dbg \
-    task-moblin-tools-profile-dev \
-    task-moblin-tools-testapps \
-    task-moblin-tools-testapps-dbg \
-    task-moblin-tools-testapps-dev \
-    "
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-ALLOW_EMPTY = "1"
-
-RDEPENDS_task-moblin-tools-debug = "\
-    gdb \
-    gdbserver \
-    strace"
-
-RDEPENDS_task-moblin-tools-profile = "\
-    exmap-console \
-    exmap-server \
-    oprofile \
-    oprofileui-server \
-    powertop \
-    lttng-control \
-    lttng-viewer \
-    sreadahead"
-
-RDEPENDS_task-moblin-tools-profile_qemux86 += "valgrind"
-
-RRECOMMENDS_task-moblin-tools-profile = "\
-    kernel-module-oprofile"
-
-RDEPENDS_task-moblin-tools-testapps = "\
-    blktool \
-    tslib-calibrate \
-    tslib-tests \
-    lrzsz \
-    kexec-tools \
-    alsa-utils-amixer \
-    alsa-utils-aplay \
-    owl-video \
-    gst-meta-video \
-    gst-meta-audio \
-    xrestop \
-    xwininfo \
-    xprop \
-    xvideo-tests"
diff --git a/meta-moblin/packages/tasks/tasks-moblin-tools.bb b/meta-moblin/packages/tasks/task-moblin-tools.bb
index 33dad20d89..86ac7ff364 100644
--- a/meta-moblin/packages/tasks/tasks-moblin-tools.bb
+++ b/meta-moblin/packages/tasks/task-moblin-tools.bb
@@ -1,9 +1,9 @@
 #
-# Copyright (C) 2008 OpenedHand Ltd.
+# Copyright (C) 2008 Intel Corporation.
 #
 
-DESCRIPTION = "Tools tasks for Moblin"
-PR = "r1"
+DESCRIPTION = "Debuggin and profiling tools tasks for Moblin"
+PR = "r2"
 
 PACKAGES = "\
     task-moblin-tools-debug \
@@ -27,13 +27,14 @@ RDEPENDS_task-moblin-tools-debug = "\
     strace"
 
 RDEPENDS_task-moblin-tools-profile = "\
-    exmap-console \
-    exmap-server \
+#    exmap-console \
+#    exmap-server \
     oprofile \
     oprofileui-server \
     powertop \
     lttng-control \
     lttng-viewer"
+#    sreadahead"
 
 RDEPENDS_task-moblin-tools-profile_qemux86 += "valgrind"
 
diff --git a/meta-moblin/packages/tasks/task-moblin-x11-netbook.bb b/meta-moblin/packages/tasks/task-moblin-x11-netbook.bb
index 90ee0d1ac6..b8fa1e3442 100644
--- a/meta-moblin/packages/tasks/task-moblin-x11-netbook.bb
+++ b/meta-moblin/packages/tasks/task-moblin-x11-netbook.bb
@@ -1,8 +1,8 @@
 #
-# Copyright (C) 2008 Intel.
+# Copyright (C) 2008 Intel Corporation.
 #
 
-DESCRIPTION = "Netbook Tasks for Moblin"
+DESCRIPTION = "Netbook GUI Tasks for Moblin"
 PR = "r0"
 
 PACKAGES = "\
diff --git a/meta-moblin/packages/tasks/task-moblin-x11-sato.bb b/meta-moblin/packages/tasks/task-moblin-x11-sato.bb
deleted file mode 100644
index 6ae3bc07c7..0000000000
--- a/meta-moblin/packages/tasks/task-moblin-x11-sato.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright (C) 2007-2008 OpenedHand Ltd.
-#
-
-DESCRIPTION = "Sato Tasks for Moblin"
-PR = "r29"
-
-PACKAGES = "\
-    task-moblin-x11-sato \
-    task-moblin-x11-sato-dbg \
-    task-moblin-x11-sato-dev \
-    "
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-ALLOW_EMPTY = "1"
-
-NETWORK_MANAGER ?= "networkmanager-applet"
-RDEPENDS_task-moblin-x11-sato = "\
-    matchbox-desktop \
-    matchbox-session-sato \
-    matchbox-keyboard \
-    matchbox-stroke \
-    matchbox-config-gtk \
-    xcursor-transparent-theme \
-    sato-icon-theme \
-    settings-daemon \
-    gtk-sato-engine \
-    ${NETWORK_MANAGER}"
diff --git a/meta-moblin/packages/tasks/task-moblin.bb b/meta-moblin/packages/tasks/task-moblin.bb
index cb9f0c34c7..9b34d99993 100644
--- a/meta-moblin/packages/tasks/task-moblin.bb
+++ b/meta-moblin/packages/tasks/task-moblin.bb
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2008 OpenedHand Ltd.
+# Copyright (C) 2008 Intel Corporation.
 #
 
 DESCRIPTION = "Tasks for Moblin"
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 239d937238..8407cdd567 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -4,6 +4,8 @@ LICENSE = "MIT"
 PACKAGES = ""
 RDEPENDS += "${IMAGE_INSTALL}"
 
+INHIBIT_DEFAULT_DEPS = "1"
+
 # "export IMAGE_BASENAME" not supported at this time
 IMAGE_BASENAME[export] = "1"
 export PACKAGE_INSTALL ?= "${IMAGE_INSTALL}"
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 059f787eb8..b2266bee5d 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -452,7 +452,9 @@ do_deploy() {
         install -d ${DEPLOY_DIR_IMAGE}
         install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
         package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
-        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
+        if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
+                tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
+        fi
 
         if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
                 if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 3defcdde70..d291733dcf 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -147,7 +147,7 @@ python write_specfile() {
 rpm_prep() {
         if [ ! -e ${WORKDIR}/rpmrc ]; then
                 mkdir -p ${RPMBUILDPATH}/{SPECS,RPMS/{i386,i586,i686,noarch,ppc,mips,mipsel,arm},SRPMS,SOURCES,BUILD}
-                echo 'macrofiles:/usr/lib/rpm/macros:${WORKDIR}/macros' > ${WORKDIR}/rpmrc
+                echo 'macrofiles:${STAGING_DIR_NATIVE}/usr/lib/rpm/macros:${WORKDIR}/macros' > ${WORKDIR}/rpmrc
                 echo '%_topdir ${RPMBUILDPATH}' > ${WORKDIR}/macros
                 echo '%_repackage_dir ${WORKDIR}' >> ${WORKDIR}/macros
         fi
diff --git a/meta/conf/distro/include/as-needed.inc b/meta/conf/distro/include/as-needed.inc
new file mode 100644
index 0000000000..50a152de32
--- /dev/null
+++ b/meta/conf/distro/include/as-needed.inc
@@ -0,0 +1,14 @@
+
+ASNEEDED = "-Wl,--as-needed"
+
+ASNEEDED_pn-console-tools = ""
+ASNEEDED_pn-distcc = ""
+ASNEEDED_pn-openobex = ""
+ASNEEDED_pn-icu = ""
+ASNEEDED_pn-xserver-kdrive-xomap = ""
+ASNEEDED_pn-minimo = ""
+ASNEEDED_pn-pciutils = ""
+ASNEEDED_pn-puzzles = ""
+ASNEEDED_pn-dialer = ""
+
+TARGET_LDFLAGS += "${ASNEEDED}"
\ No newline at end of file
diff --git a/meta/conf/distro/include/poky-eabi.inc b/meta/conf/distro/include/poky-eabi.inc
index e0cafbaaa9..10706b695c 100644
--- a/meta/conf/distro/include/poky-eabi.inc
+++ b/meta/conf/distro/include/poky-eabi.inc
@@ -35,15 +35,6 @@ PREFERRED_VERSION_glibc ?= "2.6.1"
 PREFERRED_VERSION_glibc-initial ?= "2.6.1"
 PREFERRED_VERSION_elfutils ?= "0.131"
 
-ASNEEDED = "-Wl,--as-needed"
-ASNEEDED_pn-console-tools = ""
-ASNEEDED_pn-distcc = ""
-ASNEEDED_pn-openobex = ""
-ASNEEDED_pn-icu = ""
-ASNEEDED_pn-xserver-kdrive-xomap = ""
-ASNEEDED_pn-minimo = ""
-ASNEEDED_pn-pciutils = ""
-ASNEEDED_pn-puzzles = ""
-ASNEEDED_pn-dialer = ""
-
-TARGET_LDFLAGS += "${ASNEEDED}"
+require conf/distro/include/as-needed.inc
+
+
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 936b07f62f..94188334da 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -65,7 +65,7 @@ SRCREV_pn-matchbox-config-gtk ?= "1614"
 SRCREV_pn-matchbox-desktop-sato ?= "76"
 SRCREV_pn-matchbox-desktop ?= "2084"
 SRCREV_pn-matchbox-keyboard ?= "1910"
-SRCREV_pn-matchbox-panel-2 ?= "2086"
+SRCREV_pn-matchbox-panel-2 ?= "2088"
 SRCREV_pn-matchbox-panel ?= "1364"
 SRCREV_pn-matchbox-stroke ?= "1524"
 SRCREV_pn-matchbox-terminal ?= "1612"
diff --git a/meta/conf/distro/include/poky-moblin.inc b/meta/conf/distro/include/poky-moblin.inc
new file mode 100644
index 0000000000..45535c5540
--- /dev/null
+++ b/meta/conf/distro/include/poky-moblin.inc
@@ -0,0 +1,26 @@
+TARGET_VENDOR = "-poky"
+
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
+
+GCCVERSION ?= "4.2.3"
+BINUVERSION = "2.18"
+
+PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
+PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}"
+PREFERRED_VERSION_gcc-cross-initial ?= "${GCCVERSION}"
+PREFERRED_VERSION_gcc-cross-intermediate ?= "${GCCVERSION}"
+PREFERRED_VERSION_gcc-cross-sdk ?= "${GCCVERSION}"
+PREFERRED_VERSION_binutils ?= "${BINUVERSION}"
+PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}"
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.24"
+PREFERRED_VERSION_glibc ?= "2.6.1"
+PREFERRED_VERSION_glibc-initial ?= "2.6.1"
+PREFERRED_VERSION_elfutils ?= "0.131"
+
+require conf/distro/include/as-needed.inc
+
diff --git a/meta/conf/distro/include/world-broken.inc b/meta/conf/distro/include/world-broken.inc
new file mode 100644
index 0000000000..c1dc7f5738
--- /dev/null
+++ b/meta/conf/distro/include/world-broken.inc
@@ -0,0 +1,36 @@
+#
+# Exclude known broken packages
+#
+# Needs old OpenSync
+EXCLUDE_FROM_WORLD_pn-libsync = "1"
+EXCLUDE_FROM_WORLD_pn-libopensync-plugin-evo2-sync = "1"
+EXCLUDE_FROM_WORLD_pn-libopensync-plugin-file-sync = "1"
+EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc = "1"
+EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc-sync = "1"
+EXCLUDE_FROM_WORLD_pn-libopensync-plugin-google-calendar = "1"
+# Needs python
+EXCLUDE_FROM_WORLD_pn-opkg-utils = "1"
+# Needs gcc 3.x
+EXCLUDE_FROM_WORLD_pn-qemu = "1"
+# temporary
+EXCLUDE_FROM_WORLD_pn-lirc = "1"
+EXCLUDE_FROM_WORLD_pn-lirc-modules = "1"
+# these applications need clutter 0.6
+EXCLUDE_FROM_WORLD_pn-aaina = "1"
+EXCLUDE_FROM_WORLD_pn-table = "1"
+EXCLUDE_FROM_WORLD_pn-task-poky-clutter = "1"
+# Need bzr
+EXCLUDE_FROM_WORLD_pn-eds-tools = "1"
+# Need fixed Perl - OE bug #3403
+EXCLUDE_FROM_WORLD_pn-libxml-parser-perl = "1"
+# Needs libxml-parser-perl
+EXCLUDE_FROM_WORLD_pn-libxml-simple-perl = "1"
+# Needs gtk+ <= 2.10
+EXCLUDE_FROM_WORLD_pn-gcalctool = "1"
+
+# The packages from these clash atm
+EXCLUDE_FROM_WORLD_pn-abiword = "1"
+EXCLUDE_FROM_WORLD_pn-abiword-embedded = "1"
+
+# helix is x86 only
+EXCLUDE_FROM_WORLD_pn-clutter-helix = "1"
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index a6591bdad5..4b20438368 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -116,33 +116,5 @@ DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet"
 
 IMAGE_FEATURES ?= ""
 
-#
-# Exclude known broken packages
-#
-# Needs old OpenSync
-EXCLUDE_FROM_WORLD_pn-libsync = "1"
-EXCLUDE_FROM_WORLD_pn-libopensync-plugin-evo2-sync = "1"
-EXCLUDE_FROM_WORLD_pn-libopensync-plugin-file-sync = "1"
-EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc = "1"
-EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc-sync = "1"
-EXCLUDE_FROM_WORLD_pn-libopensync-plugin-google-calendar = "1"
-# Needs python
-EXCLUDE_FROM_WORLD_pn-opkg-utils = "1"
-# Needs gcc 3.x
-EXCLUDE_FROM_WORLD_pn-qemu = "1"
-# temporary
-EXCLUDE_FROM_WORLD_pn-lirc = "1"
-EXCLUDE_FROM_WORLD_pn-lirc-modules = "1"
-# these applications need clutter 0.6
-EXCLUDE_FROM_WORLD_pn-aaina = "1"
-EXCLUDE_FROM_WORLD_pn-table = "1"
-EXCLUDE_FROM_WORLD_pn-task-poky-clutter = "1"
-# Need bzr
-EXCLUDE_FROM_WORLD_pn-eds-tools = "1"
-# Need fixed Perl - OE bug #3403
-EXCLUDE_FROM_WORLD_pn-libxml-parser-perl = "1"
-# Needs libxml-parser-perl
-EXCLUDE_FROM_WORLD_pn-libxml-simple-perl = "1"
-# Needs gtk+ <= 2.10
-EXCLUDE_FROM_WORLD_pn-gcalctool = "1"
+require conf/distro/include/world-broken.inc
 
diff --git a/meta/packages/gtk+/gtk+.inc b/meta/packages/gtk+/gtk+.inc
index 9a767e29cb..c3f454829a 100644
--- a/meta/packages/gtk+/gtk+.inc
+++ b/meta/packages/gtk+/gtk+.inc
@@ -34,6 +34,7 @@ FILES_${PN}-dbg += " \
 BASE_RRECOMMENDS = "ttf-dejavu-sans"
 BASE_RRECOMMENDS_angstrom = "ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"
 BASE_RRECOMMENDS_poky = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info"
+BASE_RRECOMMENDS_moblin = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info"
 
 GLIBC_RRECOMMENDS= "${BASE_RRECOMMENDS} glibc-gconv-iso8859-1"
 
diff --git a/meta/packages/helix/helix-libs.bb b/meta/packages/helix/helix-libs.bb
index 83c9d8139c..604ec622c6 100644
--- a/meta/packages/helix/helix-libs.bb
+++ b/meta/packages/helix/helix-libs.bb
@@ -19,6 +19,8 @@ export BUILDRC=${BUILD_ROOT}/buildrc
 export SYSTEM_ID=linux-2.2-libc6-gcc32-i586
 export BUILD=$BUILD_ROOT/bin/build.py
 
+COMPATIBLE_HOST = '(i.86.*-linux)'
+
 do_compile() {
         ${BUILD} -k -trelease -mclutter -Phelix-client-all-defines clutter
 }
diff --git a/meta/packages/helix/ribosome.bb b/meta/packages/helix/ribosome.bb
index 4339a6ce49..840fc855eb 100644
--- a/meta/packages/helix/ribosome.bb
+++ b/meta/packages/helix/ribosome.bb
@@ -16,6 +16,8 @@ SRC_URI = "${_TARBALL_SERVER}/ribosome-${_SNAPSHOT}.tar.bz2 \
 
 S = "${WORKDIR}"
 
+COMPATIBLE_HOST = '(i.86.*-linux)'
+
 do_stage() {
         # Install build system of doom
         install -d ${STAGING_DIR_HOST}${libdir}
diff --git a/meta/packages/images/poky-image-netbook-install.bb b/meta/packages/images/poky-image-netbook-install.bb
deleted file mode 100644
index ac7dc63e2b..0000000000
--- a/meta/packages/images/poky-image-netbook-install.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "Netbook Bootable Live Image"
-
-require poky-image-live.inc
-
-LABELS += "install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-netbook-${MACHINE}.ext3"
-
-do_bootimg[depends] += "poky-image-netbook:do_rootfs"
diff --git a/meta/packages/images/poky-image-netbook-live.bb b/meta/packages/images/poky-image-netbook-live.bb
deleted file mode 100644
index a3bfbfc71f..0000000000
--- a/meta/packages/images/poky-image-netbook-live.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "Netbook Bootable Live Image"
-
-require poky-image-live.inc
-
-LABELS += "boot install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-netbook-${MACHINE}.ext3"
-
-do_bootimg[depends] += "poky-image-netbook:do_rootfs"
diff --git a/meta/packages/images/poky-image-netbook.bb b/meta/packages/images/poky-image-netbook.bb
deleted file mode 100644
index 8138e9d598..0000000000
--- a/meta/packages/images/poky-image-netbook.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (C) 2007 OpenedHand Ltd.
-#
-
-IMAGE_FEATURES += "apps-console-core ${NETBOOK_IMAGE_FEATURES}"
-
-inherit poky-image
diff --git a/meta-moblin/packages/images/poky-image-sdk-live.bb b/meta/packages/images/poky-image-sdk-live.bb
index 807de392a3..807de392a3 100644
--- a/meta-moblin/packages/images/poky-image-sdk-live.bb
+++ b/meta/packages/images/poky-image-sdk-live.bb
diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal
index ee7a0a935c..e1797a06c2 100755
--- a/scripts/poky-env-internal
+++ b/scripts/poky-env-internal
@@ -37,6 +37,8 @@ PKGDIR_MOBLIN="$OEROOT/meta-moblin/"
 BUILDDIR="$OEROOT/$BDIR/"
 MSG=''
 
+unset BDIR
+
 BUILD_ARCH=`uname -m`
 BUILD_OS=`uname | tr [A-Z] [a-z]`
 BUILD_SYS="$BUILD_ARCH-$BUILD_OS"
@@ -91,4 +93,4 @@ echo
 echo "### Shell environment set up for Poky builds. ###"
 echo 
 
-export BB_ENV_EXTRAWHITE="MACHINE DISTRO POKYLIBC OEROOT http_proxy ftp_proxy"
+export BB_ENV_EXTRAWHITE="MACHINE DISTRO POKYMODE POKYLIBC OEROOT http_proxy ftp_proxy"