From patchwork Sun Dec 8 18:35:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niko Mauno X-Patchwork-Id: 180967 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp3449214ile; Sun, 8 Dec 2019 10:40:34 -0800 (PST) X-Google-Smtp-Source: APXvYqyrCtwHsIvUDIPkAP6qMHhld1+rwUemZZHjAO/v70+p7u9PhWoyiPpqL/0btkpxdIGNy72K X-Received: by 2002:a63:774a:: with SMTP id s71mr14941000pgc.57.1575830432420; Sun, 08 Dec 2019 10:40:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575830432; cv=none; d=google.com; s=arc-20160816; b=ybDJB8O9Pa6QPri73wcQ+pJk6FYDLRp557USJ+nkVdsKZNPPD1aN7zyvkbEvFEZE/s Ft0YbYEnBIlO5EkVYaSPmoK01JlllMbzvukGIVxgCVNNchDkwhUyi6akUL4wI4QHkXDD oRfky7jstVF2pKBPVoKoW4Gg8AyYRmXwmmmVGEWg7bBKIZRqSjF887MRVGxuPdSuxmFs vrLNaaHHmxjWYPSwu3DZ7bGZtu2LIN/IyD6o4MPRa+TbpvcD7L9qBf13KlovOfBYfuoG +NRjXrmLoEMlDlho6HXVgWMrc9cX/DUZEbS5UYKFOMD6DG/I/Sg5I+Ehjhu7nHrduiGi 1h/Q== 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:references:in-reply-to:message-id:date:to:from :delivered-to; bh=r4X8fai96My1vBJsaeCn0s1DImJGpD0YxuKSwth7wKs=; b=GquNseXgWfKa1B/koAQxZQ9piKb4RFI1z7Rg/b3zR3OPgewu3FWNcUbpd5uCZx9mEq 4sqSOUdr3FVsEwkW3RJjIAARaCfHNN/kZJv+gR2cHSOm+UabNoHGTv/p0b6HSOR6Stge JplRM4QeN2XNyvmSqAzUn84hZ2i4T2S1i8Z7bvy2eIRntv+e5UucpK+8vo6/ddeQwFhj gnBeX/xWwdciFOZIJCCwJOElST9MSWQ2WrLl8fY5JXXjRt3MtrYtFb8SD/Zx4yjbkXjz 4U2PkSlx9uqsUzCd7AmaHL6bIshyKY8KcNvawL7CnU70vXt+84e1yEZ8efan691XF74l +QzA== ARC-Authentication-Results: i=1; mx.google.com; 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=iki.fi Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id h7si15551809pls.28.2019.12.08.10.40.31; Sun, 08 Dec 2019 10:40:32 -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; 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=iki.fi 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 1C7E47FBBD; Sun, 8 Dec 2019 18:40:30 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from sinikuusama2.dnainternet.net (sinikuusama2.dnainternet.net [83.102.40.152]) by mail.openembedded.org (Postfix) with ESMTP id AB61B7F9DE for ; Sun, 8 Dec 2019 18:40:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by sinikuusama2.dnainternet.net (Postfix) with ESMTP id 86C5CF9A5; Sun, 8 Dec 2019 20:40:29 +0200 (EET) X-Virus-Scanned: DNA Internet at dnainternet.net X-Spam-Flag: NO X-Spam-Score: 0.653 X-Spam-Level: X-Spam-Status: No, score=0.653 tagged_above=-9999 required=6 tests=[SPF_HELO_NONE=0.001, SPF_NEUTRAL=0.652] autolearn=disabled Received: from sinikuusama2.dnainternet.net ([83.102.40.152]) by localhost (sinikuusama2.dnainternet.net [127.0.0.1]) (DNA Internet, port 10041) with ESMTP id nDg_jOZyMKT5; Sun, 8 Dec 2019 20:40:29 +0200 (EET) Received: from luumupuu2.dnainternet.net (luumupuu2.dnainternet.net [83.102.40.55]) by sinikuusama2.dnainternet.net (Postfix) with ESMTP id 3346810992; Sun, 8 Dec 2019 20:40:29 +0200 (EET) Received: from localhost.localdomain (62-78-161-185.bb.dnainternet.fi [62.78.161.185]) by luumupuu2.dnainternet.net (Postfix) with ESMTP id 5613B74; Sun, 8 Dec 2019 20:40:24 +0200 (EET) From: Niko Mauno To: openembedded-core@lists.openembedded.org Date: Sun, 8 Dec 2019 20:35:52 +0200 Message-Id: <20191208183557.32589-6-niko.mauno@iki.fi> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191208183557.32589-1-niko.mauno@iki.fi> References: <20191208183557.32589-1-niko.mauno@iki.fi> MIME-Version: 1.0 Subject: [OE-core] [thud-next][PATCH 06/11] 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 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 --- 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 19875a49b1..c15534de08 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