Patchwork [1/2] metadata_scm.bbclass: Use COREBASE to grok for SCM operations

login
register
mail settings
Submitter Khem Raj
Date May 11, 2011, 4:35 a.m.
Message ID <4d4aef2d2625c935f09c277d892df6860fd0e28d.1305088327.git.raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/3719/
State New, archived
Headers show

Comments

Khem Raj - May 11, 2011, 4:35 a.m.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/classes/metadata_scm.bbclass |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
Koen Kooi - May 11, 2011, 6:34 a.m.
Op 11 mei 2011, om 06:35 heeft Khem Raj het volgende geschreven:

> Signed-off-by: Khem Raj <raj.khem@gmail.com>

This fixes bitbake bombing out after moving OE-core down in bblayers.conf:

Acked-by: Koen Kooi <koen@dominion.thruhere.net>


> ---
> meta/classes/metadata_scm.bbclass |    5 +----
> 1 files changed, 1 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/classes/metadata_scm.bbclass b/meta/classes/metadata_scm.bbclass
> index 7112ad5..99ac05c 100644
> --- a/meta/classes/metadata_scm.bbclass
> +++ b/meta/classes/metadata_scm.bbclass
> @@ -25,12 +25,9 @@ def base_detect_branch(d):
> 			return rev.strip()
> 
> 	return "<unknown>"	
> -	
> -	
> 
> def base_get_scmbasepath(d):
> -	path_to_bbfiles = bb.data.getVar( 'BBFILES', d, 1 ).split()
> -	return path_to_bbfiles[0][:path_to_bbfiles[0].rindex( "packages" )]
> +	return bb.data.getVar( 'COREBASE', d, 1 )
> 
> def base_get_metadata_monotone_branch(path, d):
> 	monotone_branch = "<unknown>"
> -- 
> 1.7.4.1
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/classes/metadata_scm.bbclass b/meta/classes/metadata_scm.bbclass
index 7112ad5..99ac05c 100644
--- a/meta/classes/metadata_scm.bbclass
+++ b/meta/classes/metadata_scm.bbclass
@@ -25,12 +25,9 @@  def base_detect_branch(d):
 			return rev.strip()
 
 	return "<unknown>"	
-	
-	
 
 def base_get_scmbasepath(d):
-	path_to_bbfiles = bb.data.getVar( 'BBFILES', d, 1 ).split()
-	return path_to_bbfiles[0][:path_to_bbfiles[0].rindex( "packages" )]
+	return bb.data.getVar( 'COREBASE', d, 1 )
 
 def base_get_metadata_monotone_branch(path, d):
 	monotone_branch = "<unknown>"