From: Michael Opdenacker <michael.opdenacker@bootlin.com>
Date: Fri, 6 Aug 2021 10:53:27 +0000 (+0200)
Subject: cve-check: remove deprecated CVE_CHECK_CVE_WHITELIST
X-Git-Tag: yocto-3.1.11~72
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=3c4719eda2b0d8fe1b7cc4006c05ee8c4618e4c6;p=openembedded-core.git

cve-check: remove deprecated CVE_CHECK_CVE_WHITELIST

This variable has been deprecated since Yocto Project version 3.0.

Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit f8ac58568b2dceef54a743369460019b3a3eeccd)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---

diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass
index f9e5cfa451..b6df2c31da 100644
--- a/meta/classes/cve-check.bbclass
+++ b/meta/classes/cve-check.bbclass
@@ -238,9 +238,6 @@ def check_cves(d, patched_cves):
         bb.note("Recipe has been whitelisted, skipping check")
         return ([], [], [])
 
-    old_cve_whitelist =  d.getVar("CVE_CHECK_CVE_WHITELIST")
-    if old_cve_whitelist:
-        bb.warn("CVE_CHECK_CVE_WHITELIST is deprecated, please use CVE_CHECK_WHITELIST.")
     cve_whitelist = d.getVar("CVE_CHECK_WHITELIST").split()
 
     import sqlite3