From 5d6cbab419770eb556b57445fd5509339d3142b4 Mon Sep 17 00:00:00 2001 From: Pierre Le Magourou Date: Wed, 6 Nov 2019 17:37:26 +0200 Subject: [PATCH] cve-check: Depends on cve-update-db-native do_populate_cve_db is a native task. (From OE-Core rev: 4078da92b49946848cddebe1735f301af161e162) Signed-off-by: Pierre Le Magourou Signed-off-by: Richard Purdie Conflicts: meta/conf/distro/include/maintainers.inc --- meta/classes/cve-check.bbclass | 2 +- meta/conf/distro/include/maintainers.inc | 2 ++ .../meta/{cve-update-db.bb => cve-update-db-native.bb} | 0 3 files changed, 3 insertions(+), 1 deletion(-) rename meta/recipes-core/meta/{cve-update-db.bb => cve-update-db-native.bb} (100%) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 81071e3f19..6ffa0c4688 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -63,7 +63,7 @@ python do_cve_check () { } addtask cve_check after do_unpack before do_build -do_cve_check[depends] = "cve-update-db:do_populate_cve_db" +do_cve_check[depends] = "cve-update-db-native:do_populate_cve_db" do_cve_check[nostamp] = "1" python cve_check_cleanup () { diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index a299177c35..ee46a98254 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -122,7 +122,9 @@ RECIPE_MAINTAINER_pn-cryptodev-module = "Robert Yang RECIPE_MAINTAINER_pn-cryptodev-tests = "Robert Yang " RECIPE_MAINTAINER_pn-cups = "Chen Qi " RECIPE_MAINTAINER_pn-curl = "Armin Kuster " +RECIPE_MAINTAINER_pn-cve-check-tool = "Ross Burton " RECIPE_MAINTAINER_pn-cve-update-db = "Ross Burton " +RECIPE_MAINTAINER_pn-cve-update-db-native = "Ross Burton " RECIPE_MAINTAINER_pn-cwautomacros = "Maxin B. John " RECIPE_MAINTAINER_pn-damageproto = "Armin Kuster " RECIPE_MAINTAINER_pn-db = "Mark Hatle " diff --git a/meta/recipes-core/meta/cve-update-db.bb b/meta/recipes-core/meta/cve-update-db-native.bb similarity index 100% rename from meta/recipes-core/meta/cve-update-db.bb rename to meta/recipes-core/meta/cve-update-db-native.bb -- 2.40.1