[PATCH 0/1] Pull request for TARGET_VENDOR fix

[PATCH 0/1] Pull request for TARGET_VENDOR fix

[Martin Jansa]

Pull URL: git://git.openembedded.org/openembedded-core-contrib
  Branch: jansa/pull
  Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull

Thanks,
    Martin Jansa <Martin.Jansa@gmail.com>
---


Martin Jansa (1):
  bitbake.conf: set TARGET_VENDOR to '-oe' and remove it from
    defaultsetup.conf

 meta/conf/bitbake.conf             |    2 +-
 meta/conf/distro/defaultsetup.conf |    2 --
 2 files changed, 1 insertions(+), 3 deletions(-)

-- 
1.7.5.rc3

[PATCH 1/1] bitbake.conf: set TARGET_VENDOR to '-oe' and remove it from defaultsetup.conf

[Martin Jansa]

* -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>
---
 meta/conf/bitbake.conf             |    2 +-
 meta/conf/distro/defaultsetup.conf |    2 --
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 8b6236e..c292759 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 8da6c0a..9f12f4d 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"
 
-- 
1.7.5.rc3

Re: [PATCH 0/1] Pull request for TARGET_VENDOR fix

[Richard Purdie]

On Tue, 2011-05-17 at 08:22 +0200, Martin Jansa wrote:
> Pull URL: git://git.openembedded.org/openembedded-core-contrib
>   Branch: jansa/pull
>   Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull
> 
> Thanks,
>     Martin Jansa <Martin.Jansa@gmail.com>
> ---
> 
> 
> Martin Jansa (1):
>   bitbake.conf: set TARGET_VENDOR to '-oe' and remove it from
>     defaultsetup.conf

Merged to master, thanks.

Richard