sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Richard Purdie 2011-05-10 14:04:57 +01:00
parent 5a606efa34
commit e27f339a04
7 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
meta-yocto/conf/distro/poky.conf
View File

@ -6,21 +6,7 @@ SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
MAINTAINER = "Poky <poky@yoctoproject.org>"
USER_CLASSES ?= ""
PACKAGE_CLASSES ?= "package_ipk"
INHERIT_INSANE ?= "insane"
INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} debian devshell ${INHERIT_INSANE} sstate license"
# For some reason, this doesn't work
# TARGET_OS ?= "linux"
# TARGET_VENDOR ?= "-poky"
# Set by POKYMODE instead
TARGET_OS = "linux"
TARGET_FPU_arm ?= "soft"
TARGET_FPU_armeb ?= "soft"
TARGET_FPU_nokia800 = "hard"
TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH', d, True) in ['mips', 'mipsel', 'mips64', 'mips64el']]}"
TARGET_VENDOR = "-poky"
QA_LOGFILE = "${TMPDIR}/qa.log"
@ -31,28 +17,13 @@ LOCALCONF_VERSION = "1"
OEINCLUDELOGS = "yes"
KERNEL_CONSOLE = "ttyS0"
# Default to TARGETOS values for EABI on arm
GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
UCLIBCTARGETOS = "linux${@['-uclibc','-uclibceabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
POKYMODE ?= "default"
require conf/distro/include/poky-${POKYMODE}.inc
POKYLIBC ?= "eglibc"
require conf/distro/include/poky-${POKYLIBC}.inc
SDK_NAME = "${DISTRO}-${POKYLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + 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))]}"
require conf/distro/include/preferred-xorg-versions.inc
PCMCIA_MANAGER ?= "pcmciautils"
#IMAGE_LINGUAS ?= "en-gb en-us"
#LIMIT_BUILT_LOCALES ?= "en_GB en_US"
IMAGE_LINGUAS ?= "en-us en-gb"
LIMIT_BUILT_LOCALES ?= "POSIX en_US en_GB"
ENABLE_BINARY_LOCALE_GENERATION ?= "1"

4
meta/conf/bitbake.conf
View File

@ -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

23
meta/conf/distro/defaultsetup.conf Normal file
View File

@ -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}"

6
meta/conf/distro/include/poky-eglibc.inc → meta/conf/distro/include/tclibc-eglibc.inc
View File

@ -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 \

6
meta/conf/distro/include/poky-glibc.inc → meta/conf/distro/include/tclibc-glibc.inc
View File

@ -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 = "\

4
meta/conf/distro/include/poky-uclibc.inc → meta/conf/distro/include/tclibc-uclibc.inc
View File

@ -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:"

13
meta/conf/distro/include/poky-default.inc → meta/conf/distro/include/tcmode-default.inc
View File

@ -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']]}"