merge of 623eed7c92806a0e18e3daa7e8dee2edd301a94e

     and d7c8c3fb9c9b65e500f2c9ffb52d588c15efa14b

2 files changed, 95 insertions, 0 deletions

diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
new file mode 100644
index 0000000000..cb4ba04876
--- /dev/null
+++ b/conf/distro/angstrom-2006.9.conf
@@ -0,0 +1,65 @@
+#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##http:///${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \
+		${MACHINE}##http://${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \
+        updates##http://${ANGSTROM_URI}/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_PROVIDER_virtual/libiconv = "glibc"
+PREFERRED_PROVIDER_virtual/libintl = "glibc"
+
+#EABI stuff
+#PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+
+PREFERRED_PROVIDER_x11=diet-x11
+
+#use EABI toolchain
+#PREFERRED_VERSION_gcc ?= "3.4.4+csl-arm-20051214"
+#PREFERRED_VERSION_gcc-cross ?= "3.4.4+csl-arm-20051214"
+#PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4+csl-arm-20051214"
+#PREFERRED_VERSION_binutils ?= "2.16.91.0.4"
+#PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.4"
+#PREFERRED_VERSION_glibc ?= "2.3.5+cvs20051214"
+#PREFERRED_VERSION_glibc-intermediate ?= "2.3.5+cvs20051214"
+
+#
+# Opie
+#
+
+PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
+PREFERRED_VERSION_qte = "2.3.10"
+
+OPIE_VERSION = "1.2.1"
+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.8.inc
+
+#
+# E
+#
+
+include conf/distro/preferred-e-versions.inc
+
diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf
new file mode 100644
index 0000000000..eaf3fb61e7
--- /dev/null
+++ b/conf/distro/angstrom.conf
@@ -0,0 +1,30 @@
+#@TYPE: Distribution
+#@NAME: Angstrom 
+#@DESCRIPTION: Distribution configuration for Angstrom
+
+DISTRO = "angstrom"
+DISTRO_NAME = "Angstrom"
+
+#we'll use this till we get a real domain
+ANGSTROM_URI = "http://ewi546.ewi.utwente.nl/angstrom"
+
+#Set the default maintainer to angstrom-dev
+MAINTAINER ?= "Angstrom Developers <angstrom-dev@handhelds.org>"
+
+#use ipkg package format with debian style naming
+INHERIT += "package_ipk debian"
+
+#EABI isn't working yet, so we'll use TARGET_OS = linux in the meantime
+#TARGET_OS = "none-linux-gnueabi"
+TARGET_OS = "linux"
+
+PARALLEL_INSTALL_MODULES = "1"
+
+BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version"
+BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version"
+
+#Name the generated images in a sane way
+IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
+
+
+DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"