summaryrefslogtreecommitdiffstats
path: root/meta-yocto/conf
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-yocto/conf
parent5a606efa34f494df8184da886bdd5f7e0dfcd639 (diff)
downloadast2050-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-yocto/conf')
-rw-r--r--meta-yocto/conf/distro/poky.conf33
1 files changed, 2 insertions, 31 deletions
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index 9680746..f13a67f 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -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"
OpenPOWER on IntegriCloud