diff options
Diffstat (limited to 'conf/distro/include/angstrom-2007-for-openmoko.inc')
| -rw-r--r-- | conf/distro/include/angstrom-2007-for-openmoko.inc | 64 |
1 files changed, 19 insertions, 45 deletions
diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc index 08cf27ba57..6741bae3e1 100644 --- a/conf/distro/include/angstrom-2007-for-openmoko.inc +++ b/conf/distro/include/angstrom-2007-for-openmoko.inc @@ -3,14 +3,8 @@ #@NAME: Angstrom <http://www.angstrom-distribution.org> #@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices #@MAINTAINER: Koen Kooi <koen@openembedded.org> -#@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de> #@-------------------------------------------------------------------- -# If you want to use the angstrom 2007.12 release or if -# you want to base you distro on angstrom 2007, switch to -# the org.openembedded.angstrom-2007.12-stable branch -# THIS FILE WILL GO AWAY IN JANUARY 2008!! - DISTRO_VERSION = "2007.11RC3" DISTRO_REVISION = "51" @@ -33,30 +27,12 @@ DISTRO_TYPE ?= "debug" # Also, it appears that no locales fit in 16Mb for now. "C" locale rules! IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}' -# These will be put under package management soon -#FEED_URIS += " \ -# no-arch##${ANGSTROM_URI}/unstable/feed/all \ -# base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \ -# perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \ -# python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \ -# debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \ -# gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \ -# ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}" -# base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/base \ -# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/machine/${MACHINE} \ -# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/updates" - - # set feed path variables -FEED_BASEPATH = "feeds/2007/${ANGSTROM_PKG_FORMAT}/${ANGSTROM_MODE}/" +FEED_BASEPATH = "feeds/2007/${ANGSTROM_PKG_FORMAT}/${LIBC}/" #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback -CVS_TARBALL_STASH ?= "\ - http://www.angstrom-distribution.org/unstable/sources/ \ - http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ - " - +CVS_TARBALL_STASH ?= "http://www.angstrom-distribution.org/unstable/sources/" #Make sure we use 2.6 on machines with a 2.4/2.6 selector KERNEL = "kernel26" @@ -89,21 +65,25 @@ PREFERRED_VERSION_gcc ?= "4.1.2" PREFERRED_VERSION_gcc-cross ?= "4.1.2" PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2" PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2" +PREFERRED_VERSION_gcc-cross-intermediate ?= "4.1.2" PREFERRED_VERSION_gcc_dht-walnut ?= "4.1.1" PREFERRED_VERSION_gcc-cross_dht-walnut ?= "4.1.1" PREFERRED_VERSION_gcc-cross-sdk_dht-walnut ?= "4.1.1" PREFERRED_VERSION_gcc-cross-initial_dht-walnut ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-intermediate_dht-walnut ?= "4.1.1" PREFERRED_VERSION_gcc_xilinx-ml403 ?= "4.1.1" PREFERRED_VERSION_gcc-cross_xilinx-ml403 ?= "4.1.1" PREFERRED_VERSION_gcc-cross-sdk_xilinx-ml403 ?= "4.1.1" PREFERRED_VERSION_gcc-cross-initial_xilinx-ml403 ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-intermediate_xilinx-ml403 ?= "4.1.1" PREFERRED_VERSION_gcc_mpc8323e-rdb ?= "4.1.1" PREFERRED_VERSION_gcc-cross_mpc8323e-rdb ?= "4.1.1" PREFERRED_VERSION_gcc-cross-sdk_mpc8323e-rdb ?= "4.1.1" PREFERRED_VERSION_gcc-cross-initial_mpc8323e-rdb ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-intermediate_mpc8323e-rdb ?= "4.1.1" PREFERRED_VERSION_binutils ?= "2.18" PREFERRED_VERSION_binutils-cross ?= "2.18" @@ -115,6 +95,7 @@ PREFERRED_VERSION_avr32-gcc = "4.1.2" PREFERRED_VERSION_avr32-gcc-cross = "4.1.2" PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.0.2" PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.0.2" +PREFERRED_VERSION_gcc-cross-intermediate_avr32 = "4.0.2" PREFERRED_VERSION_binutils_avr32 = "2.17" PREFERRED_VERSION_binutils-cross_avr32 = "2.17" @@ -133,9 +114,6 @@ PREFERRED_VERSION_uclibc-initial ?= "0.9.29" PREFERRED_VERSION_uclibc_avr32 = "0.9.28" PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28" -PREFERRED_VERSION_glibc-intermediate_i686 ?= "2.4" -PREFERRED_VERSION_glibc-intermediate ?= "2.5" - PREFERRED_VERSION_glibc-initial ?= "2.5" # To use an EABI compatible version 3 series gcc, either uncomment @@ -143,10 +121,10 @@ PREFERRED_VERSION_glibc-initial ?= "2.5" # # PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3" # PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3" +# PREFERRED_VERSION_gcc-cross-intermediate = "3.4.4+csl-arm-2005q3" #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom require conf/distro/include/preferred-xorg-versions.inc -require conf/distro/include/angstrom-2007-for-openmoko-versions.inc require conf/distro/include/preferred-gpe-versions-2.8.inc require conf/distro/include/preferred-e-versions.inc @@ -154,20 +132,19 @@ require conf/distro/include/preferred-e-versions.inc # Virtuals: PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" #Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo) -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/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc" +PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc" +PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc" +PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc" +PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibceabi-libc-for-gcc = "uclibc-initial" +PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibceabi-libc-for-gcc = "uclibc-initial" # hostap stuff, we prefer the in-kernel modules, but those don't work for all machines PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" @@ -178,7 +155,6 @@ PREFERRED_PROVIDER_virtual/db ?= "db" PREFERRED_PROVIDER_virtual/db-native ?= "db-native" PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" -PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" # Others: @@ -239,9 +215,9 @@ DISTRO_EXTRA_DEPENDS += " \ DISTRO_EXTRA_RDEPENDS += "\ update-modules \ - ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ +# ${@base_contains("MACHINE_FEATURES", "screen", "exquisite", "",d)} \ angstrom-version \ - ipkg ipkg-collateral ${ANGSTROM_FEED_CONFIGS} \ + opkg opkg-collateral distro-feed-configs \ util-linux-mount util-linux-umount \ ${EXTRA_STUFF} \ ${DEBUG_APPS} \ @@ -251,10 +227,8 @@ DISTRO_EXTRA_RRECOMMENDS += " \ kernel-module-vfat \ kernel-module-ext2 \ kernel-module-af-packet \ - avahi-daemon \ - avahi-autoipd \ openssh-sftp-server \ " -SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202007.12&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" +SEPPUKU_NEWREPORT = "http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202007.12&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" |