diff options
author | Pierre Le Magourou <pierre.lemagourou@softbankrobotics.com> | 2019-11-06 17:37:26 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-07 19:47:26 +0000 |
commit | 470ea72f1cfdf3702e933cf4c73e63da756b3981 (patch) | |
tree | d7e666d0b3633e8f33788f7032a0bd9d13c1da18 | |
parent | 2bd56b2474c6180338d2ad1b485352c88e84a250 (diff) | |
download | poky-470ea72f1cfdf3702e933cf4c73e63da756b3981.tar.gz |
cve-check: Depends on cve-update-db-native
do_populate_cve_db is a native task.
(From OE-Core rev: 4078da92b49946848cddebe1735f301af161e162)
(From OE-Core rev: 5d6cbab419770eb556b57445fd5509339d3142b4)
Signed-off-by: Pierre Le Magourou <pierre.lemagourou@softbankrobotics.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Conflicts:
meta/conf/distro/include/maintainers.inc
-rw-r--r-- | meta/classes/cve-check.bbclass | 2 | ||||
-rw-r--r-- | meta/conf/distro/include/maintainers.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/meta/cve-update-db-native.bb (renamed from meta/recipes-core/meta/cve-update-db.bb) | 0 |
3 files changed, 3 insertions, 1 deletions
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 () { | |||
63 | } | 63 | } |
64 | 64 | ||
65 | addtask cve_check after do_unpack before do_build | 65 | addtask cve_check after do_unpack before do_build |
66 | do_cve_check[depends] = "cve-update-db:do_populate_cve_db" | 66 | do_cve_check[depends] = "cve-update-db-native:do_populate_cve_db" |
67 | do_cve_check[nostamp] = "1" | 67 | do_cve_check[nostamp] = "1" |
68 | 68 | ||
69 | python cve_check_cleanup () { | 69 | 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 <liezhi.yang@windriver.com> | |||
122 | RECIPE_MAINTAINER_pn-cryptodev-tests = "Robert Yang <liezhi.yang@windriver.com>" | 122 | RECIPE_MAINTAINER_pn-cryptodev-tests = "Robert Yang <liezhi.yang@windriver.com>" |
123 | RECIPE_MAINTAINER_pn-cups = "Chen Qi <Qi.Chen@windriver.com>" | 123 | RECIPE_MAINTAINER_pn-cups = "Chen Qi <Qi.Chen@windriver.com>" |
124 | RECIPE_MAINTAINER_pn-curl = "Armin Kuster <akuster@mvista.com>" | 124 | RECIPE_MAINTAINER_pn-curl = "Armin Kuster <akuster@mvista.com>" |
125 | RECIPE_MAINTAINER_pn-cve-check-tool = "Ross Burton <ross.burton@intel.com>" | ||
125 | RECIPE_MAINTAINER_pn-cve-update-db = "Ross Burton <ross.burton@intel.com>" | 126 | RECIPE_MAINTAINER_pn-cve-update-db = "Ross Burton <ross.burton@intel.com>" |
127 | RECIPE_MAINTAINER_pn-cve-update-db-native = "Ross Burton <ross.burton@intel.com>" | ||
126 | RECIPE_MAINTAINER_pn-cwautomacros = "Maxin B. John <maxin.john@intel.com>" | 128 | RECIPE_MAINTAINER_pn-cwautomacros = "Maxin B. John <maxin.john@intel.com>" |
127 | RECIPE_MAINTAINER_pn-damageproto = "Armin Kuster <akuster@mvista.com>" | 129 | RECIPE_MAINTAINER_pn-damageproto = "Armin Kuster <akuster@mvista.com>" |
128 | RECIPE_MAINTAINER_pn-db = "Mark Hatle <mark.hatle@windriver.com>" | 130 | RECIPE_MAINTAINER_pn-db = "Mark Hatle <mark.hatle@windriver.com>" |
diff --git a/meta/recipes-core/meta/cve-update-db.bb b/meta/recipes-core/meta/cve-update-db-native.bb index ae8f1a958b..ae8f1a958b 100644 --- a/meta/recipes-core/meta/cve-update-db.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb | |||