[oe-commits] Laurentiu Palcu : archive-*-source.bbclass: handle dependency in anonymous function
git at git.openembedded.org
git at git.openembedded.org
Tue Jul 9 09:45:57 UTC 2013
Module: openembedded-core.git
Branch: dylan
Commit: 94ba93a04099866af91bfc86dca0633e7fef8ffb
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=94ba93a04099866af91bfc86dca0633e7fef8ffb
Author: Laurentiu Palcu <laurentiu.palcu at intel.com>
Date: Tue May 7 15:31:14 2013 +0300
archive-*-source.bbclass: handle dependency in anonymous function
Using "before do_rootfs" would have this task added to do_rootfs
dependencies regardless of the filtering options. Instead, add this
dependency in the anonymous python function.
(From OE-Core master rev: 2400a74923e51e17ecfa94c2d63908b0b2aac76a)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/archive-configured-source.bbclass | 7 +++++--
meta/classes/archive-original-source.bbclass | 7 +++++--
meta/classes/archive-patched-source.bbclass | 7 +++++--
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/meta/classes/archive-configured-source.bbclass b/meta/classes/archive-configured-source.bbclass
index a481b14..54c2344 100644
--- a/meta/classes/archive-configured-source.bbclass
+++ b/meta/classes/archive-configured-source.bbclass
@@ -14,7 +14,7 @@ addtask do_archive_configured_sources after do_configure
addtask do_archive_scripts_logs
# Get dump date and create diff file
-addtask do_dumpdata_create_diff_gz before do_rootfs
+addtask do_dumpdata_create_diff_gz
python () {
pn = d.getVar('PN', True)
@@ -34,7 +34,10 @@ python () {
d.appendVarFlag('do_compile', 'depends', ' %s:do_archive_configured_sources' %pn)
build_deps += ' %s:do_archive_configured_sources' %pn
- d.appendVarFlag('do_build', 'depends', build_deps)
+ if bb.data.inherits_class('image', d):
+ d.appendVarFlag('do_rootfs', 'depends', build_deps)
+ else:
+ d.appendVarFlag('do_build', 'depends', build_deps)
}
ARCHIVE_SSTATE_OUTDIR = "${DEPLOY_DIR}/sources/"
diff --git a/meta/classes/archive-original-source.bbclass b/meta/classes/archive-original-source.bbclass
index 2796ff9..7e9ed6d 100644
--- a/meta/classes/archive-original-source.bbclass
+++ b/meta/classes/archive-original-source.bbclass
@@ -14,7 +14,7 @@ addtask do_archive_original_sources_patches after do_unpack
addtask do_archive_scripts_logs
# Get dump date and create diff file
-addtask do_dumpdata_create_diff_gz before do_rootfs
+addtask do_dumpdata_create_diff_gz
python () {
pn = d.getVar('PN', True)
@@ -34,7 +34,10 @@ python () {
d.appendVarFlag('do_patch', 'depends', ' %s:do_archive_original_sources_patches' %pn)
build_deps += ' %s:do_archive_original_sources_patches' %pn
- d.appendVarFlag('do_build', 'depends', build_deps)
+ if bb.data.inherits_class('image', d):
+ d.appendVarFlag('do_rootfs', 'depends', build_deps)
+ else:
+ d.appendVarFlag('do_build', 'depends', build_deps)
}
ARCHIVE_SSTATE_OUTDIR = "${DEPLOY_DIR}/sources/"
diff --git a/meta/classes/archive-patched-source.bbclass b/meta/classes/archive-patched-source.bbclass
index 995a259..d8d494a 100644
--- a/meta/classes/archive-patched-source.bbclass
+++ b/meta/classes/archive-patched-source.bbclass
@@ -14,7 +14,7 @@ addtask do_archive_patched_sources after do_patch
addtask do_archive_scripts_logs
# Get dump date and create diff file
-addtask do_dumpdata_create_diff_gz before do_rootfs
+addtask do_dumpdata_create_diff_gz
python () {
pn = d.getVar('PN', True)
@@ -34,7 +34,10 @@ python () {
d.appendVarFlag('do_configure', 'depends', ' %s:do_archive_patched_sources' %pn)
build_deps += ' %s:do_archive_patched_sources' %pn
- d.appendVarFlag('do_build', 'depends', build_deps)
+ if bb.data.inherits_class('image', d):
+ d.appendVarFlag('do_rootfs', 'depends', build_deps)
+ else:
+ d.appendVarFlag('do_build', 'depends', build_deps)
}
ARCHIVE_SSTATE_OUTDIR = "${DEPLOY_DIR}/sources/"
More information about the Openembedded-commits
mailing list