Skip to contentSkip to conversation

Do not depend on BBFILES to compute scm dirs

PATCH Applied Khem Raj 3 participants 5 messages May 11, 2011

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

cover Do not depend on BBFILES to compute scm dirs

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 <[email protected]>
---

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(-)
Signature · 1 line
1.7.4.1
author
#1 lore raw

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

Signed-off-by Khem Raj <[email protected]>
---
 meta/classes/metadata_scm.bbclass |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
meta/classes/metadata_scm.bbclass +1 -4
index 7112ad5..99ac05c 100644
@@ -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>"
Signature · 1 line
1.7.4.1
Acked-by on v1 1/2
#2 lore raw

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

Op 11 mei 2011, om 06:35 heeft Khem Raj het volgende geschreven:

Quoted 1 line
Signed-off-by Khem Raj <[email protected]>

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

Acked-by Koen Kooi <[email protected]>
Quoted 30 lines

---
meta/classes/metadata_scm.bbclass | 5 +----

1 files changed, 1 insertions(+), 4 deletions(-)
meta/classes/metadata_scm.bbclass +0 -2
index 7112ad5..99ac05c 100644
@@ -25,12 +25,9 @@ def base_detect_branch(d):
 			return rev.strip()
 
 	return "<unknown>"	
-	
-

def base_get_scmbasepath(d):

meta/classes/metadata_scm.bbclass +1 -2
-	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>"

Signature · 7 lines
1.7.4.1


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
author
#3 lore raw

PATCH 2/2 meta/conf/layer.conf: Remove packages/*bb from BBFILES

In reply to Khem Raj

packages directory has been divided into recipes-*/ dirs

Signed-off-by Khem Raj <[email protected]>
---
 meta/conf/layer.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/conf/layer.conf +1 -1
index 3f63c7d..ad95405 100644
@@ -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}/"
Signature · 1 line
1.7.4.1
Applied
#4 lore raw
In reply to Khem Raj
Quoted 10 lines · 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

Quoted 8 lines

Thanks,
Khem Raj <[email protected]>
---

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