7 files changed, 14 insertions, 25 deletions

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/packages/images/poky-image-sdk-live.bb b/meta/packages/images/poky-image-sdk-live.bb
new file mode 100644
index 0000000000..807de392a3
--- /dev/null
+++ b/meta/packages/images/poky-image-sdk-live.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Bootable Live SDK Image"
+
+require poky-image-live.inc
+
+LABELS += "boot install"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sdk-${MACHINE}.ext3"
+
+do_bootimg[depends] += "poky-image-sdk:do_rootfs"