14 files changed, 95 insertions, 60 deletions
diff --git a/openembedded/conf/bitbake.conf b/openembedded/conf/bitbake.conf
index 2043a500eb..9c1ba1f47c 100644
--- a/openembedded/conf/bitbake.conf
+++ b/openembedded/conf/bitbake.conf
@@ -57,6 +57,7 @@ TARGET_CC_ARCH = ""
 PACKAGE_ARCH = "${HOST_ARCH}"
 MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}"
+IPKG_ARCHS = "all any noarch ${TARGET_ARCH} ${IPKG_EXTRA_ARCHS} ${MACHINE}"
 ##################################################################
 # Date/time variables.
@@ -239,9 +240,9 @@ EXTRA_OEMAKE = "-e MAKEFLAGS="
 # Build flags and options.
 ##################################################################
-export BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
+export BUILD_CPPFLAGS = "-isystem${STAGING_DIR}/${BUILD_SYS}/include"
 export CPPFLAGS = "${TARGET_CPPFLAGS}"
-export TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
+export TARGET_CPPFLAGS = "-isystem${STAGING_DIR}/${TARGET_SYS}/include"
 export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
 export CFLAGS = "${TARGET_CFLAGS}"
@@ -382,7 +383,9 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
 # when ${MACHINE} is 'ramses'. And finally '<foo>_local' overrides anything.
 #
 # This works for  functions as well, they are really just environment variables.
-OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}"
+#OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}"
+# Alternative OVERRIDES to make compilation fail fast, we will enable it by default soon
+OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast"
 ##################################################################
 # Include the rest of the config files.
diff --git a/openembedded/conf/distro/angstrom-2006.9.conf b/openembedded/conf/distro/angstrom-2006.9.conf
index c80a574a0d..5c1ed1296d 100644
--- a/openembedded/conf/distro/angstrom-2006.9.conf
+++ b/openembedded/conf/distro/angstrom-2006.9.conf
@@ -1,3 +1,11 @@
+#@--------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Angstrom <http://www.angstrom-distribution.org>
+#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices
+#@MAINTAINER: Koen Kooi <koen@dominion.kabel.utwente.nl>
+#@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de>
+#@--------------------------------------------------------------------
 #DISTRO_VERSION = "2006.9"
 DISTRO_VERSION = "test-${DATE}"
@@ -14,9 +22,12 @@ FEED_URIS += " \
 #        ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \
 #        updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
-SRCDATE = "20060425"
+SRCDATE = "20060518"
-SRCDATE_handhelds-pxa-2.6 = "20060506"
+#SRCDATE_handhelds-pxa-2.6 = "20060516"
+CVS_TARBALL_STASH = "\
+http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
+http://www.oesources.org/source/current/"
 # Opie
 #use 1337 mt version of opie to have a webbrowser
@@ -56,9 +67,9 @@ PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
 #use EABI toolchain
-PREFERRED_VERSION_gcc ?= "4.1.0"
+PREFERRED_VERSION_gcc ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross ?= "4.1.0"
+PREFERRED_VERSION_gcc-cross ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial ?= "4.1.0"
+PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
 PREFERRED_VERSION_binutils ?= "2.16.91.0.7"
 PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.7"
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
@@ -75,7 +86,7 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.4"
 PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
 PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e"
 PREFERRED_VERSION_dbus ?= "0.61"
-PREFERRED_VERSION_gstreamer ?= "0.10.5"
+PREFERRED_VERSION_gstreamer ?= "0.10.6"
 PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
 PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules"
diff --git a/openembedded/conf/distro/angstrom.conf b/openembedded/conf/distro/angstrom.conf
index a94fcee140..403b13934f 100644
--- a/openembedded/conf/distro/angstrom.conf
+++ b/openembedded/conf/distro/angstrom.conf
@@ -5,8 +5,8 @@
 DISTRO = "angstrom"
 DISTRO_NAME = "Angstrom"
-#we'll use this till we get a real domain
+#Use this variable in feeds and other parts that need a URI
-ANGSTROM_URI = "http://ewi546.ewi.utwente.nl/angstrom"
+ANGSTROM_URI = "http://www.angstrom-distribution.org/"
 #Set the default maintainer to angstrom-dev
 MAINTAINER = "Angstrom Developers <angstrom-dev@handhelds.org>"
diff --git a/openembedded/conf/distro/familiar-unstable.conf b/openembedded/conf/distro/familiar-unstable.conf
index 8b40c5811a..e42456672c 100644
--- a/openembedded/conf/distro/familiar-unstable.conf
+++ b/openembedded/conf/distro/familiar-unstable.conf
@@ -55,8 +55,10 @@ PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
 # Opie
 #
-#OPIE_VERSION = "1.2.1"
+OPIE_VERSION = "1.2.2"
-#include conf/distro/preferred-opie-versions.inc
+QTE_VERSION = "2.3.10"
+PALMTOP_USE_MULTITHREADED_QT = "yes"
+include conf/distro/preferred-opie-versions.inc
 #
 # GPE
diff --git a/openembedded/conf/distro/openzaurus-unstable.conf b/openembedded/conf/distro/openzaurus-unstable.conf
index cc87380494..9f79c32118 100644
--- a/openembedded/conf/distro/openzaurus-unstable.conf
+++ b/openembedded/conf/distro/openzaurus-unstable.conf
@@ -1,5 +1,16 @@
+#@--------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: OpenZaurus <http://www.openzaurus.org>
+#@DESCRIPTION: A Linux Distribution for the Sharp Zaurus family
+#@--------------------------------------------------------------------
 DISTRO_VERSION = ".dev-snapshot-${DATE}"
+CVS_TARBALL_STASH = "\
+http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
+http://www.oesources.org/source/current/"
 include conf/distro/openzaurus.conf
 DISTRO_TYPE = "debug"
@@ -14,8 +25,7 @@ DISTRO_TYPE = "debug"
 #            console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
 #              devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
-# SRCDATE = "20050704"
+SRCDATE = "20060514"
 #
 # Zaurus
 #
@@ -42,9 +52,8 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 #
 # Opie
 #
-QTE_VERSION = "2.3.10"
+#QTE_VERSION = "2.3.10"
-OPIE_VERSION = "1.2.2"
+#OPIE_VERSION = "1.2.2"
-PALMTOP_USE_MULTITHREADED_QT = "no"
 #PALMTOP_USE_MULTITHREADED_QT = "yes"
 include conf/distro/preferred-opie-versions.inc
diff --git a/openembedded/conf/distro/preferred-e-versions.inc b/openembedded/conf/distro/preferred-e-versions.inc
index ca35c83796..607acad858 100644
--- a/openembedded/conf/distro/preferred-e-versions.inc
+++ b/openembedded/conf/distro/preferred-e-versions.inc
@@ -2,29 +2,29 @@
 # Specify which versions of E-related libraries and applications to build
 #
-PREFERRED_VERSION_e = "0.16.999.025"
+#PREFERRED_VERSION_e = "0.16.999.025"
-PREFERRED_VERSION_ecore-x11 = "0.9.9.025"
+#PREFERRED_VERSION_ecore-x11 = "0.9.9.025"
-PREFERRED_VERSION_ecore-native = "0.9.9.025"
+#PREFERRED_VERSION_ecore-native = "0.9.9.025"
-PREFERRED_VERSION_edb = "1.0.5.006"
+#PREFERRED_VERSION_edb = "1.0.5.006"
-PREFERRED_VERSION_edb-native = "1.0.5.006"
+#PREFERRED_VERSION_edb-native = "1.0.5.006"
-PREFERRED_VERSION_edje = "0.5.0.025"
+#PREFERRED_VERSION_edje = "0.5.0.025"
-PREFERRED_VERSION_edje-native = "0.5.0.025"
+#PREFERRED_VERSION_edje-native = "0.5.0.025"
-PREFERRED_VERSION_eet = "0.9.10.025"
+#PREFERRED_VERSION_eet = "0.9.10.025"
-PREFERRED_VERSION_eet-native = "0.9.10.025"
+#PREFERRED_VERSION_eet-native = "0.9.10.025"
-PREFERRED_VERSION_embryo = "0.9.1.025"
+#PREFERRED_VERSION_embryo = "0.9.1.025"
-PREFERRED_VERSION_embryo-native = "0.9.1.025"
+#PREFERRED_VERSION_embryo-native = "0.9.1.025"
-PREFERRED_VERSION_emotion = "0.0.1.004"
+#PREFERRED_VERSION_emotion = "0.0.1.004"
-PREFERRED_VERSION_emotion-native = "0.0.1.004"
+#PREFERRED_VERSION_emotion-native = "0.0.1.004"
-PREFERRED_VERSION_epeg = "0.9.0.006"
+#PREFERRED_VERSION_epeg = "0.9.0.006"
-PREFERRED_VERSION_epsilon = "0.3.0.006"
+#PREFERRED_VERSION_epsilon = "0.3.0.006"
-PREFERRED_VERSION_esmart-x11 = "0.9.0.006"
+#PREFERRED_VERSION_esmart-x11 = "0.9.0.006"
-PREFERRED_VERSION_evas-x11 = "0.9.9.025"
+#PREFERRED_VERSION_evas-x11 = "0.9.9.025"
-PREFERRED_VERSION_evas-native = "0.9.9.025"
+#PREFERRED_VERSION_evas-native = "0.9.9.025"
-PREFERRED_VERSION_ewl = "0.0.4.006"
+#PREFERRED_VERSION_ewl = "0.0.4.006"
-PREFERRED_VERSION_imlib2-x11 = "1.2.1.011"
+#PREFERRED_VERSION_imlib2-x11 = "1.2.1.011"
-PREFERRED_VERSION_imlib2-native = "1.2.1.011"
+#PREFERRED_VERSION_imlib2-native = "1.2.1.011"
-PREFERRED_VERSION_e-wm = "0.16.999.025"
+#PREFERRED_VERSION_e-wm = "0.16.999.025"
-PREFERRED_VERSION_entrance = "0.9.0.006"
+#PREFERRED_VERSION_entrance = "0.9.0.006"
 PREFERRED_PROVIDER_virtual/evas ?= "evas-x11"
 PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11"
diff --git a/openembedded/conf/distro/preferred-opie-versions.inc b/openembedded/conf/distro/preferred-opie-versions.inc
index 5811856e55..51c9937628 100644
--- a/openembedded/conf/distro/preferred-opie-versions.inc
+++ b/openembedded/conf/distro/preferred-opie-versions.inc
@@ -1,4 +1,11 @@
 #
+# Default versions
+QTE_VERSION ?= "2.3.10"
+OPIE_VERSION ?= "1.2.2"
+PALMTOP_USE_MULTITHREADED_QT ?= "yes"
+#
+#
 # Opie libraries
 #
 PREFERRED_PROVIDER_virtual/libqte2 = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}'
diff --git a/openembedded/conf/documentation.conf b/openembedded/conf/documentation.conf
index 20bcc53f5f..c07c8fa68b 100644
--- a/openembedded/conf/documentation.conf
+++ b/openembedded/conf/documentation.conf
@@ -38,6 +38,8 @@ PACKAGE_ARCH[doc] = 'The architecture needed for using a resulting package. If y
 machine dependant configuration options in your bitbake file add a \
 PACKAGE_ARCH  = "${MACHINE_ARCH}" to the file.'
+IPKG_ARCHS[doc] = 'A list of architectures compatible with the given target in order of priority'
+IPKG_EXTRA_ARCHS[doc] = 'Set this variable to add extra architectures to the list of supported architectures'
 DATE[doc] = "The date the build was started Ymd"
 TIME[doc] = "The time the build was started HMS"
@@ -63,8 +65,9 @@ HOMEPAGE[doc] = "Homepage of the package e.g. http://www.project.net."
 GROUP_dependencies[doc] = "The keys in this group influence the dependency handling of BitBake \
 and the resulting packages."
 DEPENDS[doc]  = "Build time dependencies, things needed to build the package. @group dependencies"
-RDEPENDS[doc] = "Run time dependencies, things needed for a given package to run. @group dependencies"
+RDEPENDS[doc] = "Run time dependencies, things needed for a given package to run.  This is used to populate the ipkg:Depends field. @group dependencies"
-PROVIDES[doc] = "Names for additional dependencies that this package will provide. @group dependencies"
+PROVIDES[doc] = "Names for additional build time dependencies that this package will provide. @group dependencies"
+RPROVIDES[doc] = "Names for additional run time dependencies that this package will provide.  This is used to populate the ipkg:Provides field. @group dependencies"
 # packaging
@@ -98,4 +101,4 @@ SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the
 PALMTOP_USE_MULTITHREADED_QT[doc] = "Set to yes, if you want to build qt apps with CONFIG+=thread"
 COMPATIBLE_HOST[doc] = "A regular expression which matches the HOST_SYS names supported by the package/file. Failure to match will cause the file to be skipped by the parser."
-COMPATIBLE_MACHINE[doc] = "A regular expression which matches the MACHINES support by the package/file. Failure to match will cause the file to be skipped by the parser."
-\ No newline at end of file
+COMPATIBLE_MACHINE[doc] = "A regular expression which matches the MACHINES support by the package/file. Failure to match will cause the file to be skipped by the parser."
diff --git a/openembedded/conf/machine/include/ixp4xx.conf b/openembedded/conf/machine/include/ixp4xx.conf
index 639bf4a74e..93befb92ce 100644
--- a/openembedded/conf/machine/include/ixp4xx.conf
+++ b/openembedded/conf/machine/include/ixp4xx.conf
@@ -62,7 +62,7 @@ IXP4XX_SUFFIX = "${MACHINE_ARCH}"
 #    arm/thumb interworking are enabled in the inputs.
 OVERRIDE_THUMB = "${@['', ':thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
 OVERRIDE_INTERWORK = "${@['', ':thumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
-OVERRIDES = "local:${MACHINE}:ixp4xx:${DISTRO}${DISTRO_BASE}:${TARGET_OS}:${TARGET_ARCH}${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}:build-${BUILD_OS}"
+OVERRIDES = "local:${MACHINE}:ixp4xx:${DISTRO}${DISTRO_BASE}:${TARGET_OS}:${TARGET_ARCH}${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}:build-${BUILD_OS}:fail-fast"
 # TARGET_CC_ARCH
 # TARGET_CC_KERNEL_ARCH
@@ -111,7 +111,7 @@ TARGET_PACKAGE_ARCH = "${TARGET_PACKAGE_ARCH_BASE}${BYTE_SEX_CHAR}"
 #    because everything built here is no more specific than that.
 MACHINE_ARCH = "ixp4xx${ARCH_BYTE_SEX}"
-# IPKG_ARCHS
+# IPKG_EXTRA_ARCHS
 #    The full list of package architectures which should run on the system.
 #    This takes into account both the board level issues and the INPUTS set
 #    by the distro.  The arm list is derived from the architecture settings
@@ -126,12 +126,12 @@ THUMB_ARCHITECTURES = "thumbe${BYTE_SEX_CHAR} thumbv4t${BYTE_SEX_CHAR} thumbv5t$
 #    NOTE: this list contains just the things which rootfs_ipk.bbclass does
 #    not add, rootfs_ipk.bbclass evaluates:
 #
-#        ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${MACHINE}"
+#        ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_EXTRA_ARCHS} ${MACHINE}"
 #
 #    This is a priority ordered list - most desireable architecture at the end,
 #    so put <ARM_INSTRUCTION_SET>_ARCHITECTURES at the end and, if
 #    THUMB_INTERWORK precede this with the other architectures.
-IPKG_ARCHS = "ixp4xx ${MACHINE} \
+IPKG_EXTRA_ARCHS = "ixp4xx ${MACHINE} \
                ${@(lambda arch_thumb, arch_arm, is_arm, interwork: \
                (interwork and (is_arm and arch_thumb or arch_arm) + ' ' or '') \
                + '${TARGET_ARCH} ' + (is_arm and arch_arm or arch_thumb)) \
@@ -146,7 +146,7 @@ IPKG_ARCHS = "ixp4xx ${MACHINE} \
 #    the removal of the raw "${MACHINE}" from the end of the list.  ${MACHINE} and
 #    ixp4xx are included at the start (lower priority) as the non-byte-sex specific
 #    versions.
-IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${IPKG_ARCHS}"
+IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${IPKG_EXTRA_ARCHS}"
 #-------------------------------------------------------------------------------
 # Package versions
diff --git a/openembedded/conf/machine/include/zaurus-clamshell.conf b/openembedded/conf/machine/include/zaurus-clamshell.conf
index e437a64609..4fd1780605 100644
--- a/openembedded/conf/machine/include/zaurus-clamshell.conf
+++ b/openembedded/conf/machine/include/zaurus-clamshell.conf
@@ -1,5 +1,5 @@
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te"
+IPKG_EXTRA_ARCHS = "armv4 armv5te"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
@@ -11,6 +11,11 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
                   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
                   ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
+# add a summary to the jffs2 file to make it mount a lot faster
+EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img \
+                          -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.img \
+                          --eraseblock=0x4000"
 GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_INSTALL += "gaim sylpheed"
diff --git a/openembedded/conf/machine/ipaq-pxa270.conf b/openembedded/conf/machine/ipaq-pxa270.conf
index 07753ccf64..f5cc893c9c 100644
--- a/openembedded/conf/machine/ipaq-pxa270.conf
+++ b/openembedded/conf/machine/ipaq-pxa270.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU  devices
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te ipaqpxa hx4700"
+IPKG_EXTRA_ARCHS = "armv4 armv5te ipaqpxa hx4700"
 #use this for a hx47xx ipaq
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
diff --git a/openembedded/conf/machine/jornada7xx.conf b/openembedded/conf/machine/jornada7xx.conf
index 82eff0b563..e8218138d5 100644
--- a/openembedded/conf/machine/jornada7xx.conf
+++ b/openembedded/conf/machine/jornada7xx.conf
@@ -3,6 +3,5 @@
 #@DESCRIPTION: Machine configuration for the SA1100 based HP Jornada 7xx palmtop computer
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm ${MACHINE}"
 include conf/machine/include/tune-strongarm.conf
 \ No newline at end of file
diff --git a/openembedded/conf/machine/nokia770.conf b/openembedded/conf/machine/nokia770.conf
index dd2127610a..c50c1a1bc8 100644
--- a/openembedded/conf/machine/nokia770.conf
+++ b/openembedded/conf/machine/nokia770.conf
@@ -2,11 +2,11 @@
 #@NAME: Nokia 770 internet tablet
 #@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}"
+IPKG_EXTRA_ARCHS = "armv4 armv5te"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap"
 PREFERRED_PROVIDER_virtual/bootloader = ""
-PREFERRED_PROVIDER_virutal/tslib = "tslib-maemo"
+PREFERRED_PROVIDER_tslib = "tslib-maemo"
 XSERVER = "xserver-kdrive-omap"
@@ -20,15 +20,11 @@ include conf/machine/include/tune-arm926ejs.conf
 #size of the root partition (yes, it is 123 MB)
 ROOT_FLASH_SIZE = "123"
-#EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000 --no-cleanmarkers"
+EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000"
-EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000 -n "
 # serial console port on devboard rev. B3
-#SERIAL_CONSOLE = "115200 tts/0"
 SERIAL_CONSOLE = "115200 ttyS0"
-#build omap1 till nokia releases the patches
 PREFERRED_PROVIDER_virtual/kernel = "linux-nokia770"
 BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils  nokia770-init detect-stylus \
diff --git a/openembedded/conf/machine/qemuarm.conf b/openembedded/conf/machine/qemuarm.conf
index 78b1fe33fc..3341efd1a7 100644
--- a/openembedded/conf/machine/qemuarm.conf
+++ b/openembedded/conf/machine/qemuarm.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te qemuarm"
+IPKG_EXTRA_ARCHS = "armv4 armv5te"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"