diff options
Diffstat (limited to 'conf/distro/angstrom-2007.1.conf')
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 88 |
1 files changed, 35 insertions, 53 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index fe6be3e614..4c9a254cd9 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -2,7 +2,7 @@ #@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: Koen Kooi <koen@openembedded.org> #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de> #@-------------------------------------------------------------------- @@ -14,7 +14,7 @@ require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc #Images built can have to modes: -# 'debug': empty rootpassword, strace and gdb included +# 'debug': empty rootpassword, strace included # 'release' no root password, no strace and gdb by default DISTRO_TYPE ?= "debug" #DISTRO_TYPE = "release" @@ -29,18 +29,24 @@ 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)}' -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}" +# 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}/" + + #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/ \ @@ -54,29 +60,12 @@ MACHINE_KERNEL_VERSION = "2.6" PCMCIA_MANAGER = "pcmciautils" #Preferred version for the kernel on various machines -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh17" +PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh19" +PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}" RDEPENDS_kernel-base_hx4700 = "" RDEPENDS_kernel-base_htcuniversal = "" -# Needed for crappy ipaqs with broken hostap in the kernel -PREFERRED_VERSION_hostap-modules ?= "0.4.7" -PREFERRED_VERSION_hostap-utils ?= "0.4.7" - -PREFERRED_VERSION_file = "4.18" -PREFERRED_VERSION_file_native = "4.18" - -PREFERRED_VERSION_fontconfig = "2.4.1" -PREFERRED_VERSION_freetype = "2.3.4" -PREFERRED_VERSION_freetype-native = "2.2.1" -PREFERRED_VERSION_cairo = "1.4.10" -PREFERRED_VERSION_glib-2.0 = "2.12.12" -PREFERRED_VERSION_pango = "1.16.4" -PREFERRED_VERSION_atk = "1.20.0" -PREFERRED_VERSION_gtk+ = "2.10.14" - -# newer poppler cvs breaks some apps, fix until popper 6 and apps -# catch up with api changes -# PREFERRED_VERSION_poppler = "0.5.4" +PREFERRED_PROVIDER_libgsmd = "libgsmd" # older gtk-webcore releases don't work on ARM/EABI # We need to switch to a fixed SRCDATE or release as soon as possible @@ -91,14 +80,6 @@ PREFERRED_PROVIDER_avahi = "avahi" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" -PREFERRED_VERSION_xserver-kdrive ?= "1.3.0.0" -PREFERRED_VERSION_libxrandr ?= "1.2.1" -PREFERRED_VERSION_xrandr ?= "1.2.0" -PREFERRED_VERSION_randrproto ?= "1.2.1" - -PREFERRED_VERSION_libgnomeui = "2.18.1" -PREFERRED_VERSION_prismstumbler = "0.7.3" - #use EABI ready toolchain PREFERRED_VERSION_gcc ?= "4.1.2" PREFERRED_VERSION_gcc-cross ?= "4.1.2" @@ -110,6 +91,16 @@ 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_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_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_binutils ?= "2.18" PREFERRED_VERSION_binutils-cross ?= "2.18" PREFERRED_VERSION_binutils-cross-sdk ?= "2.18" @@ -149,21 +140,15 @@ 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" - -# Busybox <1.1.0 doesn't have EABI support -PREFERRED_VERSION_busybox = "1.2.1" - -PREFERRED_VERSION_dbus ?= "1.0.2" -PREFERRED_VERSION_dbus-glib ?= "0.74" - #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-preferred-versions.inc require conf/distro/include/preferred-gpe-versions-2.8.inc require conf/distro/include/preferred-e-versions.inc -require conf/distro/include/preferred-xorg-versions.inc -require conf/distro/include/preferred-openmoko-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 = "gcc-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" @@ -193,6 +178,7 @@ PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" # Others: +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_dbus-glib = "dbus-glib" PREFERRED_PROVIDER_esound ?= "pulseaudio" PREFERRED_PROVIDER_gconf ?= "gconf-dbus" @@ -225,10 +211,6 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" #Silence a warning during parsing PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" - -# Lock down almost every recipe: -require conf/distro/include/angstrom-2007-preferred-versions.inc - #This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH} ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" require conf/distro/include/angstrom${ARM_ABI}.inc @@ -237,7 +219,7 @@ require conf/distro/include/angstrom${ARM_ABI}.inc # We want to ship extra debug utils in the rootfs when doing a debug build DEBUG_APPS ?= "" -DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "tslib-tests tslib-calibrate gdb strace procps",d)}' +DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}' #this should go away soon EXTRA_STUFF ?= "" @@ -255,7 +237,7 @@ DISTRO_EXTRA_RDEPENDS += "\ update-modules \ ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ angstrom-version \ - ipkg ipkg-collateral \ + ipkg ipkg-collateral ${ANGSTROM_FEED_CONFIGS} \ util-linux-mount util-linux-umount \ ${EXTRA_STUFF} \ ${DEBUG_APPS} \ |