diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2012-09-02 13:13:21 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-04 12:53:09 +0100 |
commit | 40d2cbe480142e8cde40b54388d4e6ea278dcfe4 (patch) | |
tree | e6518104eca2d737f691e1fc7d761baa13961cc2 /scripts/sstate-cache-management.sh | |
parent | 6b3f0424c99c3fda72704aefb5d3735bd8ce4c34 (diff) | |
download | poky-40d2cbe480142e8cde40b54388d4e6ea278dcfe4.tar.gz |
sstate-cache-management.sh: don't hardcode available machines only to qemu*
* find them dynamically in layers like AVAILTUNES
(From OE-Core rev: fb6d838b1b80f26e9261acfd3893a7ef7f9e1940)
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/sstate-cache-management.sh')
-rwxr-xr-x | scripts/sstate-cache-management.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/sstate-cache-management.sh b/scripts/sstate-cache-management.sh index e569487a8a..491df5f3fe 100755 --- a/scripts/sstate-cache-management.sh +++ b/scripts/sstate-cache-management.sh | |||
@@ -156,6 +156,7 @@ remove_duplicated () { | |||
156 | local oe_core_dir | 156 | local oe_core_dir |
157 | local tunedirs | 157 | local tunedirs |
158 | local all_archs | 158 | local all_archs |
159 | local all_machines | ||
159 | local ava_archs | 160 | local ava_archs |
160 | local arch | 161 | local arch |
161 | local file_names | 162 | local file_names |
@@ -169,11 +170,12 @@ remove_duplicated () { | |||
169 | topdir=$(dirname $oe_core_dir) | 170 | topdir=$(dirname $oe_core_dir) |
170 | tunedirs="`find $topdir/meta* ${oe_core_dir}/meta* $layers -path '*/meta*/conf/machine/include'`" | 171 | tunedirs="`find $topdir/meta* ${oe_core_dir}/meta* $layers -path '*/meta*/conf/machine/include'`" |
171 | [ -n "$tunedirs" ] || echo_error "Can't find the tune directory" | 172 | [ -n "$tunedirs" ] || echo_error "Can't find the tune directory" |
173 | all_machines="`find $topdir/meta* ${oe_core_dir}/meta* $layers -path '*/meta*/conf/machine/*' -name '*.conf' | sed -e 's/.*\///' -e 's/.conf$//'`" | ||
172 | all_archs=`grep -r -h "^AVAILTUNES .*=" $tunedirs | sed -e 's/.*=//' -e 's/\"//g'` | 174 | all_archs=`grep -r -h "^AVAILTUNES .*=" $tunedirs | sed -e 's/.*=//' -e 's/\"//g'` |
173 | # Add the qemu and native archs | 175 | # Add the qemu and native archs |
174 | # Use the "_" to substitute "-", e.g., x86-64 to x86_64 | 176 | # Use the "_" to substitute "-", e.g., x86-64 to x86_64 |
175 | # Sort to remove the duplicated ones | 177 | # Sort to remove the duplicated ones |
176 | all_archs=$(echo $all_archs qemuarm qemux86 qemumips qemuppc qemux86_64 $(uname -m) \ | 178 | all_archs=$(echo $all_archs $all_machines $(uname -m) \ |
177 | | sed -e 's/-/_/g' -e 's/ /\n/g' | sort -u) | 179 | | sed -e 's/-/_/g' -e 's/ /\n/g' | sort -u) |
178 | echo "Done" | 180 | echo "Done" |
179 | 181 | ||