From patchwork Thu Feb 8 23:09:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 127746 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp62363ljc; Thu, 8 Feb 2018 15:09:20 -0800 (PST) X-Google-Smtp-Source: AH8x2245D4jtkrfjGU4UaeYJXaO8C8JHTU9XhiO6WG9azEjo//o8mPKG4xNkeg7BQKNjZftib6Wf X-Received: by 2002:a17:902:7581:: with SMTP id j1-v6mr571808pll.86.1518131360376; Thu, 08 Feb 2018 15:09:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518131360; cv=none; d=google.com; s=arc-20160816; b=AtHc+24lXKFo6ueczlEms/iFmCko1Kb50zd7p/M8B9P5yJ1aKZiurRrORdarpCUGDl 1w7bKCCBuVXf6RRN0mgm27op0VCGmY0H7LVsZsy4LLiMzFZI1iZUPTPhq5+UYgT17pA1 IjHOT/ykge5pj0j4/27aRE2fac3egj7Shv/x/CKM4F9zFVYGCccovINRjnFVn0fBw3CF yyjlRzsJF+qbGpDyo67J6sb3shsKavdcEe+W+ElU9Fp3ELSjTwUBIz7HNvDsYze8nQbk cWbtkNoHNYitf/IlvHNvv7bsL/bxCCz8/xPNSnM5VlVx3tDIHH6hekjhkXSqyfodTZJi zHNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=iQw+tLdUsPmkUFp2By94lKFm0C+L8jhvq/mkSiQEeuo=; b=RWRPjrt30AV17PPefjvzwP0DLSf9spPsKG30NjU+REYGarq18WMVF1DjRsEu/FZzZU PO9bwtOHk6rqHu6l2jFwO3UxY4Pj5hHLEIGO3finXbvy4RLp8gDYd6lBi9uZpXBEXOh8 2DrDtII/ZGGpyertD0F4gsK0sbOMgRAAE9CDq6x/0QrXW/5kuFJ3KeeyeAm1zDj30kKj 7i60mC11fivsWV4DJu9tk5vjhd9RLBxX0lBlsoomsHgLgW0d0xBdDSQO5t9f/kV1Tydp PhJ7jcKTbWALiFvc0YdlXpzLQz1Lbqpn9+RQUx73gLXUaH3XXdbIlVqpAFZ8RxpQJgBE dl0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=u0kFv4cr; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id w2-v6si634042plz.168.2018.02.08.15.09.20; Thu, 08 Feb 2018 15:09:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=u0kFv4cr; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id BC4E7785C5; Thu, 8 Feb 2018 23:09:17 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by mail.openembedded.org (Postfix) with ESMTP id C884278589 for ; Thu, 8 Feb 2018 23:09:16 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id b52so6402689wrd.10 for ; Thu, 08 Feb 2018 15:09:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=sGNrBiGji7GwPDhRB8fjgDngFFldiGkC8Ge6JsMjmWs=; b=u0kFv4cro1upijUD+2CRpu7PID2QfzXWBHWf9yOHQC6E9i0MEz/GHJB7R86HXdS4A+ udVmDxzEEDFPhdVOtPWCMMOznn1BI03OEOQ0kWqUmfUzkLdbdIqBhdagw1lf2lhGSRa3 cg4QMKXUiKdNZbVwqgvAHFEiUrUgXYMSGoBKht8lE1yYueLyMblWNi0wdQ08op2d9bo4 l6gtpnR58jCIgVA7hdNm+JWlNbFE3y6tmunk6aaQo85zPso7sQtKKry2lVT2EENsmVcF /pkivHEFp4LFqhbJCF4tA85iSMBcN62jCOw3D+cqS4aVK2DwjTEnC+0V7LOpRkpRJGiT /fHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=sGNrBiGji7GwPDhRB8fjgDngFFldiGkC8Ge6JsMjmWs=; b=jV/zZxDHLz/RAh3e9mnBr/pMLC+/QQdHU53gjf+AowfAlLStPkNzJPnUtZbkRBY29H NtmQ2IfGEh7f54Pn9Znvh7DGWFLEL1BEeS/3h+haJKS/PUlP/vQAhyjswBI881Tq7UgJ i45cMMkGTh3ZZPaWfLT6gGP1wGmqo4zMxd0DQrh3gCFdfwbJ78U/obHfCCLBBNeH4Eki m0bh3PkJiAb359URzWQz2+A7ZlLZHr604OJ/rEPBRGKltN1mf07HEsxyG05EtDwUJEcj EJt2803P4SEisMsDehPUiyBbp7hL9USUKYxa+YfJbbB9j4ZIhGE36FGdXQsaPgQQYxLp +hmQ== X-Gm-Message-State: APf1xPAM/eFHo8UfhuOQUsrQMV6QDUDptXloHKBXPib0EAkO2XOLVNE0 pwyf+FY1U5kGiKpd9wMuba2XWYfn X-Received: by 10.223.151.158 with SMTP id s30mr615552wrb.70.1518131357485; Thu, 08 Feb 2018 15:09:17 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id m11sm1349083wrf.75.2018.02.08.15.09.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Feb 2018 15:09:16 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 8 Feb 2018 23:09:14 +0000 Message-Id: <20180208230914.19368-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] cve-check: put log in T so it doesn't get deleted by rm_work X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org This is where the other task logs go, so it's a sensible place to put it. Signed-off-by: Ross Burton --- meta/classes/cve-check.bbclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index bc2f03f7ddb..62dd6424d5c 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -27,8 +27,7 @@ CVE_PRODUCT ??= "${BPN}" CVE_CHECK_DB_DIR ?= "${DL_DIR}/CVE_CHECK" CVE_CHECK_DB_FILE ?= "${CVE_CHECK_DB_DIR}/nvd.db" -CVE_CHECK_LOCAL_DIR ?= "${WORKDIR}/cve" -CVE_CHECK_LOCAL_FILE ?= "${CVE_CHECK_LOCAL_DIR}/cve.log" +CVE_CHECK_LOG ?= "${T}/cve.log" CVE_CHECK_TMP_FILE ?= "${TMPDIR}/cve_check" CVE_CHECK_DIR ??= "${DEPLOY_DIR}/cve" @@ -251,11 +250,11 @@ def cve_write_data(d, patched, unpatched, cve_data): CVE manifest if enabled. """ - cve_file = d.getVar("CVE_CHECK_LOCAL_FILE") + cve_file = d.getVar("CVE_CHECK_LOG") nvd_link = "https://web.nvd.nist.gov/view/vuln/detail?vulnId=" write_string = "" unpatched_cves = [] - bb.utils.mkdirhier(d.getVar("CVE_CHECK_LOCAL_DIR")) + bb.utils.mkdirhier(os.path.dirname(cve_file)) for cve in sorted(cve_data): write_string += "PACKAGE NAME: %s\n" % d.getVar("PN")