aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-03-16 18:36:22 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-17 14:38:04 -0400
commit01a393838b0e87cde07a81068965064e858c9155 (patch)
tree466f536eb2e4ca4a08f204af16aac824a9a029ac
parentee7fe8a359d98bbf85a3c3d22ce298c41f0f88b4 (diff)
downloadopenembedded-01a393838b0e87cde07a81068965064e858c9155.tar.gz
openembedded-01a393838b0e87cde07a81068965064e858c9155.tar.bz2
openembedded-01a393838b0e87cde07a81068965064e858c9155.zip
base.bbclass: fix base_get_scmbasepath() to look for recipes/ and fall back to packages/ while parsing BBFILESmv-packages-to-recipes-post
Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
-rw-r--r--classes/base.bbclass8
1 files changed, 7 insertions, 1 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 18afc1a2fe..0848870803 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -773,7 +773,13 @@ python base_do_unpack() {
def base_get_scmbasepath(d):
import bb
path_to_bbfiles = bb.data.getVar( 'BBFILES', d, 1 ).split()
- return path_to_bbfiles[0][:path_to_bbfiles[0].rindex( "packages" )]
+
+ try:
+ index = path_to_bbfiles[0].rindex( "recipes" )
+ except ValueError:
+ index = path_to_bbfiles[0].rindex( "packages" )
+
+ return path_to_bbfiles[0][:index]
def base_get_metadata_monotone_branch(d):
monotone_branch = "<unknown>"