summaryrefslogtreecommitdiffstats
path: root/meta/conf/distro
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-10 14:04:57 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-11 15:24:22 +0100
commite27f339a048c70a01642357ffb8bb79ed697eb00 (patch)
tree338c942cb5fb1b5c4b09af754d149a57df18c8c5 /meta/conf/distro
parent5a606efa34f494df8184da886bdd5f7e0dfcd639 (diff)
downloadpoky-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/distro')
-rw-r--r--meta/conf/distro/defaultsetup.conf23
-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
5 files changed, 41 insertions, 11 deletions
diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
new file mode 100644
index 0000000000..af5ef7b5a0
--- /dev/null
+++ b/meta/conf/distro/defaultsetup.conf
@@ -0,0 +1,23 @@
1include conf/distro/include/default-providers.inc
2include conf/distro/include/default-versions.inc
3include conf/distro/include/world-broken.inc
4
5TARGET_VENDOR ?= "-oecore"
6
7TARGET_FPU_arm ?= "soft"
8TARGET_FPU_armeb ?= "soft"
9
10TCMODE ?= "default"
11require conf/distro/include/tcmode-${TCMODE}.inc
12
13TCLIBC ?= "eglibc"
14require conf/distro/include/tclibc-${TCLIBC}.inc
15
16CACHE = "${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))]}"
17
18USER_CLASSES ?= ""
19PACKAGE_CLASSES ?= "package_ipk"
20INHERIT_INSANE ?= "insane"
21INHERIT_DISTRO ?= "debian devshell sstate license"
22INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_INSANE} ${INHERIT_DISTRO}"
23
diff --git a/meta/conf/distro/include/poky-eglibc.inc b/meta/conf/distro/include/tclibc-eglibc.inc
index 3d2c362baf..16625e3bf0 100644
--- a/meta/conf/distro/include/poky-eglibc.inc
+++ b/meta/conf/distro/include/tclibc-eglibc.inc
@@ -2,6 +2,10 @@
2# eglibc specific configuration 2# eglibc specific configuration
3# 3#
4 4
5TARGET_OS = "linux"
6TARGET_OS_arm = "linux-gnueabi"
7TARGET_OS_armeb = "linux-gnueabi"
8
5# Add glibc overrides to the overrides for eglibc. 9# Add glibc overrides to the overrides for eglibc.
6OVERRIDES .= ":libc-glibc" 10OVERRIDES .= ":libc-glibc"
7 11
@@ -17,8 +21,6 @@ PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk"
17PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "eglibc-nativesdk" 21PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "eglibc-nativesdk"
18PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk ?= "eglibc-initial-nativesdk" 22PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk ?= "eglibc-initial-nativesdk"
19 23
20TARGET_OS = "${GLIBCTARGETOS}"
21
22CXXFLAGS += "-fvisibility-inlines-hidden" 24CXXFLAGS += "-fvisibility-inlines-hidden"
23 25
24LIBC_DEPENDENCIES = "libsegfault \ 26LIBC_DEPENDENCIES = "libsegfault \
diff --git a/meta/conf/distro/include/poky-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc
index 4be712271a..79da9860e8 100644
--- a/meta/conf/distro/include/poky-glibc.inc
+++ b/meta/conf/distro/include/tclibc-glibc.inc
@@ -2,6 +2,10 @@
2# glibc specific configuration 2# glibc specific configuration
3# 3#
4 4
5TARGET_OS = "linux"
6TARGET_OS_arm = "linux-gnueabi"
7TARGET_OS_armeb = "linux-gnueabi"
8
5# Add glibc to the overrides. 9# Add glibc to the overrides.
6OVERRIDES =. "libc-glibc:" 10OVERRIDES =. "libc-glibc:"
7 11
@@ -16,8 +20,6 @@ PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "glibc-nativesdk"
16PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "glibc-nativesdk" 20PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "glibc-nativesdk"
17PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk ?= "glibc-initial-nativesdk" 21PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk ?= "glibc-initial-nativesdk"
18 22
19TARGET_OS = "${GLIBCTARGETOS}"
20
21CXXFLAGS += "-fvisibility-inlines-hidden" 23CXXFLAGS += "-fvisibility-inlines-hidden"
22 24
23LIBC_DEPENDENCIES = "\ 25LIBC_DEPENDENCIES = "\
diff --git a/meta/conf/distro/include/poky-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc
index def9dfe447..18748fa3a3 100644
--- a/meta/conf/distro/include/poky-uclibc.inc
+++ b/meta/conf/distro/include/tclibc-uclibc.inc
@@ -2,6 +2,10 @@
2# uclibc specific configuration 2# uclibc specific configuration
3# 3#
4 4
5TARGET_OS = "linux-uclibc"
6TARGET_OS_arm = "linux-uclibceabi"
7TARGET_OS_armeb = "linux-uclibceabi"
8
5# Add uclibc overrides to the overrides. 9# Add uclibc overrides to the overrides.
6OVERRIDES =. "libc-uclibc:" 10OVERRIDES =. "libc-uclibc:"
7 11
diff --git a/meta/conf/distro/include/poky-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 91985b3afc..909d802f89 100644
--- a/meta/conf/distro/include/poky-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -1,18 +1,16 @@
1# 1#
2# Poky's default configuration 2# Default toolchain configuration
3# 3#
4 4
5TARGET_VENDOR = "-poky" 5PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${TCLIBC}"
6
7PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${POKYLIBC}"
8PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" 6PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
9PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" 7PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
10PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate" 8PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
11PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" 9PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
12PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" 10PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
13PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime" 11PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime"
14PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${POKYLIBC}-initial" 12PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial"
15PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "${POKYLIBC}-nativesdk" 13PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "${TCLIBC}-nativesdk"
16 14
17PREFERRED_PROVIDER_virtual/gettext ??= "gettext" 15PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
18 16
@@ -50,6 +48,7 @@ PREFERRED_VERSION_elfutils ?= "0.148"
50# some packages using an archive format incompatible with earlier gzip 48# some packages using an archive format incompatible with earlier gzip
51PREFERRED_VERSION_gzip-native ?= "1.4" 49PREFERRED_VERSION_gzip-native ?= "1.4"
52 50
51# Setup suitable toolchain flags
53require conf/distro/include/as-needed.inc 52require conf/distro/include/as-needed.inc
54 53TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH', d, True) in ['mips', 'mipsel', 'mips64', 'mips64el']]}"
55 54