diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-12-23 10:50:30 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-12-23 10:50:30 +0000 |
| commit | e49ed8da00b7a5d874fd92a806c6b036a726069c (patch) | |
| tree | 4c2986b1f377b0363e6637cc792e8e553c2b39a4 /conf | |
| parent | 95580064683ef83263017dce9b610c74306348bb (diff) | |
| parent | a5ab4c1e92a80b977b53072b349e05ab0f097dd1 (diff) | |
merge of '6765ce1f621a9ef917ba1521afc7b81013e14dc2'
and 'fcc520f13c2e5df6e6b7d52dcbfb32cb1750c941'
Diffstat (limited to 'conf')
60 files changed, 301 insertions, 236 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 9d5d54bfb8..ac2d281123 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -82,7 +82,7 @@ HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}" HOST_PREFIX = "${TARGET_PREFIX}" HOST_CC_ARCH = "${TARGET_CC_ARCH}" -TARGET_ARCH = "INVALID" +TARGET_ARCH ?= "INVALID" TARGET_OS = "INVALID" TARGET_VENDOR = "${BUILD_VENDOR}" TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}" @@ -311,12 +311,13 @@ export PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${layout_sbi ################################################################## CCACHE = "${@bb.which(bb.data.getVar('PATH', d), 'ccache') and 'ccache '}" +TOOLCHAIN_OPTIONS = "" -export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" -export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}" -export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}" -export CPP = "${HOST_PREFIX}gcc -E" -export LD = "${HOST_PREFIX}ld" +export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" +export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" +export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" +export CPP = "${HOST_PREFIX}gcc -E${TOOLCHAIN_OPTIONS}" +export LD = "${HOST_PREFIX}ld${TOOLCHAIN_OPTIONS}" export CCLD = "${CC}" export AR = "${HOST_PREFIX}ar" export AS = "${HOST_PREFIX}as" @@ -587,6 +588,7 @@ COMBINED_FEATURES = "\ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "bluetooth", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "ext2", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "vfat", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "irda", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pcmcia", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pci", d)} \ diff --git a/conf/checksums.ini b/conf/checksums.ini index afa2a95e2b..76eacce219 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -7806,6 +7806,10 @@ sha256=8447eb112e0e42db59e490fa98b0a1c9ed90ff3660b99734fe5119061eddce8e md5=b67ef657b83ca26249d7b9e9c5e7da69 sha256=d68f597c303678c3f325f552a0e2780b613dbf34d093c2269c002127be4953e5 +[http://go-mono.com/sources/mono/mono-1.2.6.tar.bz2] +md5=391f85b4f962269e044ceac2b5235310 +sha256=24cc4f396cac3053c7ba3fe68bc1b80359d75dc4f54a85f39a73cabc3d3f560f + [http://venge.net/monotone/downloads/monotone-0.20.tar.gz] md5=3bdf4da35ff576a401483815952f4045 sha256=56a5c5afd838f90146205ee4769b83988c6bafc85826c0fbcad982f1e0333d93 diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 345da5698c..f36ae8c6fe 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -2,13 +2,13 @@ #@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> #@-------------------------------------------------------------------- -#DISTRO_VERSION = "2007.9" -DISTRO_VERSION = "2007.9-test-${DATE}" -DISTRO_REVISION = "46" +# The release will the 2007.12 +DISTRO_VERSION = "2007.11RC2.1" +DISTRO_REVISION = "51" require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc @@ -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,7 +60,8 @@ 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-hh18" +PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20" +PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}" RDEPENDS_kernel-base_hx4700 = "" RDEPENDS_kernel-base_htcuniversal = "" @@ -98,6 +105,16 @@ PREFERRED_VERSION_binutils ?= "2.18" PREFERRED_VERSION_binutils-cross ?= "2.18" PREFERRED_VERSION_binutils-cross-sdk ?= "2.18" +#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc_avr32 = "avr32-gcc-cross" +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_binutils_avr32 = "2.17" +PREFERRED_VERSION_binutils-cross_avr32 = "2.17" +PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" #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.20" @@ -108,6 +125,10 @@ PREFERRED_VERSION_glibc ?= "2.5" PREFERRED_VERSION_uclibc ?= "0.9.29" PREFERRED_VERSION_uclibc-initial ?= "0.9.29" +#there's is no avr32 patch for 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" @@ -127,6 +148,7 @@ 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 = "gcc-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" @@ -156,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" @@ -214,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} \ @@ -228,3 +251,6 @@ DISTRO_EXTRA_RRECOMMENDS += " \ 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&" + diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 58225bb8ec..85b2916a44 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.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-media.de> #@-------------------------------------------------------------------- @@ -35,14 +35,10 @@ 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}" + +# set feed path variables +FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${ANGSTROM_MODE}/" + #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback CVS_TARBALL_STASH ?= "\ @@ -57,7 +53,7 @@ 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-hh18" +PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh19" #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" @@ -70,19 +66,6 @@ PREFERRED_VERSION_uclibc ?= "0.9.29" PREFERRED_VERSION_uclibc-initial ?= "0.9.29" -#avr32 only has patches for binutils 2.17 and gcc 4.2.1 in OE -PREFERRED_VERSION_binutils_avr32 = "2.17" -PREFERRED_VERSION_binutils-cross_avr32 = "2.17" -PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" -#there's is no avr32 patch for 0.9.29 -PREFERRED_VERSION_uclibc_avr32 = "0.9.28" -PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28" -PREFERRED_VERSION_gcc_avr32 ?= "4.2.1" -PREFERRED_VERSION_gcc-cross_avr32 ?= "4.2.1" -PREFERRED_VERSION_gcc-cross-sdk_avr32 ?= "4.2.1" -PREFERRED_VERSION_gcc-cross-initial_avr32 ?= "4.2.1" - - #Prefer a newer GTK+ and friends PREFERRED_VERSION_gtk+ = "2.12.0" PREFERRED_VERSION_glib-2.0 = "2.14.0" @@ -110,8 +93,20 @@ 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-X11R7.3.inc +#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE +PREFERRED_VERSION_gcc_avr32 = "4.1.2" +PREFERRED_VERSION_gcc-cross_avr32 = "4.1.2" +PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.1.2" +PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.1.2" +PREFERRED_VERSION_binutils_avr32 = "2.17" +PREFERRED_VERSION_binutils-cross_avr32 = "2.17" +PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" +#there's is no avr32 patch for 0.9.29 +PREFERRED_VERSION_uclibc_avr32 = "0.9.28" +PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28" # 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" @@ -141,6 +136,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" @@ -189,7 +185,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 \ ${DEBUG_APPS} \ " @@ -202,3 +198,6 @@ DISTRO_EXTRA_RRECOMMENDS += " \ avahi-autoipd \ openssh-sftp-server \ " + +SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/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&" + diff --git a/conf/distro/generic-uclibc.conf b/conf/distro/generic-uclibc.conf index b77b3e9c87..26e78f89c1 100644 --- a/conf/distro/generic-uclibc.conf +++ b/conf/distro/generic-uclibc.conf @@ -21,5 +21,9 @@ DISTRO_NAME = "generic-uClibC" TARGET_OS = "linux-uclibc" TARGET_FPU_arm = "soft" TARGET_FPU_armeb = "soft" +PREFERRED_PROVIDER_virtual/libc = "uclibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_virtual/libiconv = "libiconv" PREFERRED_PROVIDER_virtual/libintl = "libintl" diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index 7ab7818393..0286666495 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -56,9 +56,7 @@ TARGET_FPU_armeb = "soft" PREFERRED_PROVIDER_virtual/libiconv = "glibc" PREFERRED_PROVIDER_virtual/libintl = "glibc" PREFERRED_PROVIDER_virtual/libc = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" PREFERRED_VERSION_glibc ?= "2.5" PREFERRED_VERSION_glibc-intermediate ?= "2.5" diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index e4b083dd86..1b6ed46ac7 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -97,14 +97,14 @@ PREFERRED_VERSION_bison-native ?= "2.0" PREFERRED_VERSION_bitbake ?= "1.8.6" PREFERRED_VERSION_bitchx ?= "1.1" PREFERRED_VERSION_bluesnarfer ?= "0.1" -PREFERRED_VERSION_bluez-cups-backend ?= "3.22" +PREFERRED_VERSION_bluez-cups-backend ?= "3.23" PREFERRED_VERSION_bluez-dtl1-workaround ?= "1.0" PREFERRED_VERSION_bluez-gnome ?= "0.14" -PREFERRED_VERSION_bluez-gstreamer-plugin ?= "3.22" +PREFERRED_VERSION_bluez-gstreamer-plugin ?= "3.23" PREFERRED_VERSION_bluez-hcidump ?= "1.38" -PREFERRED_VERSION_bluez-libs ?= "3.22" -PREFERRED_VERSION_bluez-utils ?= "3.22" -PREFERRED_VERSION_bluez-utils-alsa ?= "3.22" +PREFERRED_VERSION_bluez-libs ?= "3.23" +PREFERRED_VERSION_bluez-utils ?= "3.23" +PREFERRED_VERSION_bluez-utils-alsa ?= "3.23" PREFERRED_VERSION_bmon ?= "2.1.0" PREFERRED_VERSION_boa ?= "0.94.13" PREFERRED_VERSION_bochs ?= "2.1" @@ -776,7 +776,7 @@ PREFERRED_VERSION_keymap-locales ?= "1.0" PREFERRED_VERSION_keymaps ?= "1.0" PREFERRED_VERSION_keyring ?= "0.6.8" PREFERRED_VERSION_kf ?= "0.5.4.1" -PREFERRED_VERSION_kismet ?= "2007-01-R1b" +PREFERRED_VERSION_kismet ?= "2007-10-R1" PREFERRED_VERSION_klibc ?= "1.1.1" PREFERRED_VERSION_klimt ?= "0.6.1" PREFERRED_VERSION_knights ?= "1.14" @@ -838,7 +838,7 @@ PREFERRED_VERSION_libcompress-zlib-perl-native ?= "1.42" PREFERRED_VERSION_libcontactsdb ?= "0.5" PREFERRED_VERSION_libcroco ?= "0.6.1" PREFERRED_VERSION_libcwd ?= "0.99.47" -PREFERRED_VERSION_libdaemon ?= "0.11" +PREFERRED_VERSION_libdaemon ?= "0.12" PREFERRED_VERSION_libdata-optlist-perl ?= "0.101" PREFERRED_VERSION_libdata-optlist-perl-native ?= "0.101" PREFERRED_VERSION_libdbi ?= "0.7.2" @@ -995,7 +995,7 @@ PREFERRED_VERSION_libpcl ?= "1.4" PREFERRED_VERSION_libpcre ?= "4.4" PREFERRED_VERSION_libpcre-native ?= "4.4" PREFERRED_VERSION_libperl6-junction-perl ?= "1.10" -PREFERRED_VERSION_libpixman ?= "0.1.6" +PREFERRED_VERSION_libpixman ?= "0.9.6" PREFERRED_VERSION_libpng ?= "1.2.20" PREFERRED_VERSION_libpng-native ?= "1.2.20" PREFERRED_VERSION_libpthread-stubs ?= "0.1" @@ -1074,7 +1074,7 @@ PREFERRED_VERSION_libwindowswm ?= "1.0.0" PREFERRED_VERSION_libwnck ?= "2.13.5" PREFERRED_VERSION_libwpd ?= "0.8.6" PREFERRED_VERSION_libx11 ?= "1.1.3" -PREFERRED_VERSION_libx11-native ?= "1.0.1" +PREFERRED_VERSION_libx11-native = "1.0.3" PREFERRED_VERSION_libxau ?= "1.0.3" PREFERRED_VERSION_libxau-native ?= "1.0.3" PREFERRED_VERSION_libxaw ?= "1.0.4" @@ -1236,7 +1236,7 @@ PREFERRED_VERSION_miau ?= "0.5.3" PREFERRED_VERSION_micro-emacs ?= "20060909" PREFERRED_VERSION_microcom ?= "1.02" PREFERRED_VERSION_microwindows ?= "0.90" -PREFERRED_VERSION_midori ?= "0.0.10" +PREFERRED_VERSION_midori ?= "0.0.13" PREFERRED_VERSION_midpath ?= "0.1" PREFERRED_VERSION_midpath-alsa ?= "0.1" PREFERRED_VERSION_midpath-cldc ?= "0.1" @@ -1274,6 +1274,7 @@ PREFERRED_VERSION_modutils-cross ?= "2.4.27" PREFERRED_VERSION_modutils-initscripts ?= "1.0" PREFERRED_VERSION_moin ?= "1.5.8" PREFERRED_VERSION_mono ?= "1.2.5.1" +PREFERRED_VERSION_mono-mcs-intermediate ?= "1.2.5.1" PREFERRED_VERSION_mono-native ?= "1.2.5.1" PREFERRED_VERSION_monotone-4 ?= "0.19" PREFERRED_VERSION_monotone-5 ?= "0.25.2" @@ -1352,7 +1353,7 @@ PREFERRED_VERSION_obby ?= "0.4.1" PREFERRED_VERSION_obexftp ?= "0.20" PREFERRED_VERSION_obexpush ?= "1.0.0" PREFERRED_VERSION_obexpush-native ?= "1.0.0" -PREFERRED_VERSION_octave ?= "2.9.14" +PREFERRED_VERSION_octave ?= "2.1.73" PREFERRED_VERSION_offlineimap ?= "4.0.14" PREFERRED_VERSION_olsr ?= "0.3-1" PREFERRED_VERSION_olsrd ?= "0.5.3" @@ -1438,7 +1439,7 @@ PREFERRED_VERSION_pine ?= "4.64" PREFERRED_VERSION_pipeman ?= "1.0.0" PREFERRED_VERSION_pipepanic ?= "0.1.1" PREFERRED_VERSION_pivotinit ?= "1.0.0" -PREFERRED_VERSION_pixman ?= "0.9.5" +PREFERRED_VERSION_pixman ?= "0.9.6" PREFERRED_VERSION_pixops-test ?= "1.0" PREFERRED_VERSION_pkgconfig ?= "0.22" PREFERRED_VERSION_pkgconfig-native ?= "0.22" @@ -1890,7 +1891,7 @@ PREFERRED_VERSION_u-boot-omap2430sdp ?= "1.1.4" PREFERRED_VERSION_u2nl ?= "1.3" PREFERRED_VERSION_uae4all ?= "0.7.1" PREFERRED_VERSION_ubahnnav ?= "0.4.1" -PREFERRED_VERSION_uboot-utils ?= "1.2.0" +PREFERRED_VERSION_u-boot-utils ?= "1.2.0" PREFERRED_VERSION_udev ?= "092" PREFERRED_VERSION_udev-hostap-cs-vcc-workaround ?= "1.0" PREFERRED_VERSION_udhcp ?= "0.9.8" diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc index 6726710aa9..837aec9f2d 100644 --- a/conf/distro/include/angstrom-eglibc.inc +++ b/conf/distro/include/angstrom-eglibc.inc @@ -5,14 +5,12 @@ PREFERRED_PROVIDER_virtual/libc = "eglibc" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "eglibc-initial" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "eglibc-intermediate" - - +PREFERRED_PROVIDER_virtual/arm${TARGET_VENDOR}-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/armeb${TARGET_VENDOR}-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/arm${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/powerpc${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/mipsel${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/sparc${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc-intermediate" TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 16a914c0a3..11cee727c5 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -35,6 +35,9 @@ require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.inc PREFERRED_PROVIDER_qemu-native = "qemu-native" ENABLE_BINARY_LOCALE_GENERATION ?= "1" +# We only want to build UTF8 locales +LOCALE_UTF8_ONLY = "1" + #qemu doesn't like armv6/eabi/vfp ENABLE_BINARY_LOCALE_GENERATION_mx31ads = "0" ENABLE_BINARY_LOCALE_GENERATION_nokia8 |