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>

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 8b6236e03ea8c6d49f9064e745dffe293026b293..c2927594b21eef58473b4c1bef9560920c348779 100644 (file)
--- 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 8da6c0a850a0a129df83f055a672856de7d3d84a..9f12f4da11e5b1ee76254c4d2011ef2ce943353b 100644 (file)
--- 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"