diff options
author | Richard Purdie <richard@openedhand.com> | 2007-04-10 11:23:14 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2007-04-10 11:23:14 +0000 |
commit | aca29f112c35991c1d8fc27e0f6eb45f0318cb10 (patch) | |
tree | 3bfb31161c5ac69c5878db22ebcb74128dcd4ff1 /meta | |
parent | 3016afc92e72fc47519c58a1ebb62930e331a723 (diff) | |
download | openembedded-core-aca29f112c35991c1d8fc27e0f6eb45f0318cb10.tar.gz openembedded-core-aca29f112c35991c1d8fc27e0f6eb45f0318cb10.tar.bz2 openembedded-core-aca29f112c35991c1d8fc27e0f6eb45f0318cb10.tar.xz openembedded-core-aca29f112c35991c1d8fc27e0f6eb45f0318cb10.zip |
package.bbclass/insane.bbclass: Don't set task dependencies when PACKAGES is empty
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1455 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/insane.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/package.bbclass | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index eef4f7267..4bceaaed8 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -20,7 +20,7 @@ # We play a special package function inherit package -do_package[depends] += "pax-utils-native:do_populate_staging" +PACKAGE_DEPENDS += "pax-utils-native" PACKAGEFUNCS += " do_package_qa " def package_qa_check_rpath(file,name,d): diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 70313a192..416bf98c6 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -116,13 +116,18 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst bb.data.setVar('PACKAGES', ' '.join(packages), d) +PACKAGE_DEPENDS += "file-native" + python () { import bb + if bb.data.getVar('PACKAGES', d, True) != '': + deps = bb.data.getVarFlag('do_package', 'depends', d) or "" + for dep in (bb.data.getVar('PACKAGE_DEPENDS', d, True) or "").split(): + deps += " %s:do_populate_staging" % dep + bb.data.setVarFlag('do_package', 'depends', deps, d) - if bb.data.getVar('PACKAGES', d, 1) != '': - bb.data.setVarFlag('do_package', 'depends', 'file-native:do_populate_staging', d) deps = bb.data.getVarFlag('do_package_write', 'depends', d) or "" - for dep in (bb.data.getVar('PACKAGE_EXTRA_DEPENDS', d, 1) or "").split(): + for dep in (bb.data.getVar('PACKAGE_EXTRA_DEPENDS', d, True) or "").split(): deps += " %s:do_populate_staging" % dep bb.data.setVarFlag('do_package_write', 'depends', deps, d) } |