diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-10 14:04:57 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-11 15:24:22 +0100 |
commit | e27f339a048c70a01642357ffb8bb79ed697eb00 (patch) | |
tree | 338c942cb5fb1b5c4b09af754d149a57df18c8c5 /meta/conf | |
parent | 5a606efa34f494df8184da886bdd5f7e0dfcd639 (diff) | |
download | ast2050-yocto-poky-e27f339a048c70a01642357ffb8bb79ed697eb00.zip ast2050-yocto-poky-e27f339a048c70a01642357ffb8bb79ed697eb00.tar.gz |
distro: Add defaultsetup.conf, a set of default configuration providing sane overrridable default for commonly used options
The intent is to allow distros to share common core config but still allow
customisations. The core should work with no distro set but users
can still customise in any ways needed.
(From OE-Core rev: c0a148077ae27a1ef57c55ac22953c68d001af57)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/bitbake.conf | 4 | ||||
-rw-r--r-- | meta/conf/distro/defaultsetup.conf | 23 | ||||
-rw-r--r-- | meta/conf/distro/include/tclibc-eglibc.inc (renamed from meta/conf/distro/include/poky-eglibc.inc) | 6 | ||||
-rw-r--r-- | meta/conf/distro/include/tclibc-glibc.inc (renamed from meta/conf/distro/include/poky-glibc.inc) | 6 | ||||
-rw-r--r-- | meta/conf/distro/include/tclibc-uclibc.inc (renamed from meta/conf/distro/include/poky-uclibc.inc) | 4 | ||||
-rw-r--r-- | meta/conf/distro/include/tcmode-default.inc (renamed from meta/conf/distro/include/poky-default.inc) | 13 |
6 files changed, 42 insertions, 14 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index d843e70..d7c430a 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -627,10 +627,8 @@ include conf/build/${BUILD_SYS}.conf include conf/target/${TARGET_SYS}.conf include conf/machine/${MACHINE}.conf include conf/machine-sdk/${SDKMACHINE}.conf -include conf/distro/include/default-providers.inc -include conf/distro/include/default-versions.inc -include conf/distro/include/world-broken.inc include conf/distro/${DISTRO}.conf +include conf/distro/defaultsetup.conf include conf/documentation.conf require conf/sanity.conf require conf/abi_version.conf diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf new file mode 100644 index 0000000..af5ef7b --- /dev/null +++ b/meta/conf/distro/defaultsetup.conf @@ -0,0 +1,23 @@ +include conf/distro/include/default-providers.inc +include conf/distro/include/default-versions.inc +include conf/distro/include/world-broken.inc + +TARGET_VENDOR ?= "-oecore" + +TARGET_FPU_arm ?= "soft" +TARGET_FPU_armeb ?= "soft" + +TCMODE ?= "default" +require conf/distro/include/tcmode-${TCMODE}.inc + +TCLIBC ?= "eglibc" +require conf/distro/include/tclibc-${TCLIBC}.inc + +CACHE = "${TMPDIR}/cache/${TCMODE}-${TCLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}${@['', '/' + str(bb.data.getVar('SDKMACHINE', d, 1))][bool(bb.data.getVar('SDKMACHINE', d, 1))]}" + +USER_CLASSES ?= "" +PACKAGE_CLASSES ?= "package_ipk" +INHERIT_INSANE ?= "insane" +INHERIT_DISTRO ?= "debian devshell sstate license" +INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_INSANE} ${INHERIT_DISTRO}" + diff --git a/meta/conf/distro/include/poky-eglibc.inc b/meta/conf/distro/include/tclibc-eglibc.inc index 3d2c362..16625e3 100644 --- a/meta/conf/distro/include/poky-eglibc.inc +++ b/meta/conf/distro/include/tclibc-eglibc.inc @@ -2,6 +2,10 @@ # eglibc specific configuration # +TARGET_OS = "linux" +TARGET_OS_arm = "linux-gnueabi" +TARGET_OS_armeb = "linux-gnueabi" + # Add glibc overrides to the overrides for eglibc. OVERRIDES .= ":libc-glibc" @@ -17,8 +21,6 @@ PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk" PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "eglibc-nativesdk" PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk ?= "eglibc-initial-nativesdk" -TARGET_OS = "${GLIBCTARGETOS}" - CXXFLAGS += "-fvisibility-inlines-hidden" LIBC_DEPENDENCIES = "libsegfault \ diff --git a/meta/conf/distro/include/poky-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc index 4be7122..79da986 100644 --- a/meta/conf/distro/include/poky-glibc.inc +++ b/meta/conf/distro/include/tclibc-glibc.inc @@ -2,6 +2,10 @@ # glibc specific configuration # +TARGET_OS = "linux" +TARGET_OS_arm = "linux-gnueabi" +TARGET_OS_armeb = "linux-gnueabi" + # Add glibc to the overrides. OVERRIDES =. "libc-glibc:" @@ -16,8 +20,6 @@ PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "glibc-nativesdk" PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "glibc-nativesdk" PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk ?= "glibc-initial-nativesdk" -TARGET_OS = "${GLIBCTARGETOS}" - CXXFLAGS += "-fvisibility-inlines-hidden" LIBC_DEPENDENCIES = "\ diff --git a/meta/conf/distro/include/poky-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc index def9dfe..18748fa 100644 --- a/meta/conf/distro/include/poky-uclibc.inc +++ b/meta/conf/distro/include/tclibc-uclibc.inc @@ -2,6 +2,10 @@ # uclibc specific configuration # +TARGET_OS = "linux-uclibc" +TARGET_OS_arm = "linux-uclibceabi" +TARGET_OS_armeb = "linux-uclibceabi" + # Add uclibc overrides to the overrides. OVERRIDES =. "libc-uclibc:" diff --git a/meta/conf/distro/include/poky-default.inc b/meta/conf/distro/include/tcmode-default.inc index 91985b3..909d802 100644 --- a/meta/conf/distro/include/poky-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -1,18 +1,16 @@ # -# Poky's default configuration +# Default toolchain configuration # -TARGET_VENDOR = "-poky" - -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${POKYLIBC}" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${TCLIBC}" 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" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${POKYLIBC}-initial" -PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "${POKYLIBC}-nativesdk" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial" +PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "${TCLIBC}-nativesdk" PREFERRED_PROVIDER_virtual/gettext ??= "gettext" @@ -50,6 +48,7 @@ PREFERRED_VERSION_elfutils ?= "0.148" # some packages using an archive format incompatible with earlier gzip PREFERRED_VERSION_gzip-native ?= "1.4" +# Setup suitable toolchain flags require conf/distro/include/as-needed.inc - +TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH', d, True) in ['mips', 'mipsel', 'mips64', 'mips64el']]}" |