Initial population

git-svn-id: https://svn.o-hand.com/repos/poky@1 311d38ba-8fff-0310-9ca6-ca027cbcb966

30 files changed, 1512 insertions, 0 deletions

diff --git a/openembedded/conf/bitbake.conf b/openembedded/conf/bitbake.conf
new file mode 100644
index 0000000000..04603d393d
--- /dev/null
+++ b/openembedded/conf/bitbake.conf
@@ -0,0 +1,381 @@
+##################################################################
+# Standard target filesystem paths.
+##################################################################
+
+# Path prefixes
+export base_prefix = ""
+export prefix = "/usr"
+export exec_prefix = "${prefix}"
+
+# Base paths
+export base_bindir = "${base_prefix}/bin"
+export base_sbindir = "${base_prefix}/sbin"
+export base_libdir = "${base_prefix}/lib"
+
+# Architecture independent paths
+export datadir = "${prefix}/share"
+export sysconfdir = "/etc"
+export sharedstatedir = "${prefix}/com"
+export localstatedir = "/var"
+export infodir = "${datadir}/info"
+export mandir = "${datadir}/man"
+export docdir = "${datadir}/doc"
+export servicedir = "/srv"
+
+# Architecture dependent paths
+export bindir = "${exec_prefix}/bin"
+export sbindir = "${exec_prefix}/sbin"
+export libexecdir = "${exec_prefix}/libexec"
+export libdir = "${exec_prefix}/lib"
+export includedir = "${exec_prefix}/include"
+export oldincludedir = "${exec_prefix}/include"
+
+##################################################################
+# Architecture-dependent build variables.
+##################################################################
+
+BUILD_ARCH = "${@os.uname()[4]}"
+BUILD_OS = "${@os.uname()[0].lower()}"
+BUILD_VENDOR = ""
+BUILD_SYS = "${BUILD_ARCH}${BUILD_VENDOR}-${BUILD_OS}"
+BUILD_PREFIX = ""
+BUILD_CC_ARCH = ""
+
+HOST_ARCH = "${TARGET_ARCH}"
+HOST_OS = "${TARGET_OS}"
+HOST_VENDOR = "${TARGET_VENDOR}"
+HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}"
+HOST_PREFIX = "${TARGET_PREFIX}"
+HOST_CC_ARCH = "${TARGET_CC_ARCH}"
+
+TARGET_ARCH = "INVALID"
+TARGET_OS = "INVALID"
+TARGET_VENDOR = "${BUILD_VENDOR}"
+TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
+TARGET_PREFIX = "${TARGET_SYS}-"
+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))]}"
+
+##################################################################
+# Date/time variables.
+##################################################################
+
+DATE := "${@time.strftime('%Y%m%d',time.gmtime())}"
+TIME := "${@time.strftime('%H%M%S',time.gmtime())}"
+DATETIME = "${DATE}${TIME}"
+
+##################################################################
+# Package default variables.
+##################################################################
+
+PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0] or 'defaultpkgname'}"
+PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1.0'}"
+PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}"
+PF = "${PN}-${PV}-${PR}"
+P = "${PN}-${PV}"
+
+# Package info.
+
+SECTION = "base"
+PRIORITY = "optional"
+DESCRIPTION = "Version ${PV}-${PR} of package ${PN}"
+LICENSE = "unknown"
+MAINTAINER = "OpenEmbedded Team <oe@handhelds.org>"
+HOMEPAGE = "unknown"
+
+# Package dependencies and provides.
+
+DEPENDS = ""
+RDEPENDS = ""
+PROVIDES = ""
+PROVIDES_prepend = "${P} ${PF} ${PN} "
+RPROVIDES = ""
+
+PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
+FILES = ""
+FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
+            ${sysconfdir} ${sharedstatedir} ${localstatedir} \
+            /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN} \
+            ${datadir}/pixmaps ${datadir}/applications \
+            ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
+            ${libdir}/bonobo/servers"
+SECTION_${PN}-doc = "doc"
+FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \
+            ${datadir}/gnome/help"
+SECTION_${PN}-dev = "devel"
+FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
+                ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
+                /lib/*.a /lib/*.o ${datadir}/aclocal"
+FILES_${PN}-locale = "${datadir}/locale"
+
+# File manifest
+
+export MANIFEST = "${FILESDIR}/manifest"
+
+FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}"
+FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
+FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}"
+
+##################################################################
+# General work and output directories for the build system.
+##################################################################
+
+TMPDIR = "${TOPDIR}/tmp"
+CACHE = "${TMPDIR}/cache"
+DL_DIR = "${TMPDIR}/downloads"
+CVSDIR = "${DL_DIR}/cvs"
+
+STAMP = "${TMPDIR}/stamps/${PF}"
+WORKDIR = "${TMPDIR}/work/${PF}"
+T = "${WORKDIR}/temp"
+D = "${WORKDIR}/image"
+S = "${WORKDIR}/${P}"
+B = "${S}"
+
+STAGING_DIR = "${TMPDIR}/staging"
+STAGING_BINDIR = "${STAGING_DIR}/${BUILD_SYS}/bin"
+STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib"
+STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include"
+STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share"
+STAGING_LOADER_DIR = "${STAGING_DIR}/${HOST_SYS}/loader"
+
+DEPLOY_DIR = "${TMPDIR}/deploy"
+DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar"
+DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk"
+DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm"
+
+##################################################################
+# Kernel info.
+##################################################################
+
+OLDEST_KERNEL = "2.4.0"
+STAGING_KERNEL_DIR = "${STAGING_DIR}/${HOST_SYS}/kernel"
+
+##################################################################
+# Specific image creation and rootfs population info.
+##################################################################
+
+DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images"
+IMAGE_ROOTFS = "${TMPDIR}/rootfs"
+IMAGE_BASENAME = "rootfs"
+IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}"
+IMAGE_CMD = ""
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
+                   --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+                   ${EXTRA_IMAGECMD}"
+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 = "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_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
+IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ."
+EXTRA_IMAGECMD = ""
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
+EXTRA_IMAGECMD_squashfs = "-le -b 16384"
+IMAGE_FSTYPE = "jffs2"
+IMAGE_FSTYPES = "${IMAGE_FSTYPE}"
+IMAGE_ROOTFS_SIZE_ext2 = "65536"
+IMAGE_ROOTFS_SIZE_ext2.gz = "65536"
+
+IMAGE_DEPENDS = ""
+IMAGE_DEPENDS_jffs2 = "mtd-utils-native"
+IMAGE_DEPENDS_cramfs = "cramfs-native"
+IMAGE_DEPENDS_ext2 = "genext2fs-native"
+IMAGE_DEPENDS_ext2.gz = "genext2fs-native"
+IMAGE_DEPENDS_squashfs = "squashfs-tools-native"
+EXTRA_IMAGEDEPENDS = ""
+
+##################################################################
+# Toolchain info.
+##################################################################
+
+CROSS_DIR = "${TMPDIR}/cross"
+CROSS_DATADIR = "${CROSS_DIR}/share"
+export PATH_prepend = "${STAGING_BINDIR}/${HOST_SYS}:${STAGING_BINDIR}:${CROSS_DIR}/bin:"
+
+##################################################################
+# Build utility info.
+##################################################################
+
+CCACHE = "${@bb.which(bb.data.getVar('PATH', d), 'ccache') and 'ccache '}"
+
+export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
+export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}"
+export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}"
+export CPP = "${HOST_PREFIX}gcc -E"
+export LD = "${HOST_PREFIX}ld"
+export CCLD = "${CC}"
+export AR = "${HOST_PREFIX}ar"
+export AS = "${HOST_PREFIX}as"
+export RANLIB = "${HOST_PREFIX}ranlib"
+export STRIP = "${HOST_PREFIX}strip"
+
+export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}"
+export BUILD_CXX = "${CCACHE}${BUILD_PREFIX}g++ ${BUILD_CC_ARCH}"
+export BUILD_F77 = "${CCACHE}${BUILD_PREFIX}g77 ${BUILD_CC_ARCH}"
+export BUILD_CPP = "${BUILD_PREFIX}cpp"
+export BUILD_LD = "${BUILD_PREFIX}ld"
+export BUILD_CCLD = "${BUILD_PREFIX}gcc"
+export BUILD_AR = "${BUILD_PREFIX}ar"
+export BUILD_RANLIB = "${BUILD_PREFIX}ranlib"
+export BUILD_STRIP = "${BUILD_PREFIX}strip"
+
+export MAKE = "make"
+EXTRA_OEMAKE = "-e MAKEFLAGS="
+
+##################################################################
+# Build flags and options.
+##################################################################
+
+export BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
+export CPPFLAGS = "${TARGET_CPPFLAGS}"
+export TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
+
+export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
+export CFLAGS = "${TARGET_CFLAGS}"
+export TARGET_CFLAGS = "${TARGET_CPPFLAGS} ${SELECTED_OPTIMIZATION}"
+
+export BUILD_CXXFLAGS = "${BUILD_CFLAGS} -fpermissive"
+export CXXFLAGS = "${TARGET_CXXFLAGS}"
+export TARGET_CXXFLAGS = "${TARGET_CFLAGS} -fpermissive"
+
+export BUILD_LDFLAGS = "-L${STAGING_DIR}/${BUILD_SYS}/lib \
+                        -Wl,-rpath-link,${STAGING_DIR}/${BUILD_SYS}/lib \
+                        -Wl,-rpath,${STAGING_DIR}/${BUILD_SYS}/lib -Wl,-O1"
+export LDFLAGS = "${TARGET_LDFLAGS}"
+export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
+                         -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib \
+                         -Wl,-O1"
+
+# Which flags to leave by strip-flags() in bin/build/oebuild.sh ?
+ALLOWED_FLAGS = "-O -mcpu -march -pipe"
+
+# Pass parallel make options to the compile task only
+EXTRA_OEMAKE_prepend_task_do_compile = "${PARALLEL_MAKE} "
+
+##################################################################
+# Optimization flags.
+##################################################################
+
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
+DEBUG_OPTIMIZATION = "-O -g"
+SELECTED_OPTIMIZATION = "${@bb.data.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][bb.data.getVar('DEBUG_BUILD', d, 1) == '1'], d, 1)}"
+BUILD_OPTIMIZATION = "-O2"
+
+##################################################################
+# Bootstrap stuff.
+##################################################################
+
+BOOTSTRAP_EXTRA_DEPENDS = ""
+BOOTSTRAP_EXTRA_RDEPENDS = ""
+BOOTSTRAP_EXTRA_RRECOMMENDS = ""
+
+##################################################################
+# Palmtop stuff.
+##################################################################
+
+export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt2"
+export QPEDIR = "${STAGING_DIR}/${HOST_SYS}"
+export OPIEDIR = "${STAGING_DIR}/${HOST_SYS}"
+export palmtopdir = "/opt/QtPalmtop"
+export palmqtdir = "/opt/QtPalmtop"
+
+##################################################################
+# Download locations and utilities.
+##################################################################
+
+GNU_MIRROR = "ftp://ftp.gnu.org/gnu"
+DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool"
+SOURCEFORGE_MIRROR = "http://heanet.dl.sourceforge.net/sourceforge"
+GPE_MIRROR = "http://ftp.handhelds.org/pub/projects/gpe/source"
+XLIBS_MIRROR = "http://xlibs.freedesktop.org/release"
+GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
+HANDHELDS_CVS = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs"
+
+# You can use the mirror of your country to get faster downloads by putting
+#  export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool"
+#  export SOURCEFORGE_MIRROR = "http://belnet.dl.sourceforge.net/sourceforge"
+#     into your local.conf
+
+FETCHCOMMAND = ""
+FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
+FETCHCOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} co ${CVSCOOPTS} ${CVSMODULE}"
+RESUMECOMMAND = ""
+RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
+UPDATECOMMAND = ""
+UPDATECOMMAND_cvs = "/usr/bin/env cvs update -d -P ${CVSCOOPTS}"
+CVSDATE = "${DATE}"
+
+SRC_URI = "file://${FILE}"
+
+##################################################################
+# Miscellaneous utilities.
+##################################################################
+
+MKTEMPDIRCMD = "mktemp -d -q ${TMPBASE}"
+MKTEMPCMD = "mktemp -q ${TMPBASE}"
+
+# Program to be used to patch sources, use 'inherit patcher' to overwrite this:
+
+PATCHCLEANCMD = 'if [ -n "`quilt applied`" ]; then quilt pop -a -R -f || exit 1; fi'
+PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; mkdir -p patches ; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -n $name $patch; chmod u+w patches/$name; quilt push"
+PATCH_DEPENDS = "quilt-native"
+
+# GNU patch tries to be intellgent about checking out read-only files from
+# a RCS, which freaks out those special folks with active Perforce clients
+# the following makes patch ignore RCS:
+
+export PATCH_GET=0
+
+# Program to be used to build ipkg packages
+
+IPKGBUILDCMD = "ipkg-build -o 0 -g 0"
+
+##################################################################
+# Not sure about the rest of this yet.
+##################################################################
+
+# slot - currently unused by OE. portage remnants
+SLOT = "0"
+
+# Other
+
+export PKG_CONFIG_PATH = "${STAGING_DATADIR}/pkgconfig"
+export PKG_CONFIG_DISABLE_UNINSTALLED = "yes"
+
+export QMAKE_MKSPEC_PATH = "${STAGING_DIR}/${BUILD_SYS}/share/qmake"
+export STAGING_SIPDIR = "${STAGING_DIR}/${BUILD_SYS}/share/sip"
+export STAGING_IDLDIR = "${STAGING_DATADIR}/idl"
+
+# default test results for autoconf
+#       possible candidate for moving into autotools.oeclass -CL
+export CONFIG_SITE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'site/%s-%s' % (bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('HOST_OS', d, 1)))}"
+
+# library package naming
+AUTO_LIBNAME_PKGS = "${PACKAGES}"
+
+###
+### Config file processing
+###
+
+# This means that an envionment variable named '<foo>_arm' overrides an
+# environment variable '<foo>' (when ${TARGET_ARCH} is arm). And the same: an
+# environment variable '<foo>_ramses' overrides both '<foo>' and '<foo>_arm
+# 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}"
+
+##################################################################
+# Include the rest of the config files.
+##################################################################
+
+include conf/site.conf
+include conf/auto.conf
+include conf/local.conf
+include conf/build/${BUILD_SYS}.conf
+include conf/target/${TARGET_SYS}.conf
+include conf/machine/${MACHINE}.conf
+include conf/distro/${DISTRO}.conf
+include conf/documentation.conf
diff --git a/openembedded/conf/distro/familiar-0.8.3.conf b/openembedded/conf/distro/familiar-0.8.3.conf
new file mode 100644
index 0000000000..e26468cff3
--- /dev/null
+++ b/openembedded/conf/distro/familiar-0.8.3.conf
@@ -0,0 +1,52 @@
+include conf/distro/familiar.conf
+
+DISTRO = "familiar"
+DISTRO_NAME = "Familiar Linux"
+DISTRO_VERSION = "v0.8.3-unofficial-unsupported-snapshot-${DATE}"
+
+DISTRO_TYPE = "debug"
+#DISTRO_TYPE = "release"
+
+FEED_URIS += " \
+        base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \
+        updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates"
+
+#CVSDATE = 20050331
+
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+
+# The CSL compiler is unusable because
+# 1) certain programs stop to compile
+# 2) more programs segfault
+PREFERRED_VERSION_gcc = "3.4.4"
+PREFERRED_VERSION_gcc-cross = "3.4.4"
+PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
+
+#
+# Opie
+#
+
+PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
+PREFERRED_VERSION_qte = "2.3.10"
+
+#OPIE_VERSION = "1.2.0"
+include conf/distro/preferred-opie-versions.inc
+
+#
+# GPE
+#
+
+PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
+PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
+#PREFERRED_PROVIDER_x11 = "diet-x11"
+
+include conf/distro/preferred-gpe-versions-2.7.inc
+
+#
+# E
+#
+include conf/distro/preferred-e-versions.inc
+
diff --git a/openembedded/conf/distro/familiar.conf b/openembedded/conf/distro/familiar.conf
new file mode 100644
index 0000000000..497ba6a89c
--- /dev/null
+++ b/openembedded/conf/distro/familiar.conf
@@ -0,0 +1,11 @@
+#@TYPE: Distribution
+#@NAME: Familiar Linux
+#@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org)
+
+INHERIT += "package_ipk debian"
+TARGET_OS = "linux"
+
+PARALLEL_INSTALL_MODULES = "1"
+
+UDEV_DEVFS_RULES = "1"
+
diff --git a/openembedded/conf/distro/maemo-1.0.conf b/openembedded/conf/distro/maemo-1.0.conf
new file mode 100644
index 0000000000..15ec45f34e
--- /dev/null
+++ b/openembedded/conf/distro/maemo-1.0.conf
@@ -0,0 +1,40 @@
+include conf/distro/familiar.conf
+
+DISTRO = "maemo"
+DISTRO_NAME = "Maemo Linux"
+DISTRO_VERSION = "v1.0b-${DATE}"
+
+DISTRO_TYPE = "debug"
+#DISTRO_TYPE = "release"
+
+FEED_URIS += " \
+        base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \
+        updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates"
+
+#CVSDATE = 20050331
+
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+#PREFERRED_VERSION_binutils-cross = "2.15.91.0.2"
+#PREFERRED_VERSION_gcc-cross = "3.4.4"
+#PREFERRED_VERSION_gcc-cross-initial = "3.4.4
+#PREFERRED_VERSION_libtool-native = "1.5.6"
+#PREFERRED_VERSION_libtool-cross= "1.5.6"
+
+#
+# GPE
+#
+
+PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
+PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
+PREFERRED_PROVIDER_x11 = "diet-x11"
+
+include conf/distro/preferred-gpe-versions.inc
+
+#
+# Maemo
+#
+
+include conf/distro/maemo-preferred.inc
diff --git a/openembedded/conf/distro/maemo-preferred.inc b/openembedded/conf/distro/maemo-preferred.inc
new file mode 100644
index 0000000000..943f244326
--- /dev/null
+++ b/openembedded/conf/distro/maemo-preferred.inc
@@ -0,0 +1,10 @@
+PREFERRED_PROVIDER_gconf = "gconf-osso"
+PREFERRED_PROVIDER_tslib = "tslib-maemo"
+PREFERRED_VERSION_dbus = "0.23.1-osso5"
+PREFERRED_VERSION_audiofile = "0.2.6-3osso4"
+PREFERRED_PROVIDER_esd = "osso-esd"
+PREFERRED_VERSION_gtk+ = "2.6.4-1.osso7"
+PREFERRED_VERSION_glib-2.0 = "2.6.4"
+PREFERRED_VERSION_pango = "1.8.1"
+PREFERRED_VERSION_atk = "1.9.0"
+PREFERRED_VERSION_diet-x11 ?= "6.2.1"
\ No newline at end of file
diff --git a/openembedded/conf/distro/openzaurus-3.5.4.conf b/openembedded/conf/distro/openzaurus-3.5.4.conf
new file mode 100644
index 0000000000..93074912f2
--- /dev/null
+++ b/openembedded/conf/distro/openzaurus-3.5.4.conf
@@ -0,0 +1,58 @@
+include conf/distro/openzaurus.conf
+DISTRO = "openzaurus"
+DISTRO_NAME = "OpenZaurus"
+DISTRO_VERSION = "3.5.3-snapshot-${DATE}"
+# DISTRO_VERSION = "3.5.4"
+DISTRO_TYPE = "debug"
+# DISTRO_TYPE = "release"
+
+FEED_URIS += " \
+        upgrades##http://openzaurus.org/official/unstable/3.5.3/upgrades/       \
+        machine##http://openzaurus.org/official/unstable/3.5.3/feed/machine/${MACHINE} \
+        base##http://openzaurus.org/official/unstable/3.5.3/feed/base/          \
+        libs##http://openzaurus.org/official/unstable/3.5.3/feed/libs/          \
+        console##http://openzaurus.org/official/unstable/3.5.3/feed/console     \
+        devel##http://openzaurus.org/official/unstable/3.5.3/feed/devel"
+
+# CVSDATE = "20050704"
+
+#
+# Zaurus
+#
+
+ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
+OEINCLUDELOGS = "yes"
+KERNEL_CONSOLE = "ttyS0"
+#DEBUG_OPTIMIZATION = "-O -g3"
+#DEBUG_BUILD = "1"
+#INHIBIT_PACKAGE_STRIP = "1"
+
+#
+# Base
+#
+PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+#
+# Opie
+#
+PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
+
+OPIE_VERSION = "1.2.1"
+include conf/distro/preferred-opie-versions.inc
+
+#
+# GPE
+#
+PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
+#PREFERRED_PROVIDER_x11 = "diet-x11"
+PREFERRED_PROVIDER_x11 = "x11"
+include conf/distro/preferred-gpe-versions-2.7.inc
+
+#
+# E
+#
+include conf/distro/preferred-e-versions.inc
+
diff --git a/openembedded/conf/distro/openzaurus.conf b/openembedded/conf/distro/openzaurus.conf
new file mode 100644
index 0000000000..9208aeda09
--- /dev/null
+++ b/openembedded/conf/distro/openzaurus.conf
@@ -0,0 +1,12 @@
+#@TYPE: Distribution
+#@NAME: OpenZaurus
+#@DESCRIPTION: Distribution configuration for OpenZaurus (http://www.openzaurus.org)
+
+INHERIT += " package_ipk debian"
+# For some reason, this doesn't work
+# TARGET_OS ?= "linux"
+TARGET_OS = "linux"
+TARGET_FPU = "soft"
+
+PARALLEL_INSTALL_MODULES = "1"
+
diff --git a/openembedded/conf/distro/preferred-e-versions.inc b/openembedded/conf/distro/preferred-e-versions.inc
new file mode 100644
index 0000000000..d861944d53
--- /dev/null
+++ b/openembedded/conf/distro/preferred-e-versions.inc
@@ -0,0 +1,13 @@
+#
+# Specify which versions of E-related libraries and applications to build
+#
+
+PREFERRED_VERSION_ecore = "0.9.9.013"
+PREFERRED_VERSION_edb = "1.0.5.004"
+PREFERRED_VERSION_edje = "0.5.0.013"
+PREFERRED_VERSION_eet = "0.9.10.013"
+PREFERRED_VERSION_embryo = "0.9.1.013"
+PREFERRED_VERSION_etox = "0.9.0.004"
+PREFERRED_VERSION_evas = "0.9.9.013"
+PREFERRED_VERSION_ewl = "0.0.4.004"
+PREFERRED_VERSION_imlib2 = "1.2.1.004"
diff --git a/openembedded/conf/distro/preferred-gpe-versions-2.6.inc b/openembedded/conf/distro/preferred-gpe-versions-2.6.inc
new file mode 100644
index 0000000000..98c1a969fa
--- /dev/null
+++ b/openembedded/conf/distro/preferred-gpe-versions-2.6.inc
@@ -0,0 +1,86 @@
+#
+# Specify which versions of GPE (and related) applications to build
+#
+
+#work around some breakages
+CVSDATE_xserver-kdrive=20050207
+CVSDATE_minimo=20050401
+CVSDATE_cairo=20050330
+CVSDATE_xext=20050222
+
+#set some preferred providers:
+PREFERRED_PROVIDER_gconf=gconf-dbus
+
+#specify versions, as the header says :)
+PREFERRED_VERSION_libmatchbox ?= "1.6"
+PREFERRED_VERSION_matchbox ?= "0.9.1"
+PREFERRED_VERSION_matchbox-common ?= "0.9.1"
+PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
+PREFERRED_VERSION_matchbox-wm ?= "0.9.3"
+PREFERRED_VERSION_matchbox-panel ?= "0.9.1"
+PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
+PREFERRED_VERSION_gtk+ ?= "2.6.3"
+PREFERRED_VERSION_libgpewidget ?= "0.97"
+PREFERRED_VERSION_libgpepimc ?= "0.4"
+PREFERRED_VERSION_libgpevtype ?= "0.11"
+PREFERRED_VERSION_libschedule ?= "0.14"
+PREFERRED_VERSION_gpe-icons ?= "0.24"
+PREFERRED_VERSION_libgsm ?= "1.0.10"
+PREFERRED_VERSION_diet-x11 ?= "6.2.1"
+PREFERRED_VERSION_xproto ?= "6.6.2"
+PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
+PREFERRED_VERSION_rxvt-unicode ?= "5.3"
+PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
+PREFERRED_VERSION_xst ?= "0.14"
+#PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" 
+PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
+PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_gpe-login ?= "0.76"
+PREFERRED_VERSION_gpe-session-scripts ?= "0.62"
+PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
+PREFERRED_VERSION_gpe-todo ?= "0.50"
+PREFERRED_VERSION_gpe-calendar ?= "0.61"
+PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8"
+PREFERRED_VERSION_gpe-contacts ?= "0.36"
+PREFERRED_VERSION_gpe-today ?= "0.08"
+PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
+PREFERRED_VERSION_dbus ?= "0.23"
+PREFERRED_VERSION_gpe-bluetooth ?= "0.38"
+PREFERRED_VERSION_gpe-su ?= "0.18"
+PREFERRED_VERSION_gpe-conf ?= "0.1.23"
+PREFERRED_VERSION_gpe-clock ?= "0.20"
+PREFERRED_VERSION_gpe-mininet ?= "0.5"
+PREFERRED_VERSION_gpe-mixer ?= "0.40"
+PREFERRED_VERSION_gpe-shield ?= "0.7"
+PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6"
+PREFERRED_VERSION_gpe-taskmanager ?= "0.17"
+PREFERRED_VERSION_keylaunch ?= "2.0.7"
+PREFERRED_VERSION_minilite ?= "0.47"
+PREFERRED_VERSION_xmonobut ?= "0.4"
+PREFERRED_VERSION_gpe-edit ?= "0.28"
+PREFERRED_VERSION_gpe-gallery ?= "0.95"
+PREFERRED_VERSION_gpe-calculator ?= "0.2"
+PREFERRED_VERSION_gpe-package ?= "0.2"
+PREFERRED_VERSION_gpe-soundbite ?= "1.0.5"
+PREFERRED_VERSION_gpe-terminal ?= "1.1"
+PREFERRED_VERSION_gpe-watch ?= "0.10"
+PREFERRED_VERSION_gpe-what ?= "0.33"
+PREFERRED_VERSION_gpe-filemanager ?= "0.20"
+PREFERRED_VERSION_gpe-go ?= "0.05"
+PREFERRED_VERSION_gpe-irc ?= "0.07"
+PREFERRED_VERSION_gpe-lights ?= "0.13"
+#PREFERRED_VERSION_gpe-nmf ?= "0.19"
+PREFERRED_VERSION_gpe-othello ?= "0.2-1"
+PREFERRED_VERSION_gpe-plucker ?= "0.2"
+PREFERRED_VERSION_gpe-tetris ?= "0.6-2"
+PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
+PREFERRED_VERSION_xdemineur ?= "2.1.1"
+PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
+PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_dillo2 ?= "0.6.6"
+PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
+PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
+PREFERRED_VERSION_linphone ?= "0.12.2"
+PREFERRED_VERSION_firefox ?= "1.0"
+
diff --git a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc
new file mode 100644
index 0000000000..2d64cf2b8b
--- /dev/null
+++ b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc
@@ -0,0 +1,88 @@
+#
+# Specify which versions of GPE (and related) applications to build
+#
+
+#work around some breakages
+#CVSDATE_minimo=20050401
+
+#set some preferred providers:
+PREFERRED_PROVIDER_gconf=gconf-dbus
+
+#specify versions, as the header says :)
+PREFERRED_VERSION_libmatchbox ?= "1.7"
+PREFERRED_VERSION_matchbox ?= "0.9.1"
+PREFERRED_VERSION_matchbox-common ?= "0.9.1"
+PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
+PREFERRED_VERSION_matchbox-wm ?= "0.9.5"
+PREFERRED_VERSION_matchbox-panel ?= "0.9.2"
+PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
+PREFERRED_VERSION_atk ?= "1.9.0"
+PREFERRED_VERSION_cairo ?= "0.5.2"
+PREFERRED_VERSION_glib-2.0 ?= "2.6.4"
+PREFERRED_VERSION_gtk+ ?= "2.6.7"
+PREFERRED_VERSION_pango ?= "1.8.1"
+PREFERRED_VERSION_librsvg ?= "2.6.5"
+PREFERRED_VERSION_libgpewidget ?= "0.103"
+PREFERRED_VERSION_libgpepimc ?= "0.5"
+PREFERRED_VERSION_libgpevtype ?= "0.12"
+PREFERRED_VERSION_libschedule ?= "0.15"
+PREFERRED_VERSION_gpe-icons ?= "0.24"
+PREFERRED_VERSION_libgsm ?= "1.0.10"
+PREFERRED_VERSION_diet-x11 ?= "6.2.1"
+PREFERRED_VERSION_xproto ?= "6.6.2"
+PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
+PREFERRED_VERSION_rxvt-unicode ?= "5.3"
+PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
+PREFERRED_VERSION_xst ?= "0.14"
+#PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" 
+PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
+PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_gpe-login ?= "0.81"
+PREFERRED_VERSION_gpe-session-scripts ?= "0.63"
+PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
+PREFERRED_VERSION_gpe-todo ?= "0.54"
+PREFERRED_VERSION_gpe-calendar ?= "0.63"
+PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8"
+PREFERRED_VERSION_gpe-contacts ?= "0.41"
+PREFERRED_VERSION_gpe-today ?= "0.08"
+PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
+PREFERRED_VERSION_dbus ?= "0.23.4"
+PREFERRED_VERSION_gpe-bluetooth ?= "0.43"
+PREFERRED_VERSION_gpe-su ?= "0.18"
+PREFERRED_VERSION_gpe-conf ?= "0.1.25"
+PREFERRED_VERSION_gpe-clock ?= "0.21"
+PREFERRED_VERSION_gpe-mininet ?= "0.5"
+PREFERRED_VERSION_gpe-mixer ?= "0.42"
+PREFERRED_VERSION_gpe-shield ?= "0.7"
+PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6"
+PREFERRED_VERSION_gpe-taskmanager ?= "0.18"
+PREFERRED_VERSION_keylaunch ?= "2.0.7"
+PREFERRED_VERSION_minilite ?= "0.49"
+PREFERRED_VERSION_xmonobut ?= "0.4"
+PREFERRED_VERSION_gpe-edit ?= "0.29"
+PREFERRED_VERSION_gpe-gallery ?= "0.96"
+PREFERRED_VERSION_gpe-calculator ?= "0.2"
+PREFERRED_VERSION_gpe-package ?= "0.3"
+PREFERRED_VERSION_gpe-soundbite ?= "1.0.6"
+PREFERRED_VERSION_gpe-terminal ?= "1.1"
+PREFERRED_VERSION_gpe-watch ?= "0.10"
+PREFERRED_VERSION_gpe-what ?= "0.33"
+PREFERRED_VERSION_gpe-filemanager ?= "0.23"
+PREFERRED_VERSION_gpe-go ?= "0.05"
+PREFERRED_VERSION_gpe-irc ?= "0.07"
+PREFERRED_VERSION_gpe-lights ?= "0.13"
+#PREFERRED_VERSION_gpe-nmf ?= "0.21"
+PREFERRED_VERSION_gpe-othello ?= "0.2-1"
+PREFERRED_VERSION_gpe-plucker ?= "0.2"
+PREFERRED_VERSION_gpe-tetris ?= "0.6-4"
+PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
+PREFERRED_VERSION_xdemineur ?= "2.1.1"
+PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
+PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_dillo2 ?= "0.6.6"
+PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
+PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
+PREFERRED_VERSION_linphone ?= "0.12.2"
+PREFERRED_VERSION_firefox ?= "1.0"
+PREFERRED_VERSION_gpe_mini_browser ?= "0.15"
diff --git a/openembedded/conf/distro/preferred-gpe-versions.inc b/openembedded/conf/distro/preferred-gpe-versions.inc
new file mode 100644
index 0000000000..b68eb32c2a
--- /dev/null
+++ b/openembedded/conf/distro/preferred-gpe-versions.inc
@@ -0,0 +1,84 @@
+#
+# Specify which versions of GPE (and related) applications to build
+#
+
+#work around some breakages
+#CVSDATE_xext=20050222
+
+#set some preferred providers:
+PREFERRED_PROVIDER_gconf=gconf-dbus
+PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
+
+#specify versions, as the header says :)
+#PREFERRED_VERSION_libmatchbox ?= "1.6"
+#PREFERRED_VERSION_matchbox ?= "0.9.1"
+#PREFERRED_VERSION_matchbox-common ?= "0.9.1"
+#PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
+#PREFERRED_VERSION_matchbox-wm ?= "0.9.3"
+#PREFERRED_VERSION_matchbox-panel ?= "0.9.1"
+#PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
+#PREFERRED_VERSION_gtk+ ?= "2.6.3"
+#PREFERRED_VERSION_libgpewidget ?= "0.97"
+#PREFERRED_VERSION_libgpepimc ?= "0.4"
+#PREFERRED_VERSION_libgpevtype ?= "0.11"
+#PREFERRED_VERSION_libschedule ?= "0.14"
+#PREFERRED_VERSION_gpe-icons ?= "0.24"
+#PREFERRED_VERSION_libgsm ?= "1.0.10"
+PREFERRED_VERSION_diet-x11 ?= "6.2.1"
+PREFERRED_VERSION_xproto ?= "6.6.2"
+#PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
+PREFERRED_VERSION_rxvt-unicode ?= "5.3"
+#PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
+#PREFERRED_VERSION_xst ?= "0.14"
+PREFERRED_VERSION_xextensions ?= "1.0.1"
+PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" 
+PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
+PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
+#PREFERRED_VERSION_gpe-login ?= "0.76"
+#PREFERRED_VERSION_gpe-session-scripts ?= "0.62"
+#PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
+#PREFERRED_VERSION_gpe-todo ?= "0.50"
+#PREFERRED_VERSION_gpe-calendar ?= "0.61"
+#PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8"
+#PREFERRED_VERSION_gpe-contacts ?= "0.36"
+#PREFERRED_VERSION_gpe-today ?= "0.08"
+#PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
+PREFERRED_VERSION_dbus ?= "0.23.4"
+#PREFERRED_VERSION_gpe-bluetooth ?= "0.38"
+#PREFERRED_VERSION_gpe-su ?= "0.18"
+#PREFERRED_VERSION_gpe-conf ?= "0.1.23"
+#PREFERRED_VERSION_gpe-clock ?= "0.20"
+#PREFERRED_VERSION_gpe-mininet ?= "0.5"
+#PREFERRED_VERSION_gpe-mixer ?= "0.40"
+#PREFERRED_VERSION_gpe-shield ?= "0.7"
+#PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6"
+#PREFERRED_VERSION_gpe-taskmanager ?= "0.17"
+#PREFERRED_VERSION_keylaunch ?= "2.0.7"
+#PREFERRED_VERSION_minilite ?= "0.47"
+#PREFERRED_VERSION_xmonobut ?= "0.4"
+#PREFERRED_VERSION_gpe-edit ?= "0.28"
+#PREFERRED_VERSION_gpe-gallery ?= "0.95"
+#PREFERRED_VERSION_gpe-calculator ?= "0.2"
+#PREFERRED_VERSION_gpe-package ?= "0.2"
+#PREFERRED_VERSION_gpe-soundbite ?= "1.0.5"
+#PREFERRED_VERSION_gpe-terminal ?= "1.1"
+#PREFERRED_VERSION_gpe-watch ?= "0.10"
+#PREFERRED_VERSION_gpe-what ?= "0.33"
+#PREFERRED_VERSION_gpe-filemanager ?= "0.20"
+#PREFERRED_VERSION_gpe-go ?= "0.05"
+#PREFERRED_VERSION_gpe-irc ?= "0.07"
+#PREFERRED_VERSION_gpe-lights ?= "0.13"
+#PREFERRED_VERSION_gpe-nmf ?= "0.19"
+#PREFERRED_VERSION_gpe-othello ?= "0.2-1"
+#PREFERRED_VERSION_gpe-plucker ?= "0.2"
+#PREFERRED_VERSION_gpe-tetris ?= "0.6-2"
+#PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
+#PREFERRED_VERSION_xdemineur ?= "2.1.1"
+#PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
+PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}"
+#PREFERRED_VERSION_dillo2 ?= "0.6.6"
+PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
+#PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
+#PREFERRED_VERSION_linphone ?= "0.12.2"
+#PREFERRED_VERSION_firefox ?= "1.0"
+
diff --git a/openembedded/conf/distro/preferred-opie-versions.inc b/openembedded/conf/distro/preferred-opie-versions.inc
new file mode 100644
index 0000000000..ff608f28f2
--- /dev/null
+++ b/openembedded/conf/distro/preferred-opie-versions.inc
@@ -0,0 +1,192 @@
+#
+# A list of applications.
+#
+
+
+PREFERRED_VERSION_libopie2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_libopieobex0 = "${OPIE_VERSION}"
+PREFERRED_VERSION_libopietooth1 = "${OPIE_VERSION}"
+PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}"
+PREFERRED_VERSION_libqtaux2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_libmailwrapper = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-aboutapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-addressbook = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-advancedfm = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-alarm = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-appearance = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-aqpkg = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-autorotateapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-backgammon = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-backup = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bartender = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-batteryapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bluepin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bluetoothapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bluetoothmanager = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bounce = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-brightnessapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-button-settings = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-buzzword = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-calculator = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-calibrate = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-camera = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-cardmon = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-checkbook = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-citytime = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-clipboardapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-clockapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-clock = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-confeditor = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-console = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-dagger = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-dasher = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-datebook = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-datebook-chrisholidayplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-datebook-nationalholidayplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-datebook-birthdayplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-deco-flat = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-deco-liquid = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-deco-polished = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-doctab = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-drawpad = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-dvorak = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-embeddedkonsole = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-euroconv = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-examples-python = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-eye = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-fifteen = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-formatter = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-freetype = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-ftplib = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-ftp = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-go = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-gutenbrowser = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-handwriting = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-helpbrowser = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-help-en = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-homeapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-lrelease-native = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-lupdate-native = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-irc = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-irdaapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-jumpx = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-kbill = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-kcheckers = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-keyboard = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-keypebble = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-keytabs = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-keyview = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-kjumpx = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-kpacman = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-language = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-launcher-settings = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-libqrsync = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-light-and-power = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-login = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-logoutapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mailapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mail = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-libmadplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-libmodplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-libtremorplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-libwavplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2-skin-default = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2-skin-default-landscape = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2-skin-pod = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2-skin-techno = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediummount = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-memoryapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mindbreaker = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-minesweep = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mobilemsg = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-multikeyapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-multikey = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-networkapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-networksettings = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-notesapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-odict = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-osearch = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-oxygen = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pcmciaapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-performance = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pickboard = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pics = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pimconverter = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-powerchord = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pyquicklaunchapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-qasteroids = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-qcop = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-quicklauncher = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-qss = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-rdesktop = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-reader = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-recorder = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-remote = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-restartapplet2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-rotateapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-screenshotapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-search = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-security = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-securityplugin-blueping = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-securityplugin-dummy = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-securityplugin-notice = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-securityplugin-pin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sfcave = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sheet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sh = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-showimg = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-snake = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-solitaire = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sshkeys = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-flat = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-fresh = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-liquid = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-metal = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-phase = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-web = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sounds = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-suspendapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-symlinker = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sysinfo = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-systemtime = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tableviewer = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tabmanager = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-taskbar = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tictac = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tinykate = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-addressbookplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-datebookplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-fortuneplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-mailplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-stocktickerplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-todolistplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-weatherplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-todo = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tonleiter = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-unikeyboard = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-usermanager = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-vmemo = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-vmemo-settings = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-volumeapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-vtapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-wellenreiter = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-wirelessapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-wordgame = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-write = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-zkbapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
+PREFERRED_VERSION_konqueror-embedded = "20030705"
diff --git a/openembedded/conf/documentation.conf b/openembedded/conf/documentation.conf
new file mode 100644
index 0000000000..19aaf2dd48
--- /dev/null
+++ b/openembedded/conf/documentation.conf
@@ -0,0 +1,75 @@
+# this file holds documentation for known keys, possible values and their meaning
+# feel free to send updates and corrections to oe@handhelds.org
+
+# conf/bitbake.conf
+PREFERRED_VERSION[doc] = "Normally use it as PREFERRED_VERSION_package-name = \"\" to set the preferred \
+version of more than one version for the package-name is available."
+
+BUILD_ARCH[doc] = "The name of the building architecture. For example i686"
+BUILD_OS[doc] = "The operating system (in lower case) of the building architecture. For example \
+linux"
+BUILD_VENDOR[doc] = "FIXME"
+BUILD_SYS[doc] = "FIXME"
+BUILD_PREFIX[doc] = "FIXME"
+BUILD_CC_ARCH[doc] = "FIXME"
+
+HOST_ARCH[doc] = "The name of the target architecture. Normally same as the TARGET_ARCH @see TARGET_ARCH @group base"
+HOST_OS[doc] = "The name of the target operating system. Normally the same as the TARGET_OS \
+@see TARGET_OS @group base"
+HOST_VENDOR[doc] = "The name of the vendor. Normally same as the TARGET_VENDOR @see TARGET_VENDOR"
+HOST_SYS[doc] = "FIXME"
+HOST_PREFIX[doc] = "Normally same as the TARGET_PREFIX @see TARGET_PREFIX @group base"
+HOST_CC_ARCH[doc] = "Normally same as the TARGET_CC_ARCH @see TARGET_CC_ARCH @group base"
+
+TARGET_ARCH[doc] = "Build for which architecture. Examples are arm, i686, sh3, mips, powerpc"
+TARGET_OS[doc]   = "Build for which Operating System. Currently possible values are \
+linux and linux-uclibc. When using linux-uclibc you might want to set USE_NLS_gcc-cross to \"no\"."
+TARGET_VENDOR[doc] = "FIXME"
+TARGET_SYS[doc] = "The target system is composed out of TARGET_ARCH,TARGET_VENDOR and TARGET_OS"
+TARGET_PREFIX[doc] = "The prefix for the cross compile toolchain. For example arm-linux-"
+TARGET_CC_ARCH[doc] = "FIXME"
+TARGET_FPU[doc] = "Floating point option (mostly for FPU-less systems), can be 'soft' or empty" 
+
+PACKAGE_ARCH[doc] = "The architecture needed for using a resulting package. If you have \
+machine dependant configuration options in your bitbake file add a \
+PACKAGE_ARCH  = \"${MACHINE_ARCH}\" to the file"
+
+
+DATE[doc] = "The date the build was started Ymd"
+TIME[doc] = "The time the build was started HMS"
+DATETIME[doc] = "The date and time the build was started at"
+
+PN[doc] = "PN holds the name of the package (Package Name). It is gathered from the bitbake-file filename"
+PV[doc] = "PV holds the version of the package (Package Version). The default value is 1.0, it is \
+retrieved from the bitbake-file filename."
+PR[doc] = "PR is the revision of the package (Package Revision). By default it is set to r0"
+PF[doc] = "Package name - Package version - Package revision (PN-PV-PR)"
+P[doc]  = "Package name - Package version (PN-PF)"
+S[doc] = "Directory that holds the sources to build, WORKDIR/PN-PV by default. The 'make' or equivalent command is run from here"
+SECTION[doc]  = "Section of the packages e.g. console/networking"
+PRIORITY[doc] = "Importance of package, default values are 'optional' or 'needed'"
+DESCRIPTION[doc] = "A small description of the package"
+LICENSE[doc] = "The license of the resulting package e.g. GPL"
+AUTHOR[doc] = "The author of the stuff contained in the package"
+MAINTAINER[doc] = "Maintainer of the .bb and the resulting package"
+HOMEPAGE[doc] = "Homepage of the package e.g. http://www.project.net"
+
+
+DEPENDS[doc]  = "Build time dependencies, things needed to build the package"
+RDEPENDS[doc] = "Run time dependencies, things needed for a given package to run"
+PROVIDES[doc] = "Names for additional dependencies that this package will provide"
+
+
+PACKAGES[doc] = "Names of packages to be generated"
+FILES[doc]    = "Files/Directories belonging to the package"
+
+
+
+TMPDIR[doc] = "The temporary directory of openembedded holding work-, deploy, staging- and some more dirs"
+CACHE[doc]  = "The directory holding the parsing cache."
+DL_DIR[doc] = "The directory where tarballs will be downloaded."
+CVSDIR[doc] = "The directory where cvs checkouts will be stored in."
+
+STAMP[doc]   = "The directory that holds files to keep track of what was built"
+WORKDIR[doc] = "The directory where a concrete package will be unpacked and built"
+T[doc]       = "Temporary directory within the WORKDIR"
diff --git a/openembedded/conf/licenses.conf b/openembedded/conf/licenses.conf
new file mode 100644
index 0000000000..e81434da8c
--- /dev/null
+++ b/openembedded/conf/licenses.conf
@@ -0,0 +1,5 @@
+SRC_DISTRIBUTE_LICENSES += "GPL GPLv2 BSD LGPL Apache-2.0 QPL AFL"
+SRC_DISTRIBUTE_LICENSES += "MIT Sleepycat Classpath Perl PSF PD Artistic"
+SRC_DISTRIBUTE_LICENSES += "bzip2 zlib ntp cron libpng netperf openssl"
+SRC_DISTRIBUTE_LICENSES += "Info-ZIP tcp-wrappers"
+
diff --git a/openembedded/conf/local.conf.sample b/openembedded/conf/local.conf.sample
new file mode 100644
index 0000000000..7a7afb4277
--- /dev/null
+++ b/openembedded/conf/local.conf.sample
@@ -0,0 +1,122 @@
+#
+# OpenEmbedded local configuration file (sample)
+#
+# Please visit the Wiki at http://openembedded.org/ for more info.
+#
+#
+# Be SURE to read this file in its entirety and the GettingStarted page on the
+# wiki before proceeding.
+#
+# Once you have done that, remove the line at the end of this
+# file and build away.
+# 
+# WARNING: lines starting with a space (' ') will result in parse failures.
+# Remove '# ' from commented lines to activate them.
+#
+# NOTE: Do NOT use $HOME in your paths, BitBake does NOT expand ~ for you.  If you
+# must have paths relative to your homedir use ${HOME} (note the {}'s there
+# you MUST have them for the variable expansion to be done by BitBake).  Your
+# paths should all be absolute paths (They should all start with a / after
+# expansion.  Stuff like starting with ${HOME} or ${TOPDIR} is ok).
+
+# Use this to specify where BitBake should place the downloaded sources into
+DL_DIR = "${HOME}/sources"
+
+# Delete the line below. Then specify which .bb files to consider for
+# your build. Typically this will be something like BBFILES = "/path/to/openembedded/packages/*/*.bb"
+BBFILES := "${@bb.fatal('Edit your conf/local.conf: BBFILES')}"
+
+# Use the BBMASK below to instruct BitBake to _NOT_ consider some .bb files
+# This is a regulary expression, so be sure to get your parenthesis balanced.
+BBMASK = ""
+
+# Uncomment this if you want to use a prebuilt toolchain. You will need to
+# provide packages for toolchain and additional libraries yourself. You also
+# have to set PATH in your environment to make sure BitBake finds additional binaries.
+# Note: You will definitely need to say:
+#     ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
+# to build any of two Linux 2.4 Embedix kernels,
+# i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18 - and don't forget
+# to rename the binaries as instructed in the Wiki.
+# ASSUME_PROVIDED = "virtual/${TARGET_PREFIX}gcc virtual/libc"
+
+# Select between multiple alternative providers, if more than one is eligible.
+PREFERRED_PROVIDERS = "virtual/qte:qte virtual/libqpe:libqpe-opie"
+PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-qpe"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+# Uncomment this to specify where BitBake should create its temporary files.
+# Note that a full build of everything in OpenEmbedded will take GigaBytes of hard
+# disk space, so make sure to free enough space. The default TMPDIR is
+# <build directory>/tmp
+# Don't use symlinks in in the path to avoid problems
+# TMPDIR = /usr/local/projects/oetmp
+
+# Uncomment this to specify a machine to build for. See the conf directory
+# for machines currently known to OpenEmbedded.
+# MACHINE = "collie"
+
+# Use this to specify the target architecture. Note that this is only
+# needed when building for a machine not known to OpenEmbedded. Better use
+# the MACHINE attribute (see above)
+# TARGET_ARCH = "arm"
+
+# Use this to specify the target operating system.  The default is "linux",
+# for a normal linux system with glibc. Set this to "linux-uclibc" if you want
+# to build a uclibc based system.
+# TARGET_OS = "linux"
+# TARGET_OS = "linux-uclibc"
+
+# Uncomment this to select a distribution policy. See the conf directory
+# for distributions currently known to OpenEmbedded.
+# DISTRO = "familiar"
+
+# Uncomment this to select a particular kernel version if supported by 
+# your MACHINE setting. Currently only supported on Zaurus Clamshells.
+# KERNEL_VERSION = "2.6"
+
+# Uncomment one of these to build packages during the build process.
+# This is done automatically if you set DISTRO (see above)
+# INHERIT = "package_ipk"
+# INHERIT = "package_tar"
+
+# Add the required image file system types below. Valid are jffs2, tar, cramfs
+IMAGE_FSTYPES = "jffs2 tar"
+
+# Uncomment this to disable the parse cache (not recommended).
+# CACHE = ""
+
+# Uncomment this if you want BitBake to emit debugging output
+# BBDEBUG = "yes"
+
+# Uncomment these two if you want BitBake to build images useful for debugging.
+# DEBUG_BUILD = "1"
+# INHIBIT_PACKAGE_STRIP = "1"
+
+# Uncomment these to build a package such that you can use gprof to profile it.
+# NOTE: This will only work with 'linux' targets, not
+# 'linux-uclibc', as uClibc doesn't provide the necessary
+# object files.  Also, don't build glibc itself with these
+# flags, or it'll fail to build.
+#
+# PROFILE_OPTIMIZATION = "-pg"
+# SELECTED_OPTIMIZATION = "${PROFILE_OPTIMIZATION}"
+# LDFLAGS =+ "-pg"
+
+# Uncomment this to enable parallel make.
+# This allows make to spawn mutliple processes to take advantage of multiple 
+# processors. Useful on SMP machines. This may break some packages - we're
+# in the process of marking these so let us know if you find any.
+# PARALLEL_MAKE = "-j 4"
+
+# Uncomment this if you want BitBake to emit the log if a build fails.
+BBINCLUDELOGS = "yes"
+
+# Specifies a location to search for pre-generated tarballs when fetching
+# a cvs:// URI. Outcomment this, if you always want to pull directly from CVS.
+CVS_TARBALL_STASH = "http://www.oesources.org/source/current/"
+
+# EDIT THIS FILE and then remove the line below before using!
+REMOVE_THIS_LINE:="${@oe.fatal('Read the comments in your conf/local.conf')}"
diff --git a/openembedded/conf/machine/c7x0.conf b/openembedded/conf/machine/c7x0.conf
new file mode 100644
index 0000000000..c5e42a2bed
--- /dev/null
+++ b/openembedded/conf/machine/c7x0.conf
@@ -0,0 +1,12 @@
+#@TYPE: Machine
+#@NAME: Sharp Zaurus SL-C7x0
+#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices
+
+KERNEL_VERSION ?= "2.6"
+
+include conf/machine/zaurus-clamshell.conf
+include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
+
+ROOT_FLASH_SIZE = "32"
+# yes, the husky has 64MB, I know... Be happy, that way you can install more software :)
+
diff --git a/openembedded/conf/machine/handheld-common.conf b/openembedded/conf/machine/handheld-common.conf
new file mode 100644
index 0000000000..2445ee17a6
--- /dev/null
+++ b/openembedded/conf/machine/handheld-common.conf
@@ -0,0 +1,24 @@
+HANDHELD_MODULES = "ipv6 \
+ipsec \
+nvrd \
+mip6-mn \
+tun \
+ide-cs ide-disk ide-probe-mod \
+loop \
+vfat ext2 \
+sunrpc nfs \
+btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart \
+pcnet-cs serial-cs airo-cs \
+af_packet \
+ppp-async ppp-deflate ppp-mppe \
+ip-gre ip-tables ipip \
+irda irlan irnet irport irtty ircomm-tty \
+input uinput \
+"
+
+# Configuration bits for "generic handheld"
+BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin scap network-suspend-scripts"
+BOOTSTRAP_EXTRA_RDEPENDS +=  "pcmcia-cs apm apmd network-suspend-scripts"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin scap ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
+
+INHERIT += "linux_modules"
diff --git a/openembedded/conf/machine/ipaq-common.conf b/openembedded/conf/machine/ipaq-common.conf
new file mode 100644
index 0000000000..791abd2103
--- /dev/null
+++ b/openembedded/conf/machine/ipaq-common.conf
@@ -0,0 +1,9 @@
+IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd atmelwlandriver sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev" 
+
+BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules atmelwlandriver"
+BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 += "mipv6"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RRECOMMENDS_append_kernel24 += "mipv6"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
diff --git a/openembedded/conf/machine/ipaq-pxa270.conf b/openembedded/conf/machine/ipaq-pxa270.conf
new file mode 100644
index 0000000000..9e1b677ecf
--- /dev/null
+++ b/openembedded/conf/machine/ipaq-pxa270.conf
@@ -0,0 +1,33 @@
+#@TYPE: Machine
+#@NAME: iPAQ hx47xx hx2xxx
+#@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU  devices
+
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm armv4 armv5te ipaqpxa hx4700"
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
+
+PREFERRED_VERSION_orinoco-modules = "0.15rc1"
+
+BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params"
+BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev modutils-collateral module-init-tools"
+
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RDEPENDS_append = " udev modutils-collateral module-init-tools"
+
+PXA270_MODULES = "g_ether pxa27x_udc"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+include conf/machine/ipaq-common.conf
+include conf/machine/handheld-common.conf
+
+GUI_MACHINE_CLASS = "bigscreen"
+GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-filemanager gpe-nmf evince"
+GPE_EXTRA_INSTALL += "gaim sylpheed gpe-filemanager gpe-nmf evince"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+include conf/machine/tune-xscale.conf
+
+BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
+HX4700_MODULES = "asic3_base asic3_mmc hx4700_bt hx4700_core hx4700_leds hx4700_navpt hx4700_pcmcia \
+                  hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700"
diff --git a/openembedded/conf/machine/jornada7xx.conf b/openembedded/conf/machine/jornada7xx.conf
new file mode 100644
index 0000000000..b3e1840469
--- /dev/null
+++ b/openembedded/conf/machine/jornada7xx.conf
@@ -0,0 +1,8 @@
+#@TYPE: Machine
+#@NAME: HP Jornada 7xx 
+#@DESCRIPTION: Machine configuration for the SA1100 based HP Jornada 7xx palmtop computer
+
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm ${MACHINE}"
+
+include conf/machine/tune-strongarm.conf
\ No newline at end of file
diff --git a/openembedded/conf/machine/nokia770.conf b/openembedded/conf/machine/nokia770.conf
new file mode 100644
index 0000000000..253f8a43e2
--- /dev/null
+++ b/openembedded/conf/machine/nokia770.conf
@@ -0,0 +1,58 @@
+#@TYPE: Machine
+#@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"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap"
+PREFERRED_PROVIDER_virtual/bootloader = ""
+
+XSERVER = "xserver-kdrive-omap"
+
+# 800x480 is big enough for me
+GUI_MACHINE_CLASS = "bigscreen"
+GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser tscalib"
+GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser tscalib"
+
+# Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
+#include conf/machine/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"
+
+# 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-omap1"
+
+BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel sysfsutils  nokia770-init \
+pcmcia-cs apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin"
+
+BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils  nokia770-init \
+pcmcia-cs apm  ppp wireless-tools console-tools"
+
+# NFS Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
+# Crypto Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
+# SMB and CRAMFS
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
+# Serial Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 "
+# Bluetooth Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
+#                             kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco"
+# PPP Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ppp-generic kernel-module-ppp-async"
+
+#USB Gadget Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage kernel-module-g-serial \
+#                                                        kernel-module-g-ether"
+
+include conf/machine/handheld-common.conf
+
diff --git a/openembedded/conf/machine/spitz.conf b/openembedded/conf/machine/spitz.conf
new file mode 100644
index 0000000000..6e6ea7f605
--- /dev/null
+++ b/openembedded/conf/machine/spitz.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: Sharp Zaurus SL-C3000
+#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
+
+KERNEL_VERSION ?= "2.4"
+
+include conf/machine/zaurus-clamshell.conf
+include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
+
+PIVOTBOOT_EXTRA_DEPENDS  += "pivotinit pcmcia-cs"
+PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs"
+PIVOTBOOT_EXTRA_RRECOMMENDS += ""
+
+# Useful things for the built-in Harddisk
+BOOTSTRAP_EXTRA_DEPENDS  += "hdparm e2fsprogs"
+BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs"
+
+IMAGE_FSTYPES = "jffs2 tar"
+
+ROOT_FLASH_SIZE = "100"
diff --git a/openembedded/conf/machine/tune-arm920t.conf b/openembedded/conf/machine/tune-arm920t.conf
new file mode 100644
index 0000000000..936b137517
--- /dev/null
+++ b/openembedded/conf/machine/tune-arm920t.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t"
+
diff --git a/openembedded/conf/machine/tune-arm926ejs.conf b/openembedded/conf/machine/tune-arm926ejs.conf
new file mode 100644
index 0000000000..563586c902
--- /dev/null
+++ b/openembedded/conf/machine/tune-arm926ejs.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s"
+PACKAGE_ARCH = "armv5te"
diff --git a/openembedded/conf/machine/tune-arm9tdmi.conf b/openembedded/conf/machine/tune-arm9tdmi.conf
new file mode 100644
index 0000000000..cfc3bad1c1
--- /dev/null
+++ b/openembedded/conf/machine/tune-arm9tdmi.conf
@@ -0,0 +1 @@
+TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi"
diff --git a/openembedded/conf/machine/tune-strongarm.conf b/openembedded/conf/machine/tune-strongarm.conf
new file mode 100644
index 0000000000..8654c996ef
--- /dev/null
+++ b/openembedded/conf/machine/tune-strongarm.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-march=armv4 -mtune=xscale"
+
diff --git a/openembedded/conf/machine/tune-xscale.conf b/openembedded/conf/machine/tune-xscale.conf
new file mode 100644
index 0000000000..0b98f09fc8
--- /dev/null
+++ b/openembedded/conf/machine/tune-xscale.conf
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
+PACKAGE_ARCH = "armv5te"
+
diff --git a/openembedded/conf/machine/zaurus-clamshell-2.4.conf b/openembedded/conf/machine/zaurus-clamshell-2.4.conf
new file mode 100644
index 0000000000..d61dc197b2
--- /dev/null
+++ b/openembedded/conf/machine/zaurus-clamshell-2.4.conf
@@ -0,0 +1,48 @@
+# Zaurus Clamshell specific configuration for kernel 2.4
+# Don't forget to include zaurus-clamshell.conf as well
+
+PREFERRED_PROVIDERS_append_c7x0   = " virtual/kernel:c7x0-kernels-2.4-embedix"
+PREFERRED_PROVIDERS_append_akita  = " virtual/kernel:openzaurus-pxa27x"
+PREFERRED_PROVIDERS_append_spitz  = " virtual/kernel:openzaurus-pxa27x"
+PREFERRED_PROVIDERS_append_borzoi = " virtual/kernel:openzaurus-pxa27x"
+
+# Later versions are broken on kernel 2.4
+PREFERRED_VERSION_orinoco-modules = "0.13e"
+
+BOOTSTRAP_EXTRA_DEPENDS  += "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \
+pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \
+wpa-supplicant-nossl ppp ppp-dialin openswan"
+
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \
+pcmcia-cs apmd apm wireless-tools console-tools irda-utils hostap-utils prism3-firmware prism3-support \
+wpa-supplicant-nossl ppp ppp-dialin openswan"
+
+# Misc Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-net-fd kernel-module-registers"
+
+# USB Client Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-usbdcore kernel-module-usbdmonitor"
+
+# Bluetooth Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluez kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
+                             kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
+                             kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs \
+                             kernel-module-firmware-class kernel-module-bt3c-cs"
+
+# BI Module
+BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0   = " kernel-module-pxa-bi"
+BOOTSTRAP_EXTRA_RDEPENDS_append_spitz  = " kernel-module-pxa27x-bi"
+BOOTSTRAP_EXTRA_RDEPENDS_append_akita  = " kernel-module-pxa27x-bi"
+BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi = " kernel-module-pxa27x-bi"
+
+# USB Host Modules
+BOOTSTRAP_EXTRA_RDEPENDS_append_spitz  = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
+                                           kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \
+                                           kernel-module-usb-ohci-pxa27x kernel-module-bfusb"
+BOOTSTRAP_EXTRA_RDEPENDS_append_akita  = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
+                                           kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \
+                                           kernel-module-usb-ohci-pxa27x kernel-module-bfusb"
+BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
+                                           kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \
+                                           kernel-module-usb-ohci-pxa27x kernel-module-bfusb"
+
diff --git a/openembedded/conf/machine/zaurus-clamshell-2.6.conf b/openembedded/conf/machine/zaurus-clamshell-2.6.conf
new file mode 100644
index 0000000000..b3e0a50bc6
--- /dev/null
+++ b/openembedded/conf/machine/zaurus-clamshell-2.6.conf
@@ -0,0 +1,36 @@
+# Zaurus Clamshell specific configuration for kernel 2.6
+# Don't forget to include zaurus-clamshell.conf as well
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+PREFERRED_VERSION_orinoco-modules = "0.15rc1"
+
+BOOTSTRAP_EXTRA_DEPENDS  += "virtual/kernel udev sysfsutils hostap-modules orinoco-modules \
+pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \
+ppp ppp-dialin openswan wpa-supplicant-nossl"
+
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs \
+pcmcia-cs apm  wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
+ppp ppp-dialin openswan wpa-supplicant-nossl"
+
+# Ethernet modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
+# NFS Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
+# Crypto Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
+# SMB and CRAMFS
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
+# Serial Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs"
+# Bluetooth Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
+                             kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
+                             kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
+# Infrared Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm
+#                             kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
+
+# USB Gadget Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
+#                             kernel-module-g-serial kernel-module-g-ether"
+
diff --git a/openembedded/conf/machine/zaurus-clamshell.conf b/openembedded/conf/machine/zaurus-clamshell.conf
new file mode 100644
index 0000000000..f55f2d2554
--- /dev/null
+++ b/openembedded/conf/machine/zaurus-clamshell.conf
@@ -0,0 +1,25 @@
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm armv4 armv5te c7x0"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n"
+EXTRA_IMAGEDEPENDS = "sharp-flash-header-c700"
+
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
+                   --output=${T}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}; \
+                   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
+                   ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
+
+BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater"
+
+GUI_MACHINE_CLASS = "bigscreen"
+GPE_EXTRA_DEPENDS += "gaim sylpheed chkhinge"
+GPE_EXTRA_INSTALL += "gaim sylpheed chkhinge"
+
+include conf/machine/handheld-common.conf
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+include conf/machine/tune-xscale.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"