diff options
Diffstat (limited to 'conf/distro')
58 files changed, 1800 insertions, 1317 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index ceec39f8d0..85d6f3f48a 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -2,23 +2,28 @@ #@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: 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 = "2" -DISTRO_PR = ".3" +DISTRO_REVISION = "3" +DISTRO_PR = ".5" OLDEST_KERNEL ?= "2.6.16" @@ -36,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 @@ -70,28 +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.30, these have had the most testing. PREFERRED_VERSION_glibc ?= "2.9" PREFERRED_VERSION_glibc-initial ?= "2.9" -PREFERRED_VERSION_uclibc ?= "0.9.30" -PREFERRED_VERSION_uclibc-initial ?= "0.9.30" - -# Preferred provider for virtual/psplash -# This enforces a specific brand to be used, in our case the angstrom -# one. In case you want to change the logo or something like that we -# suggest you to create another recipe (e.g: psplash-<brand>) for that -# and add that into your image. -# You can also opt to change or override this line, but that isn't -# needed because psplash is using update-alternatives. -PREFERRED_PROVIDER_virtual/psplash ?= "psplash-angstrom" - -PREFERRED_PROVIDER_avahi = "avahi" -PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat" -PREFERRED_PROVIDER_virtual/gail ?= "gtk+" - -PREFERRED_PROVIDER_libfribidi = "fribidi" +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" @@ -102,15 +96,20 @@ ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1" ANGSTROM_GCC_VERSION_bfin = "4.1.2" # 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_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.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}" @@ -128,82 +127,29 @@ 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" - -# 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_opkg ?= "opkg-nogpg" -PREFERRED_PROVIDER_libxss = "libxss" -PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils" -PREFERRED_PROVIDER_bluez-libs = "bluez4" -PREFERRED_PROVIDER_bluez-utils = "bluez4" -PREFERRED_PROVIDER_util-linux = "util-linux-ng" +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" -# 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+" - -# QT stuff: -# There are several flavours of qt4x11 in OE, so lets pick one that is buildable for everyone -PREFERRED_PROVIDER_qt4x11 ?= "qt4-x11-free" - -#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 - +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 angstrom-version ${ANGSTROM_FEED_CONFIGS}" +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" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_xserver ?= "xserver-xorg" # do some task-base stuff here diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf index d773de449a..448931b8bf 100644 --- a/conf/distro/chinook-compat.conf +++ b/conf/distro/chinook-compat.conf @@ -21,6 +21,10 @@ DISTRO_TYPE = "debug" # 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" @@ -54,6 +58,8 @@ 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" @@ -129,6 +135,7 @@ 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_libx11 = "1.1.5" PREFERRED_VERSION_libgnomeui = "2.18.1" diff --git a/conf/distro/corecdp.conf b/conf/distro/corecdp.conf new file mode 100644 index 0000000000..39ca74a170 --- /dev/null +++ b/conf/distro/corecdp.conf @@ -0,0 +1,43 @@ +#@TYPE: Distribution +#@NAME: CoreCDP <http://www.multitech.net> +#@DESCRIPTION: CoreCDP Linux Distribution for the MTCDP Cellular Development Platform +#@MAINTAINER: Multi-Tech Systems <oe-devel@multitech.net> + +# Angstrom-based distribution by Multi-Tech Systems, Inc. +require conf/distro/angstrom-2008.1.conf + +# allow use of amend.inc files in FILESPATH to add to existing recipes +require conf/amend-recipes.inc + +DISTRO_NAME = "CoreCDP" +DISTRO = "corecdp" +DISTRO_VERSION = "1.1.1" +DISTRO_TYPE = "release" +TARGET_VENDOR = "-corecdp" +BUILDNAME = "${DISTRO_NAME} ${DISTRO_VERSION}" + +# Add Multi-Tech mirror for source download as a backup +INHERIT += "corecdp-mirrors" + +IPKG_VARIANT = "opkg-nogpg-nocurl corecdp-version" + +# use busybox instead of tinylogin +IMAGE_LOGIN_MANAGER = "busybox" + +DEFAULT_TIMEZONE = "America/Chicago" + +# Java versions that work together +# initial verions +PREFERRED_VERSION_jamvm-initial ?= "1.4.5" +PREFERRED_VERSION_classpath-initial ?= "0.93" + +# native versions +PREFERRED_VERSION_jamvm-native ?= "1.5.3" +PREFERRED_VERSION_classpath-native ?= "0.98" + +# target device +PREFERRED_VERSION_jamvm ?= "1.5.2" +PREFERRED_VERSION_classpath ?= "0.98" + +# don't build bluez4 and the large amount of deps just for libpcap +PREFERRED_PROVIDER_libpcap = "libpcap-nobluetooth" diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc index 1deb85d7f7..6741bae3e1 100644 --- a/conf/distro/include/angstrom-2007-for-openmoko.inc +++ b/conf/distro/include/angstrom-2007-for-openmoko.inc @@ -143,8 +143,8 @@ 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" diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 32cfbfb403..18df733fa1 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -1,46 +1,53 @@ +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.0" -PREFERRED_VERSION_dbus = "1.2.1" +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.21.4" -PREFERRED_VERSION_glib-2.0-native = "2.18.0" -PREFERRED_VERSION_glibmm = "2.18.0" -PREFERRED_VERSION_glproto = "1.4.9" +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_gtk+ = "2.16.4" -PREFERRED_VERSION_gtkmm = "2.14.1" +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.11" +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_libx11 = "1.2" -PREFERRED_VERSION_mesa = "7.2" +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.1" -PREFERRED_VERSION_samba = "3.3.0" +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_util-macros-native = "1.2.1" -PREFERRED_VERSION_util-macros = "1.2.1" -PREFERRED_VERSION_wpa-supplicant = "0.6.7" +PREFERRED_VERSION_wpa-supplicant = "0.6.9" PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" -PREFERRED_VERSION_xserver-xorg = "1.6.1" # # meta-moblin package SRCREVs diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc index e947833453..6a1f93bfb6 100644 --- a/conf/distro/include/angstrom-eglibc.inc +++ b/conf/distro/include/angstrom-eglibc.inc @@ -1,9 +1,12 @@ # eglibc: require conf/distro/include/eglibc.inc -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']]}" +ANGSTROM_BLACKLIST_pn-libiconv = "the glibc builtin iconv replacement is used" -TARGET_OS = "linux${@['','-gnuspe'][bb.data.getVar('TARGET_ARCH',d,1) in ['ppc', 'powerpc'] and bb.data.getVar('MACHINE',d) in ['calamari']]}" +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" @@ -12,7 +15,7 @@ TARGET_OS = "linux${@['','-gnuspe'][bb.data.getVar('TARGET_ARCH',d,1) in ['ppc', # 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 -O2 -ggdb3" +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" diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index 287bd9bd77..298e250362 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -1,9 +1,10 @@ # glibc: -require conf/distro/include/glibc.inc +require conf/distro/include/glibc-${TOOLCHAIN_TYPE}.inc -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" +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 @@ -23,5 +24,8 @@ BUILD_OPTIMIZATION_pn-perl-native = "-O1 -g" TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel']]}" +# 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 a60952ff06..4ca68389f7 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -9,7 +9,7 @@ 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 diff --git a/conf/distro/include/angstrom-uclinux-uclibc.inc b/conf/distro/include/angstrom-ucl |