merge of 'd0e2c30b999cbef32c26717651606b8411ad02d6'

     and 'ffac2606c1f6116f54c1871ff55c69f027252547'

1 files changed, 176 insertions, 0 deletions

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
new file mode 100644
index 0000000000..327d4123cc
--- /dev/null
+++ b/conf/distro/angstrom-2007.1.conf
@@ -0,0 +1,176 @@
+#@--------------------------------------------------------------------
+#@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}"
+
+require conf/distro/include/angstrom.inc
+require conf/distro/include/sane-srcdates.inc
+
+DISTRO_TYPE = "debug"
+#DISTRO_TYPE = "release"
+#!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!!
+
+
+FEED_URIS += " \
+		base##${ANGSTROM_URI}/unstable/feed/base \
+		perl##${ANGSTROM_URI}/unstable/feed/perl \
+		python##${ANGSTROM_URI}/unstable/feed/python \
+		debug##${ANGSTROM_URI}/unstable/feed/debug \
+		${MACHINE}##${ANGSTROM_URI}/unstable/feed/machine/${MACHINE}"
+#        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 = "20060630"
+#SRCDATE_handhelds-pxa-2.6 = "20060622"
+SRCDATE_gconf-dbus = "20060719"
+SRCDATE_gnome-vfs-dbus = "20060803"
+
+PREFERRED_VERSION_qemu-native = "0.8.2"
+
+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"
+require conf/distro/include/preferred-opie-versions.inc
+
+# GPE
+require conf/distro/include/preferred-gpe-versions-2.8.inc
+
+PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
+
+PREFERRED_VERSION_fontconfig = "2.3.95"
+PREFERRED_VERSION_freetype = "2.2.1"
+
+#Small machines prefer kdrive, but we might ship full Xorg in other images
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
+PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
+
+require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
+
+PREFERRED_VERSION_xserver-kdrive = "1.1.0+git${SRCDATE}"
+
+#zap extra stuff taking place in $MACHINE.conf 
+GPE_EXTRA_INSTALL = ""
+
+
+# E
+require conf/distro/include/preferred-e-versions.inc
+
+#Make sure we use 2.6 on machines with a 2.4/2.6 selector
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
+PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+
+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"
+
+# Libc/uclibc:
+#fix some iconv issues, needs to be adjusted when doing uclibc builds
+PREFERRED_PROVIDER_virtual/libiconv ?= glibc
+PREFERRED_PROVIDER_virtual/libintl ?= glibc
+
+# Virtuals:
+PREFERRED_PROVIDER_virtual/db ?= "db"
+PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
+PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive
+
+# Others:
+PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
+PREFERRED_PROVIDER_gconf ?= gconf-dbus
+PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs
+PREFERRED_PROVIDER_tslib ?= tslib
+PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
+PREFERRED_PROVIDER_ntp = "ntp"
+PREFERRED_PROVIDER_hotplug = "udev"
+PREFERRED_PROVIDER_libxss = "libxss"
+
+#EABI stuff
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
+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.17"
+PREFERRED_VERSION_binutils-cross ?= "2.17"
+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"
+
+
+# Busybox <1.1.0 doesn't have EABI support
+PREFERRED_VERSION_busybox = "1.2.1"
+
+PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
+PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e"
+PREFERRED_VERSION_dbus ?= "0.92"
+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_tosa = "pcmciautils"
+PCMCIA_MANAGER_poodle = "pcmciautils"
+PCMCIA_MANAGER_nokia770 = "pcmciautils"
+PCMCIA_MANAGER_h2200 = "pcmciautils"
+PCMCIA_MANAGER_h4000 = "pcmciautils"
+PCMCIA_MANAGER_h6300 = "pcmciautils"
+PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils"
+
+# add altboot to compatible models, will be replaced with angstrom-bootmanager
+#EXTRA_STUFF_append_c7x0 = "altboot"
+#EXTRA_STUFF_append_akita = "altboot"
+#EXTRA_STUFF_append_spitz = "altboot"
+#EXTRA_STUFF_append_poodle = "altboot"
+#EXTRA_STUFF_append_tosa = "altboot"
+
+### 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_h4000 = " 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"
+
+