diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2012-09-27 09:36:13 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-27 16:35:23 +0100 |
commit | d658f48efad5dd9e7d74c8f607f5b5d893b589dd (patch) | |
tree | aa8758ea6b3f7186b9d6cb880e48ee70307f938a | |
parent | dcd607ecc1d512f8cc704916e9c6737fe5dd0bb5 (diff) | |
download | poky-d658f48efad5dd9e7d74c8f607f5b5d893b589dd.tar.gz |
sstate-cache-management: hide error message when one of possible layer location doesn't exist
* fixes [YOCTO #3116]
(From OE-Core rev: b02d334e0e6a19a1bf3550add68f5770a835c772)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 f519555d59..4c06fe87e2 100755 --- a/scripts/sstate-cache-management.sh +++ b/scripts/sstate-cache-management.sh | |||
@@ -174,7 +174,7 @@ remove_duplicated () { | |||
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'`" |
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' | 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'` |
179 | # Add the qemu and native archs | 179 | # Add the qemu and native archs |
180 | # Use the "_" to substitute "-", e.g., x86-64 to x86_64 | 180 | # Use the "_" to substitute "-", e.g., x86-64 to x86_64 |