summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-05-13 14:45:38 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-17 15:11:14 +0100
commit7b3e1e0f8e31a1a20ba600bdc66fe4455e98c8f6 (patch)
tree6b98c1e72ffeb9771068501468710b5c28a151ad
parent600dbb7cb384c2290af38b993a9bea3a4dfc4494 (diff)
downloadopenembedded-core-contrib-7b3e1e0f8e31a1a20ba600bdc66fe4455e98c8f6.tar.gz
openembedded-core-contrib-7b3e1e0f8e31a1a20ba600bdc66fe4455e98c8f6.tar.bz2
openembedded-core-contrib-7b3e1e0f8e31a1a20ba600bdc66fe4455e98c8f6.zip
bitbake.conf: set TARGET_VENDOR to '-oe' and remove it from defaultsetup.conf
* -oecore was changed to -oe to be more consistent with SDK_VENDOR as we had -oesdk as SDK_VENDOR and not -oecoresdk Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/conf/distro/defaultsetup.conf2
2 files changed, 1 insertions, 3 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 8b6236e03e..c2927594b2 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -78,7 +78,7 @@ HOST_EXEEXT = ""
TARGET_ARCH = "INVALID"
TARGET_OS = "INVALID"
-TARGET_VENDOR = "${BUILD_VENDOR}"
+TARGET_VENDOR = "-oe"
TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}"
TARGET_PREFIX = "${TARGET_SYS}-"
TARGET_CC_ARCH = ""
diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
index 8da6c0a850..9f12f4da11 100644
--- a/meta/conf/distro/defaultsetup.conf
+++ b/meta/conf/distro/defaultsetup.conf
@@ -3,8 +3,6 @@ include conf/distro/include/default-versions.inc
include conf/distro/include/default-distrovars.inc
include conf/distro/include/world-broken.inc
-TARGET_VENDOR ?= "-oecore"
-
TARGET_FPU_arm ?= "soft"
TARGET_FPU_armeb ?= "soft"