From 589a797e9846f97a35b9a68ef76f37df35ada007 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Jan 2010 22:12:58 +0000 Subject: conf/distro/poky: Rename poky-eabi to poky-default to make more sense Signed-off-by: Richard Purdie --- meta/conf/distro/include/poky-default.inc | 53 +++++++++++++++++++++++++++++++ meta/conf/distro/include/poky-eabi.inc | 53 ------------------------------- meta/conf/distro/poky.conf | 4 +-- 3 files changed, 55 insertions(+), 55 deletions(-) create mode 100644 meta/conf/distro/include/poky-default.inc delete mode 100644 meta/conf/distro/include/poky-eabi.inc (limited to 'meta/conf/distro') diff --git a/meta/conf/distro/include/poky-default.inc b/meta/conf/distro/include/poky-default.inc new file mode 100644 index 0000000000..a0dc10196b --- /dev/null +++ b/meta/conf/distro/include/poky-default.inc @@ -0,0 +1,53 @@ +# +# Poky's default configuration +# + +TARGET_VENDOR = "-poky" + +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" +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" + +GCCVERSION ?= "4.3.3" +BINUVERSION ?= "2.18" +GLIBCVERSION ?= "2.6.1" +LINUXLIBCVERSION ?= "2.6.29" + +# Temporary preferred version overrides for PPC +GCCVERSION_powerpc ?= "4.2.3" +BINUVERSION_powerpc ?= "2.19" +GLIBCVERSION_powerpc ?= "2.6.1" +LINUXLIBCVERSION_powerpc ?= "2.6.20" +PREFERRED_VERSION_u-boot-mkimage-native_powerpc ?= "2009.08" +PREFERRED_VERSION_udev_powerpc ?= "124" + +# Temporary preferred version overrides for mips +GLIBCVERSION_mips ?= "2.9" + +PREFERRED_VERSION_gcc ?= "${GCCVERSION}" +PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}" +PREFERRED_VERSION_gcc-cross-initial ?= "${GCCVERSION}" +PREFERRED_VERSION_gcc-cross-intermediate ?= "${GCCVERSION}" +PREFERRED_VERSION_gcc-cross-sdk ?= "${GCCVERSION}" +PREFERRED_VERSION_gcc-crosssdk ?= "${GCCVERSION}" +PREFERRED_VERSION_gcc-crosssdk-initial ?= "${GCCVERSION}" +PREFERRED_VERSION_gcc-crosssdk-intermediate ?= "${GCCVERSION}" +PREFERRED_VERSION_gcc-cross-canadian ?= "${GCCVERSION}" +PREFERRED_VERSION_binutils ?= "${BINUVERSION}" +PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}" +PREFERRED_VERSION_binutils-crosssdk ?= "${BINUVERSION}" +PREFERRED_VERSION_binutils-cross-canadian ?= "${BINUVERSION}" +PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}" +PREFERRED_VERSION_linux-libc-headers-nativesdk ?= "${LINUXLIBCVERSION}" +PREFERRED_VERSION_glibc ?= "${GLIBCVERSION}" +PREFERRED_VERSION_glibc-nativesdk ?= "${GLIBCVERSION}" +PREFERRED_VERSION_glibc-initial ?= "${GLIBCVERSION}" +PREFERRED_VERSION_glibc-initial-nativesdk ?= "${GLIBCVERSION}" +PREFERRED_VERSION_elfutils ?= "0.131" + +require conf/distro/include/as-needed.inc + + diff --git a/meta/conf/distro/include/poky-eabi.inc b/meta/conf/distro/include/poky-eabi.inc deleted file mode 100644 index a0dc10196b..0000000000 --- a/meta/conf/distro/include/poky-eabi.inc +++ /dev/null @@ -1,53 +0,0 @@ -# -# Poky's default configuration -# - -TARGET_VENDOR = "-poky" - -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" -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" - -GCCVERSION ?= "4.3.3" -BINUVERSION ?= "2.18" -GLIBCVERSION ?= "2.6.1" -LINUXLIBCVERSION ?= "2.6.29" - -# Temporary preferred version overrides for PPC -GCCVERSION_powerpc ?= "4.2.3" -BINUVERSION_powerpc ?= "2.19" -GLIBCVERSION_powerpc ?= "2.6.1" -LINUXLIBCVERSION_powerpc ?= "2.6.20" -PREFERRED_VERSION_u-boot-mkimage-native_powerpc ?= "2009.08" -PREFERRED_VERSION_udev_powerpc ?= "124" - -# Temporary preferred version overrides for mips -GLIBCVERSION_mips ?= "2.9" - -PREFERRED_VERSION_gcc ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-cross-initial ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-cross-intermediate ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-cross-sdk ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-crosssdk ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-crosssdk-initial ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-crosssdk-intermediate ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-cross-canadian ?= "${GCCVERSION}" -PREFERRED_VERSION_binutils ?= "${BINUVERSION}" -PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}" -PREFERRED_VERSION_binutils-crosssdk ?= "${BINUVERSION}" -PREFERRED_VERSION_binutils-cross-canadian ?= "${BINUVERSION}" -PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}" -PREFERRED_VERSION_linux-libc-headers-nativesdk ?= "${LINUXLIBCVERSION}" -PREFERRED_VERSION_glibc ?= "${GLIBCVERSION}" -PREFERRED_VERSION_glibc-nativesdk ?= "${GLIBCVERSION}" -PREFERRED_VERSION_glibc-initial ?= "${GLIBCVERSION}" -PREFERRED_VERSION_glibc-initial-nativesdk ?= "${GLIBCVERSION}" -PREFERRED_VERSION_elfutils ?= "0.131" - -require conf/distro/include/as-needed.inc - - diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index ccbd4869b6..2bf4be8c04 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -48,11 +48,11 @@ KERNEL_CONSOLE = "ttyS0" #DEBUG_BUILD = "1" #INHIBIT_PACKAGE_STRIP = "1" -# Default to TARGETOS values for EABI +# Default to TARGETOS values for EABI on arm GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" -POKYMODE ?= "eabi" +POKYMODE ?= "default" require conf/distro/include/poky-${POKYMODE}.inc POKYLIBC ?= "glibc" -- cgit v1.2.3-54-g00ecf