From 01a393838b0e87cde07a81068965064e858c9155 Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denis@denix.org>
Date: Mon, 16 Mar 2009 18:36:22 -0400
Subject: base.bbclass: fix base_get_scmbasepath() to look for recipes/ and
 fall back to packages/ while parsing BBFILES

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>
---
 classes/base.bbclass | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'classes')

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>"
-- 
cgit v1.2.3