diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2012-10-09 11:30:16 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-10 15:13:40 +0100 |
commit | c5fa8e29af3c920169caf445eaccabb522bd4306 (patch) | |
tree | 08f2f74010d244f0f6f7ae28e33617d57b08b000 /scripts | |
parent | cf24179d654c864b7c2c139507c03b7b4d23f5f9 (diff) | |
download | poky-c5fa8e29af3c920169caf445eaccabb522bd4306.tar.gz |
sstate-cache-management: hide error message when one of possible layer location doesn't exist
* fixes [YOCTO #3116]
(From OE-Core rev: bde88116d9d7e86ca7ecac4cf990689f972b0b1c)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/sstate-cache-management.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/sstate-cache-management.sh b/scripts/sstate-cache-management.sh index 4c06fe87e2..551d2f267d 100755 --- a/scripts/sstate-cache-management.sh +++ b/scripts/sstate-cache-management.sh | |||
@@ -172,7 +172,7 @@ remove_duplicated () { | |||
172 | echo -n "Figuring out the archs in the layers ... " | 172 | echo -n "Figuring out the archs in the layers ... " |
173 | oe_core_dir=$(dirname $(dirname $(readlink -e $0))) | 173 | oe_core_dir=$(dirname $(dirname $(readlink -e $0))) |
174 | topdir=$(dirname $oe_core_dir) | 174 | topdir=$(dirname $oe_core_dir) |
175 | tunedirs="`find $topdir/meta* ${oe_core_dir}/meta* $layers -path '*/meta*/conf/machine/include'`" | 175 | tunedirs="`find $topdir/meta* ${oe_core_dir}/meta* $layers -path '*/meta*/conf/machine/include' 2>/dev/null`" |
176 | [ -n "$tunedirs" ] || echo_error "Can't find the tune directory" | 176 | [ -n "$tunedirs" ] || echo_error "Can't find the tune directory" |
177 | all_machines="`find $topdir/meta* ${oe_core_dir}/meta* $layers -path '*/meta*/conf/machine/*' -name '*.conf' 2>/dev/null | sed -e 's/.*\///' -e 's/.conf$//'`" | 177 | all_machines="`find $topdir/meta* ${oe_core_dir}/meta* $layers -path '*/meta*/conf/machine/*' -name '*.conf' 2>/dev/null | sed -e 's/.*\///' -e 's/.conf$//'`" |
178 | all_archs=`grep -r -h "^AVAILTUNES .*=" $tunedirs | sed -e 's/.*=//' -e 's/\"//g'` | 178 | all_archs=`grep -r -h "^AVAILTUNES .*=" $tunedirs | sed -e 's/.*=//' -e 's/\"//g'` |