From patchwork Mon Nov 18 16:46:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 179592 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp3126805ilf; Mon, 18 Nov 2019 08:46:56 -0800 (PST) X-Google-Smtp-Source: APXvYqwZohS3zODPkReEZtnq7CBV+ehsp8f7ODiaPTGdNf4UAQlcf9yt7Z+OkXRzXl5WAdUmh19O X-Received: by 2002:a17:90a:eb0f:: with SMTP id j15mr414584pjz.97.1574095616134; Mon, 18 Nov 2019 08:46:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574095616; cv=none; d=google.com; s=arc-20160816; b=H5gP1bYbQPC4t2U6Y9jo8R3mDc79ToweNcF7bu0z6CmxI9/70lpLdvAwgSK0F8p8V2 /bQm1OkbeqG9A1rhduh7qJroIo72OWXV53iHSrkVn411v5TMqRKO+Cyh9LHS2XYzhKF9 M+dtTmrklYwBhOriOByk/fE5j+IlUSqiVSa7pC0m4uY4ki6x/XKzl01olWgy4t9reocP 8/btVJEbK8fQ1QBJEpZioyIo67K+w9J876LQ8Mx28BaomNM4iJX9Dka/+Bzp6z36jWOC n9f2QssLUgB9GDTLYHrGkGVJ0kT0QQDemxBjrzJc3Hjk/w7mZERJ+Rsvjn1ek7HQ5jie O6vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=z2wTL46904tAm0Pqx1kKNWZdaS8FvssyWyrwpM2LYZA=; b=qNUjAZSGj8Fsfd98iSL4Bf31UjF/raUQv7LvEcRsv1rgMduy+Om8CWspZLxGm9khV+ fYWpZHwE9c1V0ZBkXBzaQqkH2Z8rXYWmPg/O3xOyqf1M0vMEj1REiX26KXJ1DyPhgIQk b1fKVDXL2UprT59ArupowKQoHi/uoV3+TvLs6Cn2CEh+F5xwWLVVHUD61MvLzufJWnFH /wHvPrrhQXxMrLNeYuw1jqA99htHfuVhkNy5AkxKgE0bCPZIOiDJAX9eQCcMsAvJtbAz ynErXyybWVQXAimBKpRxRjeH3pImEhe/vOtL17o3CdHnGPs3tzj53YGoesWdNN3k7rjB V71A== 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=jCwvK+xf; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id m11si5508757pgq.72.2019.11.18.08.46.55; Mon, 18 Nov 2019 08:46:56 -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=jCwvK+xf; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id C79A97F8B2; Mon, 18 Nov 2019 16:46:53 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by mail.openembedded.org (Postfix) with ESMTP id F23A97F8A0 for ; Mon, 18 Nov 2019 16:46:52 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id t26so19742254wmi.4 for ; Mon, 18 Nov 2019 08:46:54 -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:mime-version :content-transfer-encoding; bh=rWeYatW3qrAK2McH4FAaYl6YFFDJukQ8lNRElosSY2s=; b=jCwvK+xf8eYy//5qQyKFctpY9oMTIIFId5+yAHRsmFp0/j8Smgi3F742ep7MQ1obLm qkB6fRhFSm9wjPkpFVKjM96QFew9L8kLku1tWwSqdHAAiHfhBhJBHrJQjA4UaGmsgmWe 9eZE/C6ESToE1ELy8vvfWv1xw7EEiAU9dVHwNaw2AS1h9Maj4zqRl+jlxgzID2SRjqOY wGwKqhMmW3JFPNbmiy+UeaocxR2/p+nibLUZozsD24ijFhCEv78sI0YAUOO6KTwjJCJg dbVrx23P7hhZviI5JyrQrsOKUVpAeMzd8MQgp5Gmr2b/3UgVDVM4vjSnhf4nfsCEzUIk tkag== 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:mime-version :content-transfer-encoding; bh=rWeYatW3qrAK2McH4FAaYl6YFFDJukQ8lNRElosSY2s=; b=oSO2TCR8iyZhiUJWNvYUbsBHc/g74oVOypFvp1NhHuf2KkdeJC8/NRtMPL7IiK5Th4 hOaZ3Rsa5Rtyoig5g6J33EjceVrE3rAstu3qk+GBtTpw6rfILkvvSxlvorzEgrIhuj84 g9SZIIpcyQ/0RT3RFLRx7tsQji7GIOhLlkHQq4vXLUr8iBiQYPhgsMoSiLORliYQaqD5 2Owpl1csrNchGGhhvI0qfVIAF6U7amMKkvdnr9xgU4oAAwopp6MNQSRoQMo9b+Xrsj21 8FVY9YauRoYzrSk7oQIPxdY1FSvrmMiHlimAW4dVS0XKjSxvaSuoPCBzkLDjp+AfY7fK 11lA== X-Gm-Message-State: APjAAAWqWyI034AkjC4pXZ7Uy5vZkSOpg/bndy7228t3IzoQnbBt/FGA TF0hJRbpp0PvTswJ65DDb+ieDYi1nB8= X-Received: by 2002:a05:600c:210b:: with SMTP id u11mr31263547wml.170.1574095613398; Mon, 18 Nov 2019 08:46:53 -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 y189sm20936208wmb.13.2019.11.18.08.46.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Nov 2019 08:46:51 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 18 Nov 2019 16:46:42 +0000 Message-Id: <20191118164647.29409-1-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [OE-core] [PATCH 1/6] cve-update-db-native: don't hardcode the database name 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Don't hardcode the database filename, there's a variable for this in cve-check.bbclass. Signed-off-by: Ross Burton --- meta/recipes-core/meta/cve-update-db-native.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb index 19875a49b1c..c15534de08b 100644 --- a/meta/recipes-core/meta/cve-update-db-native.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb @@ -28,8 +28,8 @@ python do_populate_cve_db() { BASE_URL = "https://nvd.nist.gov/feeds/json/cve/1.0/nvdcve-1.0-" YEAR_START = 2002 - db_dir = os.path.join(d.getVar("DL_DIR"), 'CVE_CHECK') - db_file = os.path.join(db_dir, 'nvdcve_1.0.db') + db_file = d.getVar("CVE_CHECK_DB_FILE") + db_dir = os.path.dirname(db_file) json_tmpfile = os.path.join(db_dir, 'nvd.json.gz') # Don't refresh the database more than once an hour