[oe-commits] Chris Larson : sourceipk: deal with compileconfigs only when it exists
git version control
git at git.openembedded.org
Thu Jun 2 20:01:31 UTC 2011
Module: openembedded.git
Branch: testing-next
Commit: 964f73b2bac99adc2505462ac254e4a4b9a24865
URL: http://git.openembedded.org/?p=openembedded.git&a=commit;h=964f73b2bac99adc2505462ac254e4a4b9a24865
Author: Chris Larson <chris_larson at mentor.com>
Date: Thu Jun 2 12:16:29 2011 -0700
sourceipk: deal with compileconfigs only when it exists
Signed-off-by: Chris Larson <chris_larson at mentor.com>
---
classes/sourceipk.bbclass | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/classes/sourceipk.bbclass b/classes/sourceipk.bbclass
index 8214f78..eb313a1 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"
More information about the Openembedded-commits
mailing list