Rename /openembedded/ -> /meta/

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

46 files changed, 0 insertions, 2094 deletions

diff --git a/openembedded/conf/bitbake.conf b/openembedded/conf/bitbake.conf
deleted file mode 100644
index 529405a3eb..0000000000
--- a/openembedded/conf/bitbake.conf
+++ /dev/null
@@ -1,414 +0,0 @@
-##################################################################
-# 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))]}"
-IPKG_ARCHS = "all any noarch ${TARGET_ARCH} ${IPKG_EXTRA_ARCHS} ${MACHINE}"
-
-##################################################################
-# Date/time variables.
-##################################################################
-
-DATE := "${@time.strftime('%Y%m%d',time.gmtime())}"
-TIME := "${@time.strftime('%H%M%S',time.gmtime())}"
-DATETIME = "${DATE}${TIME}"
-
-##################################################################
-# Openembedded Software Prerequisites.
-##################################################################
-
-# python-native should be here but python relies on building 
-# its own in staging
-ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-native python-native-runtime perl-native-runtime texinfo-native"
-
-##################################################################
-# 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"
-GITDIR = "${DL_DIR}/git"
-
-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 ."
-IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.gz ."
-IMAGE_CMD_tar.bz2 = "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 = "-isystem${STAGING_DIR}/${BUILD_SYS}/include"
-export CPPFLAGS = "${TARGET_CPPFLAGS}"
-export TARGET_CPPFLAGS = "-isystem${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_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://handhelds.org/pub/projects/gpe/source"
-XLIBS_MIRROR = "http://xlibs.freedesktop.org/release"
-XORG_MIRROR = "http://xorg.freedesktop.org/releases"
-GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
-FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/"
-HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs"
-E_CVS = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e" 
-E_URI = "http://enlightenment.freedesktop.org/files"
-FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs"
-GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles"
-APACHE_MIRROR = "http://www.apache.org/dist"
-
-# 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 = "ERROR, this must be a BitBake bug"
-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 = "ERROR, this must be a BitBake bug"
-RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
-UPDATECOMMAND = "ERROR, this must be a BitBake bug"
-UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}"
-SRCDATE = "${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}"
-# 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:pn-${PN}"
-
-##################################################################
-# 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
-require conf/sanity.conf
-
-##################################################################
-# Weak variables (usually to retain backwards compatibility)
-##################################################################
-
-PCMCIA_MANAGER ?= "pcmcia-cs"
-
-
-##################################################################
-# Magic Cookie for SANITY CHECK
-##################################################################
-OES_BITBAKE_CONF = "1"
diff --git a/openembedded/conf/distro/angstrom-2006.9.conf b/openembedded/conf/distro/angstrom-2006.9.conf
deleted file mode 100644
index 5c1ed1296d..0000000000
--- a/openembedded/conf/distro/angstrom-2006.9.conf
+++ /dev/null
@@ -1,126 +0,0 @@
-#@--------------------------------------------------------------------
-#@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}"
-
-include conf/distro/angstrom.conf
-
-DISTRO_TYPE = "debug"
-#DISTRO_TYPE = "release"
-#!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!!
-
-
-FEED_URIS += " \
-		 base##${ANGSTROM_URI}/unstable/feed/base/"
-#        base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \
-#        ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \
-#        updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
-
-SRCDATE = "20060518"
-#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
-PALMTOP_USE_MULTITHREADED_QT = "yes"
-QTE_VERSION = "2.3.10"
-OPIE_VERSION = "1.2.2"
-include conf/distro/preferred-opie-versions.inc
-
-# GPE
-include conf/distro/preferred-gpe-versions-2.8.inc
-
-#zap extra stuff taking place in $MACHINE.conf 
-GPE_EXTRA_INSTALL = ""
-
-# E
-include conf/distro/preferred-e-versions.inc
-
-PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
-PREFERRED_PROVIDER_libx11 = "diet-x11"
-
-
-#Make sure we use 2.6 on machines with a 2.4/2.6 selector
-KERNEL = "kernel26"
-ZKERNEL_VERSION = "2.6"
-
-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_PROVIDER_virtual/libiconv = "glibc"
-PREFERRED_PROVIDER_virtual/libintl = "glibc"
-
-#EABI stuff
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
-
-
-#use EABI toolchain
-PREFERRED_VERSION_gcc ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross ?= "4.1.1"
-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"
-PREFERRED_VERSION_glibc ?= "2.4"
-PREFERRED_VERSION_glibc-intermediate ?= "2.4"
-
-# To use an EABI compatible version 3 series gcc, either uncomment 
-# the lines below or set them in local.conf: 
-#
-# PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3"
-# PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3"
-
-
-PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
-PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e"
-PREFERRED_VERSION_dbus ?= "0.61"
-PREFERRED_VERSION_gstreamer ?= "0.10.6"
-
-PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
-PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules"
-PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules"
-PREFERRED_VERSION_hostap-modules ?= "0.4.7"
-
-#Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff
-# c7x0, akita, spitz, nokia770, h2200, h6300, ipaq-pxa270, simpad
-
-#### Bootstrap options ####
-
-PCMCIA_MANAGER_c7x0 = "pcmciautils"
-PCMCIA_MANAGER_akita = "pcmciautils"
-PCMCIA_MANAGER_spitz = "pcmciautils"
-PCMCIA_MANAGER_nokia770 = "pcmciautils"
-PCMCIA_MANAGER_h2200 = "pcmciautils"
-PCMCIA_MANAGER_h6300 = "pcmciautils"
-PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils"
-
-
-
-#### GPE section ###
-
-#Install libgtkinput in devices without a keyboard
-GPE_EXTRA_INSTALL_append_ipaq-pxa270 = " libgtkinput"
-GPE_EXTRA_INSTALL_append_h2200 = " libgtkinput"
-GPE_EXTRA_INSTALL_append_h6300 = " libgtkinput"
-GPE_EXTRA_INSTALL_append_simpad =  " libgtkinput" 
-GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput"
-
-#As soon as a kill switch is in place we can add it to devices with a keyboard
-#GPE_EXTRA_INSTALL_append_c7x0 = " libgtkinput"
-#GPE_EXTRA_INSTALL_append_tosa = " libgtkinput"
-#GPE_EXTRA_INSTALL_append_akita = " libgtkinput"
-#GPE_EXTRA_INSTALL_append_spitz = " libgtkinput"
-
-
diff --git a/openembedded/conf/distro/angstrom.conf b/openembedded/conf/distro/angstrom.conf
deleted file mode 100644
index 100017410d..0000000000
--- a/openembedded/conf/distro/angstrom.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-#@TYPE: Distribution
-#@NAME: Angstrom 
-#@DESCRIPTION: Distribution configuration for Angstrom
-
-DISTRO = "angstrom"
-DISTRO_NAME = "Angstrom"
-
-#Use this variable in feeds and other parts that need a URI
-ANGSTROM_URI = "http://www.angstrom-distribution.org/"
-
-#Set the default maintainer to angstrom-dev
-MAINTAINER = "Angstrom Developers <angstrom-dev@handhelds.org>"
-
-#use ipkg package format with debian style naming
-#use multimachine buildrules 
-INHERIT += "package_ipk debian multimachine"
-
-#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
-PREFERRED_PROVIDER_qemu-native = "qemu-qop-nogfx-native"
-ENABLE_BINARY_LOCALE_GENERATION ?= ""
-
-
-#Use the ARM EABI when building for an ARM cpu. We can't use overrides
-#here because this breaks all places where ":=" is used.
-TARGET_VENDOR = "${@['','-angstrom'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
-TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
-
-#mess with compiler flags to use -Os instead of -O2
-#Please see http://free-electrons.com/doc/embedded_linux_o