summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-06-22 11:22:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-01 16:22:41 +0100
commitef8bbc7869337b2ad4d833f1d3f2857589d15190 (patch)
tree3a41bbf22b9a38e83c882677472131780257b99d
parent2fcece7adec44c76f1818e8fbbb11f88e8e54c71 (diff)
downloadpoky-ef8bbc7869337b2ad4d833f1d3f2857589d15190.tar.gz
openssl: prevent warnings from openssl-c_rehash.sh
The openssl-c_rehash.sh script reports duplicate files and files which don't contain a certificate or CRL by echoing a WARNING to stdout. This warning gets picked up by the log checker during rootfs and results in several warnings getting reported to the console during an image build. To prevent the log from being overrun by warnings related to certificates change these messages in openssl-c_rehash.sh to be prefixed with NOTE not WARNING. (From OE-Core rev: 88c25318db9f8091719b317bacd636b03d50a411) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh b/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh
index 0ea22637ee..f67f415544 100644
--- a/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh
+++ b/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh
@@ -106,7 +106,7 @@ link_hash()
106 do 106 do
107 if [ ${FINGERPRINT} = $( fingerprint ${LINKFILE} ${2} ) ] 107 if [ ${FINGERPRINT} = $( fingerprint ${LINKFILE} ${2} ) ]
108 then 108 then
109 echo "WARNING: Skipping duplicate file ${1}" >&2 109 echo "NOTE: Skipping duplicate file ${1}" >&2
110 return 1 110 return 1
111 fi 111 fi
112 112
@@ -153,7 +153,7 @@ hash_dir()
153 then 153 then
154 TYPE_STR='crl' 154 TYPE_STR='crl'
155 else 155 else
156 echo "WARNING: ${FILE} does not contain a certificate or CRL: skipping" >&2 156 echo "NOTE: ${FILE} does not contain a certificate or CRL: skipping" >&2
157 continue 157 continue
158 fi 158 fi
159 159