From patchwork Sun Nov 24 23:50:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 180136 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp2443313ilf; Sun, 24 Nov 2019 15:51:29 -0800 (PST) X-Google-Smtp-Source: APXvYqw+5TpEkaSopIFK1v6SljSiqOU8tX4JlKkonN6mBUNKwnZsuqtdOYp7HphLpW5bEhgBwBuz X-Received: by 2002:a63:9d07:: with SMTP id i7mr11480194pgd.344.1574639488906; Sun, 24 Nov 2019 15:51:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574639488; cv=none; d=google.com; s=arc-20160816; b=NP4QhEaWRL+XaCMZMSrcwn1VZqtHKfpChceNx0EIhmqihiaDlIs8ZK04wPUDlL/vwk E69YCZuwsuxpGfRduQ/naLE3S7uxMDNO+b256lclgc3fj4Wc+RDzdTjHt/LrFk4K67KW I142hn7+yLRR53PpPtNy/piuObPT1d9R3TU3CsiHGzcYN1JmNU5ipU6Wp5GdbQAbWDiC EAg9x50MvqUC3aaceoEQ/XvnlH2w+bWbbqsHDINDlCJpeo4u+ssL1BNCtcXImjz0MBNG wxeXBYdFEU/3M2IoWeqqt6+FcSBcyzN2uvXdaunp4iB0pKfQBzLqbUV79CQ4wEqi6XOT IB/w== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=VZDttuIl3pzvSWzI49TRHuOBRC5/1tOWcuLIh9jqmhc=; b=qKE/CyVIgi8McAzY8JHChLw8BWE0KcZGFDyd7sVAhPE+aJiJ9VdtgxyHP9NlzACgbC 2UCnQ0EhuuQSciRI60KUSVECghiH635M2XO6Sh+NpGH88TUYug2OKmxKxQZ8Mk3aVrEP 7jnYLQxLEEOhoGQ9Kz7N2Cazjno9mD53KLw5QK2N3MChR99EtaVc9r/b40T3iOsTukIQ Kx2fEx5yUAjI/IWWFq+YjF6FX5iVmfMTLQ9T2vbSewzxfAa4GUlAbU5/K6fz1BMz0+c9 6KL2Omb4udcDFZD6lGH4sF/XMKVVweNHpkzAQSQyVI5piPgyp+gxVcL92OhlPcJ8tAWt 4xzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=b6hgeCVC; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id w197si6023694pfd.106.2019.11.24.15.51.28; Sun, 24 Nov 2019 15:51:28 -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=@gmail.com header.s=20161025 header.b=b6hgeCVC; 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=QUARANTINE dis=NONE) header.from=gmail.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 4DA497FCC0; Sun, 24 Nov 2019 23:51:06 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mail.openembedded.org (Postfix) with ESMTP id AB0317FC0A for ; Sun, 24 Nov 2019 23:50:47 +0000 (UTC) Received: by mail-pj1-f48.google.com with SMTP id w8so5585005pjh.11 for ; Sun, 24 Nov 2019 15:50:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=TqNrn9U3D+Iq4V2VGhGE7YQXx3GiAI4JY7mRHk1+n48=; b=b6hgeCVCvAFDgfN9hTS+MnIFmdUW6XjhoJBdxfvdCLrx1MVz9btMuwtTW49Zbm0VY1 4QB4liCT6SmBM1Xs5bVBO67Y+5PNb6yID6u9g9qvXzBuCEtaaaqJMKCdroAPTGcJlzIE NKkKeFyESNa0zXxWGETnQ2AppG4zAWS5PDAQirs4/Xj0tzZ4hMn8DHG/xz+S3yms7f/y 2TdFCTkNcjnW8Hos5FalO12BOsWvkTvlfip01azpydTtsySvVPlGso66uwiPtPV0s/bo 11i70no/TL8CkA0KI0EvuDs46m6c6lQ5iMnT3+/2iyJ9UwAwYUWNRvqCyTl89v//s4wq +yGg== 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:in-reply-to :references; bh=TqNrn9U3D+Iq4V2VGhGE7YQXx3GiAI4JY7mRHk1+n48=; b=UZ3LVl1WAMfRkJvysm5MrVWQB+VdlbsT0r5R3RYDttxrRerDS1eVyESvTNKiTjNQ55 LIfsklfZIQJmM9x3Yq1BYAn0jU3Ts2wE0vrIzLg9gT4feC2YLRapL0NExQ9axI4qbgOt lTiK95vi0wRZJk75RhJhjFKEZdjIVKtdc0mROIDdNCiVbP4oYvgpoLDBghVzviSVxvWX K0tPpgEzPmbHT26NcI7mwQYHni5dfJI4CGq208XIm00807BIc1RR1TcEwEzwt6Go060w EgCVcQihpljavidjWjNuWofz+FmrdudwRlfck4Cj48QGE+TxJj36yx6NpG3vQ9/smTXN PF/A== X-Gm-Message-State: APjAAAV0lz7tCGw/ZIa4Ut8rVAlpuzZ4QU9dA/cV/vtwgIi9pzGp0kiI kwWyeS8TBN7NoRVLjk+UD1iIGLw8 X-Received: by 2002:a17:90a:a00d:: with SMTP id q13mr34726932pjp.106.1574639448634; Sun, 24 Nov 2019 15:50:48 -0800 (PST) Received: from akuster-ThinkPad-T460s.hsd1.ca.comcast.net ([2601:202:4180:a5c0:69ac:e4d2:e89f:98da]) by smtp.gmail.com with ESMTPSA id q200sm5619783pfq.87.2019.11.24.15.50.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 24 Nov 2019 15:50:48 -0800 (PST) From: Armin Kuster To: openembedded-core@lists.openembedded.org Date: Sun, 24 Nov 2019 15:50:10 -0800 Message-Id: <00b322e35a7f5b95f3e3c5189796f7901ca596a1.1574639349.git.akuster808@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [OE-core] [zeus 05/35] 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: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Ross Burton Don't hardcode the database filename, there's a variable for this in cve-check.bbclass. (From OE-Core rev: 0d188a9dc4ae64c64cd661e9d9c3841e86f226ab) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Anuj Mittal --- meta/recipes-core/meta/cve-update-db-native.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 -- _______________________________________________ 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 19875a4..c15534d 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