[PATCH 0/2] Do not depend on BBFILES to compute scm dirs

[PATCH 0/2] Do not depend on BBFILES to compute scm dirs

[Khem Raj]

This fixes the problem that I described in 
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-May/001966.html

Additionally we do not need directories with */packages/* in BBFILES
anymore

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

Thanks,
    Khem Raj <raj.khem@gmail.com>
---


Khem Raj (2):
  metadata_scm.bbclass: Use COREBASE to grok for SCM operations
  meta/conf/layer.conf: Remove packages/*bb from BBFILES

 meta/classes/metadata_scm.bbclass |    5 +----
 meta/conf/layer.conf              |    2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

-- 
1.7.4.1

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

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 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

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

[Koen Kooi]

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 2/2] meta/conf/layer.conf: Remove packages/*bb from BBFILES

[Khem Raj]

packages directory has been divided into recipes-*/ dirs

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/conf/layer.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 3f63c7d..ad95405 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -2,7 +2,7 @@ BBPATH ?= ""
 # We have a conf and classes directory, add to BBPATH
 BBPATH .= ":${LAYERDIR}"
 # We have a packages directory, add to BBFILES
-BBFILES += "${LAYERDIR}/packages/*/*.bb ${LAYERDIR}/recipes-*/*/*.bb"
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb"
 
 BBFILE_COLLECTIONS += "normal"
 BBFILE_PATTERN_normal := "^${LAYERDIR}/"
-- 
1.7.4.1

Re: [PATCH 0/2] Do not depend on BBFILES to compute scm dirs

[Richard Purdie]

On Tue, 2011-05-10 at 21:35 -0700, Khem Raj wrote:
> This fixes the problem that I described in 
> http://lists.linuxtogo.org/pipermail/openembedded-core/2011-May/001966.html
> 
> Additionally we do not need directories with */packages/* in BBFILES
> anymore
> 
> Pull URL: git://git.openembedded.org/openembedded-core-contrib
>   Branch: kraj/misc-fixes
>   Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/misc-fixes
> 
> Thanks,
>     Khem Raj <raj.khem@gmail.com>
> ---
> 
> 
> Khem Raj (2):
>   metadata_scm.bbclass: Use COREBASE to grok for SCM operations
>   meta/conf/layer.conf: Remove packages/*bb from BBFILES

Merged to master, thanks.

Richard