summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-04-10 11:23:14 +0000
committerRichard Purdie <richard@openedhand.com>2007-04-10 11:23:14 +0000
commitaca29f112c35991c1d8fc27e0f6eb45f0318cb10 (patch)
tree3bfb31161c5ac69c5878db22ebcb74128dcd4ff1
parent3016afc92e72fc47519c58a1ebb62930e331a723 (diff)
downloadpoky-aca29f112c35991c1d8fc27e0f6eb45f0318cb10.tar.gz
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
-rw-r--r--meta/classes/insane.bbclass2
-rw-r--r--meta/classes/package.bbclass11
2 files changed, 9 insertions, 4 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index eef4f72678..4bceaaed82 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -20,7 +20,7 @@
20 20
21# We play a special package function 21# We play a special package function
22inherit package 22inherit package
23do_package[depends] += "pax-utils-native:do_populate_staging" 23PACKAGE_DEPENDS += "pax-utils-native"
24PACKAGEFUNCS += " do_package_qa " 24PACKAGEFUNCS += " do_package_qa "
25 25
26def package_qa_check_rpath(file,name,d): 26def package_qa_check_rpath(file,name,d):
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 70313a192e..416bf98c6b 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
116 116
117 bb.data.setVar('PACKAGES', ' '.join(packages), d) 117 bb.data.setVar('PACKAGES', ' '.join(packages), d)
118 118
119PACKAGE_DEPENDS += "file-native"
120
119python () { 121python () {
120 import bb 122 import bb
123 if bb.data.getVar('PACKAGES', d, True) != '':
124 deps = bb.data.getVarFlag('do_package', 'depends', d) or ""
125 for dep in (bb.data.getVar('PACKAGE_DEPENDS', d, True) or "").split():
126 deps += " %s:do_populate_staging" % dep
127 bb.data.setVarFlag('do_package', 'depends', deps, d)
121 128
122 if bb.data.getVar('PACKAGES', d, 1) != '':
123 bb.data.setVarFlag('do_package', 'depends', 'file-native:do_populate_staging', d)
124 deps = bb.data.getVarFlag('do_package_write', 'depends', d) or "" 129 deps = bb.data.getVarFlag('do_package_write', 'depends', d) or ""
125 for dep in (bb.data.getVar('PACKAGE_EXTRA_DEPENDS', d, 1) or "").split(): 130 for dep in (bb.data.getVar('PACKAGE_EXTRA_DEPENDS', d, True) or "").split():
126 deps += " %s:do_populate_staging" % dep 131 deps += " %s:do_populate_staging" % dep
127 bb.data.setVarFlag('do_package_write', 'depends', deps, d) 132 bb.data.setVarFlag('do_package_write', 'depends', deps, d)
128} 133}