diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2012-09-02 13:13:20 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-04 12:53:09 +0100 |
commit | 6b3f0424c99c3fda72704aefb5d3735bd8ce4c34 (patch) | |
tree | 79b7c22f65d66f3c7a0b1374c5d81e82f9287834 /scripts | |
parent | 0b43a85154e38108dc633ca14b70d36944f5726b (diff) | |
download | poky-6b3f0424c99c3fda72704aefb5d3735bd8ce4c34.tar.gz |
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
(From OE-Core rev: 6faf27b771176ff691c17a2dbfa98ac7b3ed1fc7)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/sstate-cache-management.sh | 6 |
1 files changed, 4 insertions, 2 deletions
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 (){ | |||
153 | remove_duplicated () { | 153 | remove_duplicated () { |
154 | 154 | ||
155 | local topdir | 155 | local topdir |
156 | local oe_core_dir | ||
156 | local tunedirs | 157 | local tunedirs |
157 | local all_archs | 158 | local all_archs |
158 | local ava_archs | 159 | local ava_archs |
@@ -164,8 +165,9 @@ remove_duplicated () { | |||
164 | 165 | ||
165 | # Find out the archs in all the layers | 166 | # Find out the archs in all the layers |
166 | echo -n "Figuring out the archs in the layers ... " | 167 | echo -n "Figuring out the archs in the layers ... " |
167 | topdir=$(dirname $(dirname $(readlink -e $0))) | 168 | oe_core_dir=$(dirname $(dirname $(readlink -e $0))) |
168 | tunedirs="`find $topdir/meta* $layers -path '*/meta*/conf/machine/include'`" | 169 | topdir=$(dirname $oe_core_dir) |
170 | tunedirs="`find $topdir/meta* ${oe_core_dir}/meta* $layers -path '*/meta*/conf/machine/include'`" | ||
169 | [ -n "$tunedirs" ] || echo_error "Can't find the tune directory" | 171 | [ -n "$tunedirs" ] || echo_error "Can't find the tune directory" |
170 | all_archs=`grep -r -h "^AVAILTUNES .*=" $tunedirs | sed -e 's/.*=//' -e 's/\"//g'` | 172 | all_archs=`grep -r -h "^AVAILTUNES .*=" $tunedirs | sed -e 's/.*=//' -e 's/\"//g'` |
171 | # Add the qemu and native archs | 173 | # Add the qemu and native archs |