[meta-oe,1/3] cve-check: Depends on cve-update-db-native

Submitted by Pierre Le Magourou on July 4, 2019, 3:19 p.m. | Patch ID: 162776

Details

Message ID 20190704151908.5094-1-lemagoup@gmail.com
State Master Next
Commit 07ac9fd077a7a6ff0602228b77364d384ab5527c
Headers show

Commit Message

Pierre Le Magourou July 4, 2019, 3:19 p.m.
From: Pierre Le Magourou <pierre.lemagourou@softbankrobotics.com>

do_populate_cve_db is a native task.

Signed-off-by: Pierre Le Magourou <pierre.lemagourou@softbankrobotics.com>
---
 meta/classes/cve-check.bbclass          | 2 +-
 meta/recipes-core/meta/cve-update-db.bb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

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/recipes-core/meta/cve-update-db.bb b/meta/recipes-core/meta/cve-update-db.bb
index ae8f1a958b..8e553b4f9b 100644
--- a/meta/recipes-core/meta/cve-update-db.bb
+++ b/meta/recipes-core/meta/cve-update-db.bb
@@ -141,3 +141,4 @@  addtask do_populate_cve_db before do_fetch
 do_populate_cve_db[nostamp] = "1"
 
 EXCLUDE_FROM_WORLD = "1"
+BBCLASSEXTEND =+ "native"

Comments

Richard Purdie July 4, 2019, 4:53 p.m.
On Thu, 2019-07-04 at 17:19 +0200, Pierre Le Magourou wrote:
> From: Pierre Le Magourou <pierre.lemagourou@softbankrobotics.com>
> 
> do_populate_cve_db is a native task.
> 
> Signed-off-by: Pierre Le Magourou <
> pierre.lemagourou@softbankrobotics.com>
> ---
>  meta/classes/cve-check.bbclass          | 2 +-
>  meta/recipes-core/meta/cve-update-db.bb | 1 +
>  2 files changed, 2 insertions(+), 1 deletion(-)


https://autobuilder.yoctoproject.org/typhoon/#/builders/23/builds/1015

:(

Cheers,

Richard
Pierre Le Magourou July 5, 2019, 9:34 a.m.
Hello,

> > From: Pierre Le Magourou <pierre.lemagourou@softbankrobotics.com>
> >
> > do_populate_cve_db is a native task.
> >
> > Signed-off-by: Pierre Le Magourou <
> > pierre.lemagourou@softbankrobotics.com>
> > ---
> >  meta/classes/cve-check.bbclass          | 2 +-
> >  meta/recipes-core/meta/cve-update-db.bb | 1 +
> >  2 files changed, 2 insertions(+), 1 deletion(-)
>
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/23/builds/1015
>
> :(

The autobuilder job launches cve-update-db and cve-update-db-native in
parallel, this cannot work because they both try to update the same
sqlite db.
As cve-update-db is only used for the build machine (native only), we
only need a cve-update-db-native.bb recipe. I'll send a v2 patch to
fix that.

ps: Sorry I just realized I was sending the patches to the wrong
destination (meta-oe instead of oe-core)

Pierre