diff options
Diffstat (limited to 'conf/distro')
76 files changed, 3715 insertions, 1637 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 33349fcde1..85d6f3f48a 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -2,23 +2,30 @@ #@TYPE: Distribution #@NAME: Angstrom <http://www.angstrom-distribution.org> #@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices +#@MAINTAINER: Graeme 'XorA' Gregory <dp@xora.org.uk> #@MAINTAINER: Koen Kooi <koen@openembedded.org> -#@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille-media.de> +#@MAINTAINER: Philip 'Crofton' Balister <philip@balister.org> #@-------------------------------------------------------------------- # This is a aimed to be the next stable angstrom release. -# If you want something stable *right now*, use angstrom-2007.1 -# with the org.openembedded.angstrom-2007.12-stable branch +# If you want something stable *right now*, use angstrom-2008.1 +# with the stable/2009 branch # -# Use this at your own risk, we welcome bugreports filed at -# http://bugs.openembedded.net +# Use this at your own risk, we welcome bugreports sent to +# angstrom-distro-devel@linuxtogo.org # -# Again, in doubt, use DISTRO="angstrom-2007.1" with the -# org.openembedded.angstrom-2007.12-stable branch +# For more contact info please visit +# http://www.angstrom-distribution.org/contact +# +# Again, in doubt, use DISTRO="angstrom-2008.1" with the +# stable/2009 branch + +#DISTRO_VERSION = "2009.X" +DISTRO_VERSION = "2009.X-test-${DATE}" +DISTRO_REVISION = "3" +DISTRO_PR = ".5" -#DISTRO_VERSION = "2008.1" -DISTRO_VERSION = "2008.1-test-${DATE}" -DISTRO_REVISION = "1" +OLDEST_KERNEL ?= "2.6.16" #build staging from packages INHERIT += "packaged-staging" @@ -34,6 +41,10 @@ require conf/distro/include/preferred-opie-versions-1.2.4.inc DISTRO_TYPE ?= "debug" #DISTRO_TYPE = "release" +# Set the toolchain type (internal, external) and brand (generic, csl etc.) +TOOLCHAIN_TYPE ?= "internal" +TOOLCHAIN_BRAND ?= "" + # Ship just basic locale by default. Locales are big (~1Mb uncompr.), so # shipping some adhoc subset will be still useless and size burden for # users of all other languages/countries. Instead, worth to make it easy @@ -42,11 +53,11 @@ DISTRO_TYPE ?= "debug" # (locales, UI transalations, help, etc. - useless for pros, but really # helpful for common users). # 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)}' +IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-us", d)}' # set feed path variables -FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${ANGSTROM_MODE}/" +FEED_BASEPATH = "feeds/unstable/${ANGSTROM_PKG_FORMAT}/${LIBC}/" #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback @@ -68,19 +79,13 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20" #KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_DIR}initramfs-bootmenu-image-${MACHINE}.cpio.gz)" #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against -PREFERRED_VERSION_linux-libc-headers = "2.6.23" +PREFERRED_VERSION_linux-libc-headers = "2.6.31" -#Prefer glibc 2.6 and uclibc 0.9.29, these have had the most testing. -PREFERRED_VERSION_glibc ?= "2.6.1" -PREFERRED_VERSION_glibc-initial ?= "2.6.1" -PREFERRED_VERSION_uclibc ?= "0.9.29" -PREFERRED_VERSION_uclibc-initial ?= "0.9.29" - -PREFERRED_PROVIDER_avahi = "avahi" - -#Small machines prefer kdrive, but we might ship full Xorg in other images -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" -PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" +#Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing. +PREFERRED_VERSION_glibc ?= "2.9" +PREFERRED_VERSION_glibc-initial ?= "2.9" +PREFERRED_VERSION_uclibc ?= "0.9.30.1" +PREFERRED_VERSION_uclibc-initial ?= "0.9.30.1" #powerpc needs additional patches to gcc ANGSTROM_GCC_VERSION_ppc405 ?= "4.1.1" @@ -90,23 +95,26 @@ ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1" # Blackfin has its on gcc ANGSTROM_GCC_VERSION_bfin = "4.1.2" -#for proper NEON support we need a CSL toolchain -#ANGSTROM_GCC_VERSION_armv7a = "4.2.1+csl-arm-2007q3-53" -ANGSTROM_GCC_VERSION_armv7a = "4.3.1" - -#Horrible workaround for armv7a follows: -# gcc 4.3.1 builds a kernel that oopses with a null-pointer in the rcu-update function -# gcc 4.2.1 (the one from *gasp* csl) builds a working kernel, but non-working userspace - -KERNEL_CCSUFFIX_armv7a= "-4.2.1+csl-arm-2007q3-53" +# Uncomment this if want need to build an armv7a kernel with CSL toolchain (<2.6.27 don't boot with mainline gcc) +#KERNEL_CCSUFFIX_armv7a = "-4.2.1+csl-arm-2007q3-53" +KERNEL_CCSUFFIX_archos5 = "-4.2.1+csl-arm-2007q3-53" #avr32 only has support for gcc 4.2.2 ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2" +#armv4 needs at least gcc 4.4.2 for eabi +ANGSTROM_GCC_VERSION_armv4 ?= "4.4.2" + #Everybody else can just use this: -ANGSTROM_GCC_VERSION ?= "4.2.4" -PREFERRED_VERSION_binutils-cross ?= "2.18.50.0.7" -PREFERRED_VERSION_binutils-cross-sdk ?= "2.18.50.0.7" +ANGSTROM_GCC_VERSION ?= "4.3.3" + +ANGSTROM_BINUTILS_VERSION ?= "2.18" +ANGSTROM_BINUTILS_VERSION_armv4 ?= "2.20" +ANGSTROM_BINUTILS_VERSION_armv7a ?= "2.18.50.0.7" + +PREFERRED_VERSION_binutils ?= "${ANGSTROM_BINUTILS_VERSION}" +PREFERRED_VERSION_binutils-cross ?= "${ANGSTROM_BINUTILS_VERSION}" +PREFERRED_VERSION_binutils-cross-sdk ?= "${ANGSTROM_BINUTILS_VERSION}" PREFERRED_VERSION_gcc ?= "${ANGSTROM_GCC_VERSION}" PREFERRED_VERSION_gcc-cross ?= "${ANGSTROM_GCC_VERSION}" @@ -114,98 +122,80 @@ PREFERRED_VERSION_gcc-cross-sdk ?= "${ANGSTROM_GCC_VERSION}" PREFERRED_VERSION_gcc-cross-initial ?= "${ANGSTROM_GCC_VERSION}" PREFERRED_VERSION_gcc-cross-intermediate ?= "${ANGSTROM_GCC_VERSION}" -#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom -require conf/distro/include/preferred-e-versions.inc -require conf/distro/include/preferred-xorg-versions-X11R7.3.inc - #avr32 only has patches for binutils 2.17 in OE PREFERRED_VERSION_binutils_avr32 = "2.17" PREFERRED_VERSION_binutils-cross_avr32 = "2.17" PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" -# 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" - -# hostap stuff, we prefer the in-kernel modules, but those don't work for all machines -PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" -PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules" -PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules" - -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: -PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" +# Toolchain virtuals: +require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc + PREFERRED_PROVIDER_dbus-glib = "dbus-glib" -PREFERRED_PROVIDER_esound ?= "pulseaudio" -PREFERRED_PROVIDER_gconf ?= "gconf-dbus" -PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs" -PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs" -PREFERRED_PROVIDER_tslib ?= "tslib" -PREFERRED_PROVIDER_tslib-conf ?= "tslib" -PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" -PREFERRED_PROVIDER_ntp ?= "ntp" PREFERRED_PROVIDER_hotplug = "udev" -PREFERRED_PROVIDER_libxss = "libxss" -PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils" - -# we don't ship gtk-directfb by default -PREFERRED_PROVIDER_gtk+ ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" - - -#Silence a warning during parsing -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" - -#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 +PREFERRED_PROVIDER_opkg ?= "opkg-nogpg-nocurl" + +ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4" +ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4" + +ANGSTROM_BLACKLIST_pn-fso-apm = "regular apmd is good enough" + +require conf/distro/include/angstrom.inc + +# If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run +# We also take this opportunity to inject angstrom-version and the feed configs into the rootfs +IPKG_VARIANT = "opkg-nogpg-nocurl angstrom-version ${ANGSTROM_FEED_CONFIGS}" + +# we need the same provider for opkg and u-a +PREFERRED_PROVIDER_virtual/update-alternatives = "opkg-nogpg-nocurl" + +# Select xserver-xorg as default, since kdrive has been EOL'ed +XSERVER ?= "xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mouse xf86-video-fbdev" # do some task-base stuff here +# Prefer bluez4, it's needed for things like connman. Bluez4 is also largely backward compatible with +# bluez 3.x +DISTRO_BLUETOOTH_MANAGER = "\ + blueprobe \ + bluez4 \ + " + # We want to ship extra debug utils in the rootfs when doing a debug build DEBUG_APPS ?= "" DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}' -# Angstrom want to ship some extra stuff. This should be moved into task-base eventually -# contains ipkg specific stuff as well :( +# This hooks into task-base, so it won't do anything if your images doesn't include task-base. +# angstrom-version: ship this to have an identifiable rootfs so user can report bugs against a specific version +# ANGSTROM_FEED_CONFIGS: configfiles for the online feeds +# util-linux-ng-mount util-linux-ng-umount: busybox mount is broken +# angstrom-libc-fixup-hack: fixes an obscure bug with libc.so symlink DISTRO_EXTRA_RDEPENDS += "\ - update-modules \ - ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ angstrom-version \ - opkg-nogpg opkg-collateral ${ANGSTROM_FEED_CONFIGS} \ + ${ANGSTROM_FEED_CONFIGS} \ util-linux-ng-mount util-linux-ng-umount \ - ${DEBUG_APPS} angstrom-libc-fixup-hack \ + angstrom-libc-fixup-hack \ " +# This also hooks into task-base, but isn't mandatory. +# If you don't want parts of this in your task-base using images you can put this in the image recipe: +# BAD_RECOMMENDATIONS = "avahi-daemon avahi-autoipd" +# Note that BAD_RECOMMENDATIONS is a feature of rootfs_ipk.bbclass, not angstrom +# kernel modules: ship fs modules so you can mount stuff and af-packet so networking works +# avahi: makes finding your device on the network a lot easier +# openssh-sftp-server: provides sftp which combined with avahi makes it real easy to use things like sshfs +# psplash-angstrom: angstrom branded psplash, you can add your own psplash-foo to an image, it uses update-alternatives +# DEBUG_APPS: ship strace and procpc to make simple debugging a lot easier DISTRO_EXTRA_RRECOMMENDS += " \ kernel-module-vfat \ kernel-module-ext2 \ + kernel-module-ext3 \ kernel-module-af-packet \ avahi-daemon \ avahi-autoipd \ openssh-sftp-server \ - " - -SEPPUKU_NEWREPORT = "http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202008.x&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" + ${DEBUG_APPS} \ +" +SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)}' +ARM_INSTRUCTION_SET_pn-uclibc = "arm" +ARM_INSTRUCTION_SET_pn-uclibc-initial = "arm" diff --git a/conf/distro/asusoe.conf b/conf/distro/asusoe.conf index 35be6a4fab..efc4efccd4 100644 --- a/conf/distro/asusoe.conf +++ b/conf/distro/asusoe.conf @@ -7,6 +7,8 @@ DISTRO_VERSION = "0.1-alpha" TARGET_OS = "linux-uclibc" TARGET_SYS = "${TARGET_ARCH}-uclibc" +LIBC = "uclibc" +require conf/distro/include/${LIBC}.inc CROSS_DIR = "/opt/brcm/hndtools-mipsel-uclibc" diff --git a/conf/distro/celinux-test.conf b/conf/distro/celinux-test.conf index 0787ff2bca..fbc96e19bf 100644 --- a/conf/distro/celinux-test.conf +++ b/conf/distro/celinux-test.conf @@ -39,7 +39,6 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-inte PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}binutils:binutils-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc" PREFERRED_VERSION_binutils = "2.16" PREFERRED_VERSION_binutils-cross = "2.16" @@ -49,12 +48,10 @@ PREFERRED_VERSION_gcc-cross = "3.4.4" PREFERRED_VERSION_gcc-cross-initial = "3.4.4" PREFERRED_VERSION_gcc-cross-intermediate = "3.4.4" +LIBC = "glibc" +require conf/distro/include/${LIBC}.inc PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" -# glibc provides iconv and intl -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" - # # omap5912osk settings # diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf index ff6aa1f6a3..448931b8bf 100644 --- a/conf/distro/chinook-compat.conf +++ b/conf/distro/chinook-compat.conf @@ -18,6 +18,14 @@ DISTRO_VERSION = "test-${DATE}" DISTRO_TYPE = "debug" #DISTRO_TYPE = "release" +# Needed for e.g. libffi builds on armv6 +OVERRIDES .= ":${FEED_ARCH}" + +# Set the toolchain type (internal, external) and brand (generic, csl etc.) +TOOLCHAIN_TYPE ?= "internal" +TOOLCHAIN_BRAND ?= "" + +LIBC = "glibc" require conf/distro/include/angstrom-glibc.inc FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -O1" @@ -46,16 +54,12 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-inte PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDER_virtual/libc = "glibc" - -# NPTL stuff -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-libc-for-gcc = "glibc" - PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-binutils = "binutils-cross" PREFERRED_PROVIDER_linux-libc-header = "linux-libc-headers" PREFERRED_PROVIDER_virtual/libx11 = "libx11" PREFERRED_PROVIDER_gconf ?= "gconf-dbus" +PREFERRED_PROVIDER_util-linux = "util-linux" + PREFERRED_VERSION_automake-native = "1.9.6" @@ -75,6 +79,8 @@ PREFERRED_VERSION_linux-libc-headers = "2.6.20" PREFERRED_VERSION_glibc = "2.5" PREFERRED_VERSION_glibc-initial = "2.5" +PREFERRED_VERSION_libtool-native = "1.5.10" +PREFERRED_VERSION_libtool-cross = "1.5.10" PREFERRED_VERSION_libtool = "1.5.6" require conf/distro/include/sane-srcrevs.inc @@ -87,31 +93,31 @@ PREFERRED_VERSION_glib-2.0 = "2.12.12" PREFERRED_VERSION_pango = "1.16.4" PREFERRED_VERSION_atk = "1.18.0" PREFERRED_VERSION_gtk+ = "2.10.14" -PREFERRED_VERSION_libpng = "1.2.8" +PREFERRED_VERSION_libpng = "1.2.12" PREFERRED_VERSION_expat = "1.95.7" # only dbus-glib 0.74 works with older dbus 1.0.x PREFERRED_VERSION_dbus = "1.0.3" PREFERRED_VERSION_dbus-glib = "0.74" -PREFERRED_VERSION_gnome-vfs = "2.16.3" +PREFERRED_VERSION_gnome-vfs = "2.22.0" # 3.9.1 would be correct PREFERRED_VERSION_gtkhtml-3.8 = "3.8.2" -PREFERRED_VERSION_libxml2 = "2.6.27" +PREFERRED_VERSION_libxml2 = "2.7.2" # 2.16 would be correct PREFERRED_VERSION_gconf = "2.6.1" # gstreamer # 0.10.13 would be correct (+ maemo patches) -PREFERRED_VERSION_gstreamer = "0.10.14" +PREFERRED_VERSION_gstreamer = "0.10.17" |