Patchwork [09/15] bitbake.conf: move VENDOR variables from bitbake.conf to defaultsetup.conf

login
register
mail settings
Submitter Saul Wold
Date May 15, 2011, 1:32 a.m.
Message ID <51c904d03751c96d848617bb425f85635c33be87.1305422996.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/4045/
State New, archived
Headers show

Comments

Saul Wold - May 15, 2011, 1:32 a.m.
From: Martin Jansa <Martin.Jansa@gmail.com>

* empty TARGET_VENDOR was set before weak assignment in 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>
---
 meta/conf/bitbake.conf             |    4 ----
 meta/conf/distro/defaultsetup.conf |    5 ++++-
 2 files changed, 4 insertions(+), 5 deletions(-)
Richard Purdie - May 16, 2011, 2:24 p.m.
On Sat, 2011-05-14 at 18:32 -0700, Saul Wold wrote:
> From: Martin Jansa <Martin.Jansa@gmail.com>
> 
> * empty TARGET_VENDOR was set before weak assignment in 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>

I know I probably indicated otherwise but looking at this patch, I think
moving all these entries into distrosetup.conf is not desirable. The
real issue here is the default:

TARGET_VENDOR = "${BUILD_VENDOR}"

which when you think about it doesn't actually make much sense. I'm
happy for the default just to become:

TARGET_VENDOR = "-oe"

in bitbake.conf.

Cheers,

Richard


> ---
>  meta/conf/bitbake.conf             |    4 ----
>  meta/conf/distro/defaultsetup.conf |    5 ++++-
>  2 files changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 7c72de1..418a15d 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -62,7 +62,6 @@ target_datadir := "${datadir}"
>  
>  BUILD_ARCH = "${@os.uname()[4]}"
>  BUILD_OS = "${@os.uname()[0].lower()}"
> -BUILD_VENDOR = ""
>  BUILD_SYS = "${BUILD_ARCH}${BUILD_VENDOR}-${BUILD_OS}"
>  BUILD_PREFIX = ""
>  BUILD_CC_ARCH = ""
> @@ -70,7 +69,6 @@ BUILD_EXEEXT = ""
>  
>  HOST_ARCH = "${TARGET_ARCH}"
>  HOST_OS = "${TARGET_OS}"
> -HOST_VENDOR = "${TARGET_VENDOR}"
>  HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}"
>  HOST_PREFIX = "${TARGET_PREFIX}"
>  HOST_CC_ARCH = "${TARGET_CC_ARCH}"
> @@ -78,14 +76,12 @@ HOST_EXEEXT = ""
>  
>  TARGET_ARCH = "INVALID"
>  TARGET_OS = "INVALID"
> -TARGET_VENDOR = "${BUILD_VENDOR}"
>  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 = ""
>  
>  SDK_ARCH = "${BUILD_ARCH}"
>  SDK_OS = "${BUILD_OS}"
> -SDK_VENDOR = "-oesdk"
>  SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + bb.data.getVar('SDK_OS', d, 1), ''][bb.data.getVar('SDK_OS', d, 1) == ('' or 'custom')]}"
>  SDK_PREFIX = "${SDK_SYS}-"
>  SDK_CC_ARCH = "${BUILD_CC_ARCH}"
> diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
> index 8da6c0a..dd9ffc3 100644
> --- a/meta/conf/distro/defaultsetup.conf
> +++ b/meta/conf/distro/defaultsetup.conf
> @@ -3,7 +3,10 @@ include conf/distro/include/default-versions.inc
>  include conf/distro/include/default-distrovars.inc
>  include conf/distro/include/world-broken.inc
>  
> -TARGET_VENDOR ?= "-oecore"
> +BUILD_VENDOR ?= ""
> +TARGET_VENDOR ?= "-oe"
> +HOST_VENDOR ?= "${TARGET_VENDOR}"
> +SDK_VENDOR ?= "-oesdk"
>  
>  TARGET_FPU_arm ?= "soft"
>  TARGET_FPU_armeb ?= "soft"
Khem Raj - May 16, 2011, 4:57 p.m.
On Mon, May 16, 2011 at 7:24 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Sat, 2011-05-14 at 18:32 -0700, Saul Wold wrote:
>> From: Martin Jansa <Martin.Jansa@gmail.com>
>>
>> * empty TARGET_VENDOR was set before weak assignment in 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>
>
> I know I probably indicated otherwise but looking at this patch, I think
> moving all these entries into distrosetup.conf is not desirable. The
> real issue here is the default:
>
> TARGET_VENDOR = "${BUILD_VENDOR}"
>
> which when you think about it doesn't actually make much sense. I'm
> happy for the default just to become:
>
> TARGET_VENDOR = "-oe"
>
> in bitbake.conf.

that sounds a good solution.

>
> Cheers,
>
> Richard
>
>
>> ---
>>  meta/conf/bitbake.conf             |    4 ----
>>  meta/conf/distro/defaultsetup.conf |    5 ++++-
>>  2 files changed, 4 insertions(+), 5 deletions(-)
>>
>> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
>> index 7c72de1..418a15d 100644
>> --- a/meta/conf/bitbake.conf
>> +++ b/meta/conf/bitbake.conf
>> @@ -62,7 +62,6 @@ target_datadir := "${datadir}"
>>
>>  BUILD_ARCH = "${@os.uname()[4]}"
>>  BUILD_OS = "${@os.uname()[0].lower()}"
>> -BUILD_VENDOR = ""
>>  BUILD_SYS = "${BUILD_ARCH}${BUILD_VENDOR}-${BUILD_OS}"
>>  BUILD_PREFIX = ""
>>  BUILD_CC_ARCH = ""
>> @@ -70,7 +69,6 @@ BUILD_EXEEXT = ""
>>
>>  HOST_ARCH = "${TARGET_ARCH}"
>>  HOST_OS = "${TARGET_OS}"
>> -HOST_VENDOR = "${TARGET_VENDOR}"
>>  HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}"
>>  HOST_PREFIX = "${TARGET_PREFIX}"
>>  HOST_CC_ARCH = "${TARGET_CC_ARCH}"
>> @@ -78,14 +76,12 @@ HOST_EXEEXT = ""
>>
>>  TARGET_ARCH = "INVALID"
>>  TARGET_OS = "INVALID"
>> -TARGET_VENDOR = "${BUILD_VENDOR}"
>>  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 = ""
>>
>>  SDK_ARCH = "${BUILD_ARCH}"
>>  SDK_OS = "${BUILD_OS}"
>> -SDK_VENDOR = "-oesdk"
>>  SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + bb.data.getVar('SDK_OS', d, 1), ''][bb.data.getVar('SDK_OS', d, 1) == ('' or 'custom')]}"
>>  SDK_PREFIX = "${SDK_SYS}-"
>>  SDK_CC_ARCH = "${BUILD_CC_ARCH}"
>> diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
>> index 8da6c0a..dd9ffc3 100644
>> --- a/meta/conf/distro/defaultsetup.conf
>> +++ b/meta/conf/distro/defaultsetup.conf
>> @@ -3,7 +3,10 @@ include conf/distro/include/default-versions.inc
>>  include conf/distro/include/default-distrovars.inc
>>  include conf/distro/include/world-broken.inc
>>
>> -TARGET_VENDOR ?= "-oecore"
>> +BUILD_VENDOR ?= ""
>> +TARGET_VENDOR ?= "-oe"
>> +HOST_VENDOR ?= "${TARGET_VENDOR}"
>> +SDK_VENDOR ?= "-oesdk"
>>
>>  TARGET_FPU_arm ?= "soft"
>>  TARGET_FPU_armeb ?= "soft"
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Patch

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 7c72de1..418a15d 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -62,7 +62,6 @@  target_datadir := "${datadir}"
 
 BUILD_ARCH = "${@os.uname()[4]}"
 BUILD_OS = "${@os.uname()[0].lower()}"
-BUILD_VENDOR = ""
 BUILD_SYS = "${BUILD_ARCH}${BUILD_VENDOR}-${BUILD_OS}"
 BUILD_PREFIX = ""
 BUILD_CC_ARCH = ""
@@ -70,7 +69,6 @@  BUILD_EXEEXT = ""
 
 HOST_ARCH = "${TARGET_ARCH}"
 HOST_OS = "${TARGET_OS}"
-HOST_VENDOR = "${TARGET_VENDOR}"
 HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}"
 HOST_PREFIX = "${TARGET_PREFIX}"
 HOST_CC_ARCH = "${TARGET_CC_ARCH}"
@@ -78,14 +76,12 @@  HOST_EXEEXT = ""
 
 TARGET_ARCH = "INVALID"
 TARGET_OS = "INVALID"
-TARGET_VENDOR = "${BUILD_VENDOR}"
 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 = ""
 
 SDK_ARCH = "${BUILD_ARCH}"
 SDK_OS = "${BUILD_OS}"
-SDK_VENDOR = "-oesdk"
 SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + bb.data.getVar('SDK_OS', d, 1), ''][bb.data.getVar('SDK_OS', d, 1) == ('' or 'custom')]}"
 SDK_PREFIX = "${SDK_SYS}-"
 SDK_CC_ARCH = "${BUILD_CC_ARCH}"
diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
index 8da6c0a..dd9ffc3 100644
--- a/meta/conf/distro/defaultsetup.conf
+++ b/meta/conf/distro/defaultsetup.conf
@@ -3,7 +3,10 @@  include conf/distro/include/default-versions.inc
 include conf/distro/include/default-distrovars.inc
 include conf/distro/include/world-broken.inc
 
-TARGET_VENDOR ?= "-oecore"
+BUILD_VENDOR ?= ""
+TARGET_VENDOR ?= "-oe"
+HOST_VENDOR ?= "${TARGET_VENDOR}"
+SDK_VENDOR ?= "-oesdk"
 
 TARGET_FPU_arm ?= "soft"
 TARGET_FPU_armeb ?= "soft"