From: Martin Jansa <martin.jansa@gmail.com>
Date: Sun, 2 Sep 2012 11:13:20 +0000 (+0200)
Subject: sstate-cache-management.sh: look in meta* above oe-core dir when looking for availabl... 
X-Git-Tag: 2015-4~9294
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=6faf27b771176ff691c17a2dbfa98ac7b3ed1fc7;p=openembedded-core.git

sstate-cache-management.sh: look in meta* above oe-core dir when looking for available tunes

* many layouts have other layers on the same level as oe-core checkout

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---

diff --git a/scripts/sstate-cache-management.sh b/scripts/sstate-cache-management.sh
index 0f774a3f4e..e569487a8a 100755
--- a/scripts/sstate-cache-management.sh
+++ b/scripts/sstate-cache-management.sh
@@ -153,6 +153,7 @@ gen_rmlist (){
 remove_duplicated () {
 
   local topdir
+  local oe_core_dir
   local tunedirs
   local all_archs
   local ava_archs
@@ -164,8 +165,9 @@ remove_duplicated () {
 
   # Find out the archs in all the layers
   echo -n "Figuring out the archs in the layers ... "
-  topdir=$(dirname $(dirname $(readlink -e $0)))
-  tunedirs="`find $topdir/meta* $layers -path '*/meta*/conf/machine/include'`"
+  oe_core_dir=$(dirname $(dirname $(readlink -e $0)))
+  topdir=$(dirname $oe_core_dir)
+  tunedirs="`find $topdir/meta* ${oe_core_dir}/meta* $layers -path '*/meta*/conf/machine/include'`"
   [ -n "$tunedirs" ] || echo_error "Can't find the tune directory"
   all_archs=`grep -r -h "^AVAILTUNES .*=" $tunedirs | sed -e 's/.*=//' -e 's/\"//g'`
   # Add the qemu and native archs