diff options
Diffstat (limited to 'conf/distro/include')
53 files changed, 2851 insertions, 1169 deletions
diff --git a/conf/distro/include/.mtn2git_empty b/conf/distro/include/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/conf/distro/include/.mtn2git_empty +++ /dev/null diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc index 92c44fe630..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,6 +121,7 @@ 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 @@ -153,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" @@ -177,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: @@ -238,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 \ - opkg opkg-collateral ${ANGSTROM_FEED_CONFIGS} \ + opkg opkg-collateral distro-feed-configs \ util-linux-mount util-linux-umount \ ${EXTRA_STUFF} \ ${DEBUG_APPS} \ @@ -250,8 +227,6 @@ DISTRO_EXTRA_RRECOMMENDS += " \ kernel-module-vfat \ kernel-module-ext2 \ kernel-module-af-packet \ - avahi-daemon \ - avahi-autoipd \ openssh-sftp-server \ " diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 382d562426..18df733fa1 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -1,10 +1,68 @@ -PREFERRED_VERSION_busybox = "1.9.2" -PREFERRED_VERSION_dbus = "1.2.1" -PREFERRED_VERSION_glib-2.0 = "2.16.1" +ANGSTROM_QT_VERSION ?= "4.6.0" + +PREFERRED_VERSION_autoconf = "2.63" +PREFERRED_VERSION_autoconf-native = "2.63" +PREFERRED_VERSION_automake-native = "1.10.2" +PREFERRED_VERSION_busybox = "1.13.2" +PREFERRED_VERSION_cairo = "1.8.8" +PREFERRED_VERSION_dbus = "1.2.3" +PREFERRED_VERSION_dropbear = "0.51" +PREFERRED_VERSION_fontconfig = "2.6.0" +PREFERRED_VERSION_glib-2.0 = "2.22.1" +PREFERRED_VERSION_glib-2.0-native = "2.22.1" +PREFERRED_VERSION_glibmm = "2.22.1" PREFERRED_VERSION_gst-pulse = "0.9.7" -PREFERRED_VERSION_libtool = "1.5.10" -PREFERRED_VERSION_pango = "1.18.3" -PREFERRED_VERSION_pulseaudio = "0.9.9" -PREFERRED_VERSION_udev = "118" +PREFERRED_VERSION_gtk+ = "2.18.3" +PREFERRED_VERSION_gtkmm = "2.18.1" +PREFERRED_VERSION_hal = "0.5.13" +PREFERRED_VERSION_libgemwidget = "1.0" +PREFERRED_VERSION_libgpephone = "0.4" +PREFERRED_VERSION_libsdl-x11 = "1.2.14" +PREFERRED_VERSION_libtool = "2.2.6a" +PREFERRED_VERSION_libtool-native = "2.2.6a" +PREFERRED_VERSION_libtool-cross = "2.2.6a" +PREFERRED_VERSION_libtool-sdk = "2.2.6a" +PREFERRED_VERSION_mesa = "7.6" +PREFERRED_VERSION_mesa-dri = "7.6" +PREFERRED_VERSION_mesa-xlib = "7.6" +PREFERRED_VERSION_mplayer = "0.0+1.0rc2+svnr30165" +PREFERRED_VERSION_pango = "1.24.4" +#PREFERRED_VERSION_pixman = "0.13.2" +PREFERRED_VERSION_pkgconfig = "0.23" +PREFERRED_VERSION_pkgconfig-native = "0.23" +PREFERRED_VERSION_pulseaudio = "0.9.15" +PREFERRED_VERSION_python = "2.6.2" +PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}" +PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}" +PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}" +PREFERRED_VERSION_qt4-embedded-gles = "${ANGSTROM_QT_VERSION}" +PREFERRED_VERSION_qt4-x11-free = "${ANGSTROM_QT_VERSION}" +PREFERRED_VERSION_qt4-x11-free-gles = "${ANGSTROM_QT_VERSION}" + +PREFERRED_VERSION_samba = "3.3.9" +PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" + +PREFERRED_VERSION_udev = "141" +UDEV_GE_141 = "1" + +PREFERRED_VERSION_usbutils = "0.82" +PREFERRED_VERSION_wpa-supplicant = "0.6.9" PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" -PREFERRED_VERSION_dropbear = "0.50" + +# +# meta-moblin package SRCREVs +# +SRCREV_pn-bickley ?= "de9431b7c6040bc3731157c05947159ad2c7a0a9" +SRCREV_pn-json-glib ?= "930fdf4c4dff1f5310a946c2a9f5b6860f7c8ba8" +SRCREV_pn-libccss ?= "92bc59e1d39302c8be500d53cb5dd8b05c2e4a15" +SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f" +SRCREV_pn-librest ?= "14d35103d9649dc1e10c3e9ac2c690b3165c8184" +SRCREV_pn-moblin-menus ?= "e1d63681739dd16195d005b3cf15752df294bd3c" +SRCREV_pn-mojito ?= "0542c4b0e26c0e3b69c5ad1fa1898dc276fb9f48" +SRCREV_pn-mozilla-headless-services ?= "c7873654894af6c7c6c01194d6185db46667b81f" +SRCREV_pn-mutter ?= "aff4cf110307e149d3497d20543cde27b9699758" +SRCREV_pn-twitter-glib ?= "849bec29292df88590e0b2898b50b9b8d766817e" +SRCREV_pn-xf86-video-psb ?= "b6b3bba06fe5a3fe0b1bd6e31a7369dd83812bab" + + + diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc index 394ec7c2d4..6a1f93bfb6 100644 --- a/conf/distro/include/angstrom-eglibc.inc +++ b/conf/distro/include/angstrom-eglibc.inc @@ -1,31 +1,29 @@ # eglibc: -PREFERRED_PROVIDER_virtual/libiconv = "eglibc" -PREFERRED_PROVIDER_virtual/libintl = "eglibc" -PREFERRED_PROVIDER_virtual/libc = "eglibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "eglibc-initial" +require conf/distro/include/eglibc.inc -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}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" +ANGSTROM_BLACKLIST_pn-libiconv = "the glibc builtin iconv replacement is used" -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']]}" +TARGET_OS = "linux" + +TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" +TARGET_OS .= "${@['','-gnuspe'][bb.data.getVar('TARGET_ARCH',d,1) in ['ppc', 'powerpc'] and bb.data.getVar('MACHINE',d) in ['calamari']]}" + +#TARGET_OS = "linux-gnuspe" #mess with compiler flags to use -Os instead of -O2 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info # perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616 # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os" -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -ggdb3" FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" -BUILD_OPTIMIZATION = "-Os" +BUILD_OPTIMIZATION = "-O2 -ggdb3" BUILD_OPTIMIZATION_pn-perl = "-O1" BUILD_OPTIMIZATION_sparc = "-O2" +TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel']]}" + CXXFLAGS += "-fvisibility-inlines-hidden" diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index a9e9f3f7eb..298e250362 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -1,45 +1,31 @@ # glibc: -PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" -PREFERRED_PROVIDER_virtual/libintl ?= "glibc" -PREFERRED_PROVIDER_virtual/libc ?= "glibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial" -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" +require conf/distro/include/glibc-${TOOLCHAIN_TYPE}.inc -#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" +ANGSTROM_BLACKLIST_pn-libiconv = "the glibc builtin iconv replacement is used" - -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']]}" +TARGET_OS = "linux" +TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" #mess with compiler flags to use -Os instead of -O2 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info # perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616 # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os" -FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -Os" - -FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -mfpu=neon -ftree-vectorize -mfloat-abi=softfp -frename-registers -fomit-frame-pointer -O2" -TARGET_CC_ARCH_pn-glibc_armv7a = " -O3 -fno-tree-vectorize -march=armv7a -frename-registers -fomit-frame-pointer -mfloat-abi=softfp -mfpu=vfp " +FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -O2 -ggdb3" FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" -FULL_OPTIMIZATION_pn-glibc-intermediate = "-O2" FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2" FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" +FULL_OPTIMIZATION_ep9312 = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O -fno-signed-zeros" + +# This is only used for -native packages +BUILD_OPTIMIZATION = "-O2 -g" +BUILD_OPTIMIZATION_pn-perl-native = "-O1 -g" -FULL_OPTIMIZATION_pn-glibc_armv7a = " -O3 -fno-tree-vectorize -march=armv7a -frename-registers -fomit-frame-pointer -mfloat-abi=softfp -mfpu=vfp " -CFLAGS_pn-glibc_armv7a = " -fexpensive-optimizations -O3 -fno-tree-vectorize -march=armv7a -frename-registers -fomit-frame-pointer -mfloat-abi=softfp -mfpu=vfp" +TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel']]}" -BUILD_OPTIMIZATION = "-Os" -BUILD_OPTIMIZATION_pn-perl = "-O1" -BUILD_OPTIMIZATION_pn-glibc-intermediate = "-O2" -BUILD_OPTIMIZATION_pn-glibc = "-O2" -BUILD_OPTIMIZATION_sparc = "-O2" +# Disable -Wl,as-needed for now till all the test come back OK +#require conf/distro/include/angstrom-ldflags.inc CXXFLAGS += "-fvisibility-inlines-hidden" diff --git a/conf/distro/include/angstrom-ldflags.inc b/conf/distro/include/angstrom-ldflags.inc new file mode 100644 index 0000000000..6c60568798 --- /dev/null +++ b/conf/distro/include/angstrom-ldflags.inc @@ -0,0 +1,26 @@ + +# Set as-need to an intermediate var... +ASNEEDED = "-Wl,--as-needed" + +# ...so we can blacklist it for recipes that break with it +ASNEEDED_pn-console-tools = "" +ASNEEDED_pn-distcc = "" +ASNEEDED_pn-openobex = "" +ASNEEDED_pn-icu = "" +ASNEEDED_pn-xserver-kdrive-xomap = "" +ASNEEDED_pn-minimo = "" +ASNEEDED_pn-pciutils = "" +ASNEEDED_pn-puzzles = "" +ASNEEDED_pn-dialer = "" +ASNEEDED_pn-pulseaudio = "" +ASNEEDED_pn-python = "" +ASNEEDED_pn-libproxy = "" +ASNEEDED_pn-libxsettings-client = "" +ASNEEDED_pn-libmatchbox = "" +ASNEEDED_pn-faac = "" +ASNEEDED_pn-wireless-tools = "" +ASNEEDED_pn-ffmpeg = "" + +# Append it to TARGET_LDLFLAGS +TARGET_LDFLAGS += "${ASNEEDED}" + diff --git a/conf/distro/include/angstrom-package-deb.inc b/conf/distro/include/angstrom-package-deb.inc index 3dbb175f93..e060bb1ccf 100644 --- a/conf/distro/include/angstrom-package-deb.inc +++ b/conf/distro/include/angstrom-package-deb.inc @@ -1,4 +1,4 @@ INHERIT += "package_deb" -PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native" -PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth" +PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "update-alternatives-cworth-native" +PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" diff --git a/conf/distro/include/angstrom-package-ipk.inc b/conf/distro/include/angstrom-package-ipk.inc index a33a4ad2b4..14206bda2d 100644 --- a/conf/distro/include/angstrom-package-ipk.inc +++ b/conf/distro/include/angstrom-package-ipk.inc @@ -1,5 +1,4 @@ INHERIT += "package_ipk" -PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native" -PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth" - +PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" +PREFERRED_PROVIDER_virtual/update-alternatives ?= ${PREFERRED_PROVIDER_opkg} diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index 4b68293faf..4ca68389f7 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -1,25 +1,21 @@ # uclibc: -#fix some iconv issues, needs to be adjusted when doing uclibc builds -PREFERRED_PROVIDER_virtual/libc = "uclibc" -PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" -PREFERRED_PROVIDER_virtual/libintl ?= "gettext" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" +require conf/distro/include/uclibc.inc PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" USE_NLS ?= "no" USE_NLS_glib-2.0 = "yes" +USE_NLS_glib-2.0-native = "yes" +USE_NLS_gcc-cross = "no" -TARGET_OS_UC = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" +TARGET_OS_UC = "linux${@['-uclibc','-uclibceabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" TARGET_OS = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARCH',d) in ['bfin']]}" #mess with compiler flags to use -Os instead of -O2 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" -BUILD_OPTIMIZATION = "-Os" +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb3" +BUILD_OPTIMIZATION = "-O2 -ggdb3" #Gcc will die with 'internal consistency error when using the above optimizations #with gcc-4.2.1-atmel.1.0.3 (and probably most other avr32 gcc ports). @@ -31,6 +27,7 @@ BUILD_OPTIMIZATION = "-Os" #Note that this testing was done without the gcc-pr32889.patch. FULL_OPTIMIZATION_avr32 = "-Os -fomit-frame-pointer" +TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'avr32']]}" CXXFLAGS += "-fvisibility-inlines-hidden" diff --git a/conf/distro/include/angstrom-uclinux-uclibc.inc b/conf/distro/include/angstrom-uclinux-uclibc.inc index 7d65fc1f02..92b8d8ba7e 100644 --- a/conf/distro/include/angstrom-uclinux-uclibc.inc +++ b/conf/distro/include/angstrom-uclinux-uclibc.inc @@ -1,18 +1,17 @@ # uclibc: -#fix some iconv issues, needs to be adjusted when doing uclibc builds -PREFERRED_PROVIDER_virtual/libc = "uclibc" -PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" -PREFERRED_PROVIDER_virtual/libintl ?= "gettext" +require conf/distro/include/uclibc.inc USE_NLS ?= "no" USE_NLS_glib-2.0 = "yes" +USE_NLS_glib-2.0-native = "yes" +USE_NLS_gcc-cross = "no" -TARGET_OS_UC = "uclinux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" +TARGET_OS_UC = "uclinux${@['-uclibc','-uclibceabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" |