Patchwork [PATCHv2,2/5] bitbake.conf: remove TARGET_ARCH from in SDKPATH

login
register
mail settings
Submitter Martin Jansa
Date Feb. 26, 2012, 7:49 a.m.
Message ID <f88bff815fdeb404bb9a51efbf1b03862ef6dda0.1330242184.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/22055/
State Accepted
Commit 54821d53f75eb31f1eca3809e674680316dcbf69
Headers show

Comments

Martin Jansa - Feb. 26, 2012, 7:49 a.m.
* SDKPATH shouldn't depend on TARGET_ARCH as discused here:
  http://lists.linuxtogo.org/pipermail/openembedded-core/2012-February/018222.html
* introduce SDK_NAME_PREFIX so that distributions can overwrite only
  this instead of whole SDK_NAME

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/conf/bitbake.conf |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
Khem Raj - March 1, 2012, 9:23 a.m.
On 02/25/2012 11:49 PM, Martin Jansa wrote:
> +SDK_NAME_PREFIX = "oecore"

should this be weak assignment
Martin Jansa - March 1, 2012, 9:40 a.m.
On Thu, Mar 01, 2012 at 01:23:29AM -0800, Khem Raj wrote:
> On 02/25/2012 11:49 PM, Martin Jansa wrote:
> > +SDK_NAME_PREFIX = "oecore"
> 
> should this be weak assignment

Yeah, probably could be (I'm not overwritting this from my distro conf
so I haven't tried), but SDK_NAME assignment also wasn't weak and distros
were overwritting it.

Someone with custom SDK_NAME(_PREFIX) please try and send patch.

Cheers,
Martin Jansa - March 1, 2012, 6:25 p.m.
On Thu, Mar 01, 2012 at 10:40:52AM +0100, Martin Jansa wrote:
> On Thu, Mar 01, 2012 at 01:23:29AM -0800, Khem Raj wrote:
> > On 02/25/2012 11:49 PM, Martin Jansa wrote:
> > > +SDK_NAME_PREFIX = "oecore"
> > 
> > should this be weak assignment
> 
> Yeah, probably could be (I'm not overwritting this from my distro conf
> so I haven't tried), but SDK_NAME assignment also wasn't weak and distros
> were overwritting it.
> 
> Someone with custom SDK_NAME(_PREFIX) please try and send patch.

And we should change TARGET_ARCH in SDK_NAME to
PACKAGE_ARCH or TUNE_PKGARCH

because meta-toolchain-gmae for armv7a ends in
oecore-i686-arm-toolchain-gmae-20120229.tar.bz2
and for armv4t with similar name (I was lucky that it took more then day to
build)
oecore-i686-arm-toolchain-gmae-20120301.tar.bz2

Cheers,
Richard Purdie - March 1, 2012, 7:59 p.m.
On Thu, 2012-03-01 at 19:25 +0100, Martin Jansa wrote:
> On Thu, Mar 01, 2012 at 10:40:52AM +0100, Martin Jansa wrote:
> > On Thu, Mar 01, 2012 at 01:23:29AM -0800, Khem Raj wrote:
> > > On 02/25/2012 11:49 PM, Martin Jansa wrote:
> > > > +SDK_NAME_PREFIX = "oecore"
> > > 
> > > should this be weak assignment
> > 
> > Yeah, probably could be (I'm not overwritting this from my distro conf
> > so I haven't tried), but SDK_NAME assignment also wasn't weak and distros
> > were overwritting it.
> > 
> > Someone with custom SDK_NAME(_PREFIX) please try and send patch.
> 
> And we should change TARGET_ARCH in SDK_NAME to
> PACKAGE_ARCH or TUNE_PKGARCH
> 
> because meta-toolchain-gmae for armv7a ends in
> oecore-i686-arm-toolchain-gmae-20120229.tar.bz2
> and for armv4t with similar name (I was lucky that it took more then day to
> build)
> oecore-i686-arm-toolchain-gmae-20120301.tar.bz2

Agreed...

Cheers,

Richard

Patch

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 55daa9e..f2666cb 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -360,8 +360,13 @@  DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
 
 PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}"
 
-SDK_NAME = "oecore-${SDK_ARCH}-${TARGET_ARCH}"
-SDKPATH = "/usr/local/${SDK_NAME}"
+##################################################################
+# SDK variables, 
+##################################################################
+
+SDK_NAME_PREFIX = "oecore"
+SDK_NAME = "${SDK_NAME_PREFIX}-${SDK_ARCH}-${TARGET_ARCH}"
+SDKPATH = "/usr/local/${SDK_NAME_PREFIX}-${SDK_ARCH}"
 SDKPATHNATIVE = "${SDKPATH}/sysroots/${SDK_SYS}"
 
 ##################################################################