mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

cve-check-tool: convert do_populate_cve_db() from python to sh

Browse Source 
This will allow us to easily incorporate progress support
via bb.process.run()

(From OE-Core rev: 1bf0137ac84e5d324fd84dadfa962fbc166b5d4b)

Signed-off-by: André Draszik <git@andred.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
André Draszik
2016-09-28 13:05:44 +01:00
committed by Richard Purdie
parent 5d8a968ecd
commit 0466c81f91
1 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/cve-check-tool/cve-check-tool_5.6.4.bb
+18 -25
View File
@@ -22,35 +22,28 @@ inherit pkgconfig autotools
EXTRA_OECONF = "--disable-coverage"
CFLAGS_append = " -Wno-error=pedantic"
python do_populate_cve_db () {
import subprocess
import time
if d.getVar("BB_NO_NETWORK", True) == "1":
bb.error("BB_NO_NETWORK is set; Can't update cve-check-tool database, "
"CVEs won't be checked")
do_populate_cve_db() {
if [ "${BB_NO_NETWORK}" = "1" ] ; then
bberror "BB_NO_NETWORK is set; Can't update cve-check-tool database, CVEs won't be checked"
return
fi
bb.utils.export_proxies(d)
# In case we don't inherit cve-check class, use default values defined in the class.
cve_dir = d.getVar("CVE_CHECK_DB_DIR", True) or d.expand("${DL_DIR}/CVE_CHECK")
cve_file = d.getVar("CVE_CHECK_TMP_FILE", True) or d.expand("${TMPDIR}/cve_check")
cve_cmd = "cve-check-update"
cmd = [cve_cmd, "-d", cve_dir]
bb.debug(1, "Updating cve-check-tool database located in %s" % cve_dir)
try:
output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
bb.debug(2, "Command '%s' returned:\n%s" % ("\n".join(cmd), output))
time_utc = time.gmtime(time.time())
time_format = "%Y-%m-%d %H:%M:%S"
with open(cve_file, "w") as f:
f.write("CVE database was updated on %s UTC\n\n"
% time.strftime(time_format, time_utc))
cve_dir="${CVE_CHECK_DB_DIR}"
cve_file="${CVE_CHECK_TMP_FILE}"
except subprocess.CalledProcessError as e:
bb.warn("Error in executing cve-check-update: %s (output %s)" % (e, e.output))
if bb.data.inherits_class('cve-check', d):
bb.warn("Failed to update cve-check-tool database, CVEs won't be checked")
[ -z "${cve_dir}" ] && cve_dir="${DL_DIR}/CVE_CHECK"
[ -z "${cve_file}" ] && cve_file="${TMPDIR}/cve_check"
bbdebug 2 "Updating cve-check-tool database located in $cve_dir"
if cve-check-update -d "$cve_dir" ; then
printf "CVE database was updated on %s UTC\n\n" "$(LANG=C date --utc +'%F %T')" > "$cve_file"
else
bbwarn "Error in executing cve-check-update"
if [ "${@'1' if bb.data.inherits_class('cve-check', d) else '0'}" -ne 0 ] ; then
bbwarn "Failed to update cve-check-tool database, CVEs won't be checked"
fi
fi
}
addtask populate_cve_db after do_populate_sysroot