From 5361b96ef188358ce270d55a45bbabf23fb6d6de Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 2 Jun 2011 12:16:29 -0700 Subject: sourceipk: deal with compileconfigs only when it exists Signed-off-by: Chris Larson Signed-off-by: Koen Kooi --- classes/sourceipk.bbclass | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'classes') diff --git a/classes/sourceipk.bbclass b/classes/sourceipk.bbclass index 8214f78ecf..eb313a1f3f 100644 --- a/classes/sourceipk.bbclass +++ b/classes/sourceipk.bbclass @@ -139,18 +139,14 @@ EXPORT_FUNCTIONS do_create_srcipk do_create_srcipk[deptask] = "do_patch" -# Add a blank compileconfigs task. This allows the sourceipk to schedule -# its copy of the sources for kernels using the multi-kernel functionality -# before the compileconfigs task. Failure to do this results in a race -# condition where in the best case the sources packaged may contain binary -# builds and in the worst case binary files being cleaned cause an error -# in the copy command for the sourceipk. -do_compileconfigs() { - : -} -addtask compileconfigs after do_patch before do_configure +addtask create_srcipk after do_patch before do_configure -addtask create_srcipk after do_patch before do_compileconfigs +python () { + if d.getVar('do_compileconfigs', False): + deps = d.getVarFlag('do_compileconfigs', 'deps') or [] + deps.append('do_create_srcipk') + d.setVarFlag('do_compileconfigs', 'deps', deps) +} #Add source packages to list of packages OE knows about PACKAGES_DYNAMIC += "${PN}-src" -- cgit 1.2.3-korg