From f64a1078a20b1c62ddf5a9e6c9d405eb3281aa9e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 25 Apr 2015 10:07:17 +0000 Subject: [PATCH] angstrom.conf: Adjust the preferred providers for toolchain Lets not mix linaro and non linaro toolchains so let linaro toolchain fill in gaps for nativesdk when needed Signed-off-by: Khem Raj --- conf/distro/angstrom.conf | 39 +++++++++++++-------------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf index f3663f1..5b2c7e2 100644 --- a/conf/distro/angstrom.conf +++ b/conf/distro/angstrom.conf @@ -49,53 +49,40 @@ IMAGE_LINGUAS ?= '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-us", d) # set feed path variables FEED_BASEPATH = "feeds/next/${ANGSTROM_PKG_FORMAT}/${TCLIBC}/" -#This is unrelated to the kernel version, but userspace apps (e.g. udev/systemd) require a recent version to build against -LINUX_LIBC_HEADERS_VERSION ?= "3.19%" -PREFERRED_VERSION_linux-libc-headers = "${LINUX_LIBC_HEADERS_VERSION}" -PREFERRED_VERSION_linux-libc-headers-native = "${LINUX_LIBC_HEADERS_VERSION}" -PREFERRED_VERSION_nativesdk-linux-libc-headers = "${LINUX_LIBC_HEADERS_VERSION}" #Everybody else can just use this: ANGSTROM_GCC_VERSION ?= "4.9%" ANGSTROM_BINUTILS_VERSION ?= "2.25%" ANGSTROM_GDB_VERSION ?= "7.9%" ANGSTROM_NATIVE_BINUTILS_VERSION ?= "2.25%" + #use Linaro tools for ARM ANGSTROM_GCC_VERSION_arm ?= "linaro-4.9%" -ANGSTROM_GCC_VERSION_aarch64 ?= "linaro-4.9%" -# we use OE-Core for native and nativesdk GCC ANGSTROM_BINUTILS_VERSION_arm ?= "linaro-%" -ANGSTROM_BINUTILS_VERSION_aarch64 ?= "linaro-%" +GLIBCVERSION_arm ?= "linaro-2.2%" ANGSTROM_GDB_VERSION_arm ?= "linaro-%" +ANGSTROM_GCC_VERSION_aarch64 ?= "linaro-4.9%" +ANGSTROM_BINUTILS_VERSION_aarch64 ?= "linaro-%" ANGSTROM_GDB_VERSION_aarch64 ?= "linaro-%" -PREFERRED_VERSION_glibc_arm ?= "linaro-2.2%" -PREFERRED_VERSION_glibc_aarch64 ?= "linaro-2.2%" +GLIBCVERSION_aarch64 ?= "linaro-2.2%" ANGSTROM_QEMU_VERSION ?= "2%" GCCVERSION = "${ANGSTROM_GCC_VERSION}" BINUVERSION = "${ANGSTROM_BINUTILS_VERSION}" -PREFERRED_VERSION_binutils-native ?= "${ANGSTROM_NATIVE_BINUTILS_VERSION}" -PREFERRED_VERSION_nativesdk-binutils ?= "${ANGSTROM_NATIVE_BINUTILS_VERSION}" -PREFERRED_VERSION_cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${ANGSTROM_NATIVE_BINUTILS_VERSION}" +GDBVERSION = "${ANGSTROM_GDB_VERSION}" +PREFERRED_VERSION_qemu = "${ANGSTROM_QEMU_VERSION}" +PREFERRED_VERSION_qemu-native = "${ANGSTROM_QEMU_VERSION}" +PREFERRED_VERSION_nativesdk-qemu = "${ANGSTROM_QEMU_VERSION}" -PREFERRED_VERSION_gdb ?= "${ANGSTROM_GDB_VERSION}" -PREFERRED_VERSION_gdb-cross ?= "${ANGSTROM_GDB_VERSION}" -PREFERRED_VERSION_gdb-cross-canadian ?= "${ANGSTROM_GDB_VERSION}" -PREFERRED_VERSION_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${ANGSTROM_GDB_VERSION}" - -PREFERRED_VERSION_qemu = "${ANGSTROM_QEMU_VERSION}" -PREFERRED_VERSION_qemu-native = "${ANGSTROM_QEMU_VERSION}" -PREFERRED_VERSION_nativesdk-qemu = "${ANGSTROM_QEMU_VERSION}" - -PREFERRED_PROVIDER_dbus-glib = "dbus-glib" -PREFERRED_PROVIDER-gconf-dbus = "gconf" -PREFERRED_PROVIDER_hotplug = "systemd" +PREFERRED_PROVIDER_dbus-glib = "dbus-glib" +PREFERRED_PROVIDER-gconf-dbus = "gconf" +PREFERRED_PROVIDER_hotplug = "systemd" PREFERRED_PROVIDER_opkg ?= "opkg" PREFERRED_PROVIDER_opkg-native ?= "opkg-native" # Prefer gummiboot over grub -EFI_PROVIDER = "gummiboot" +EFI_PROVIDER = "gummiboot" # blacklist policy