Add do_configure as dependency only when it exists

From: Kai Kang <[email protected]>

The following changes since commit fc45deac89ef63ca1c44e763c38ced7dfd72cbe1:

build-appliance-image: Update to jethro head revision (2015-11-03 14:03:03 +0000)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib kangkai/archiver
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=kangkai/archiver

Kai Kang (1):
archiver.bbclass: fix an exception of the mode configured

 meta/classes/archiver.bbclass | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

2.6.1

From: Kai Kang <[email protected]>

If ARCHIVER_MODE[src] is set with 'configured', the task do_ar_configured depends on do_configure. Package gcc-source has deleted task do_configure, then causes error:

| ERROR: Task do_ar_configured in .../meta/recipes-devtools/gcc/gcc-source_5.2.bb | depends upon non-existent task do_configure in .../meta/recipes-devtools/gcc/gcc-source_5.2.bb

Only add the dependency when the task exits.

---
 meta/classes/archiver.bbclass | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

index 41a552c..0874553 100644
@@ -73,8 +73,13 @@ python () {
         # We can't use "addtask do_ar_configured after do_configure" since it
         # will cause the deptask of do_populate_sysroot to run not matter what
         # archives we need, so we add the depends here.
-        d.appendVarFlag('do_ar_configured', 'depends', ' %s:do_configure' % pn)
-        d.appendVarFlag('do_deploy_archives', 'depends', ' %s:do_ar_configured' % pn)
+        #
+        # For some specific packages like gcc-source, do_configure may be deleted.
+        if 'do_configure' not in (d.getVar('__BBTASKS', False) or []):
+            pass
+        else:
+            d.appendVarFlag('do_ar_configured', 'depends', ' %s:do_configure' % pn)
+            d.appendVarFlag('do_deploy_archives', 'depends', ' %s:do_ar_configured' % pn)
     elif ar_src:
         bb.fatal("Invalid ARCHIVER_MODE[src]: %s" % ar_src)
 

2.6.1

This patch is originally from Jian. I saw he sent the patch just now, so please ignore this one.

Regards,
Neil | Kai Kang