summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-11-28 20:01:41 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-11-28 20:01:41 +0000
commitd862b5758c48968e6b40597b60d31673b61007a1 (patch)
treee18efc8db2e9dd079d5ba012ecd0fddaf6d34215 /meta/classes
parent91225da5b854cc0b6416041b47762841eb53b606 (diff)
downloadpoky-d862b5758c48968e6b40597b60d31673b61007a1.tar.gz
package_{ipk|deb|tar|rpm): append depend-tasks instead of overwriting
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3265 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/package_deb.bbclass5
-rw-r--r--meta/classes/package_ipk.bbclass5
-rw-r--r--meta/classes/package_rpm.bbclass5
-rw-r--r--meta/classes/package_tar.bbclass5
4 files changed, 16 insertions, 4 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index eb8895e64a..ef0eacf44f 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -266,7 +266,10 @@ python do_package_deb () {
266python () { 266python () {
267 import bb 267 import bb
268 if bb.data.getVar('PACKAGES', d, True) != '': 268 if bb.data.getVar('PACKAGES', d, True) != '':
269 bb.data.setVarFlag('do_package_write_deb', 'depends', 'dpkg-native:do_populate_staging fakeroot-native:do_populate_staging', d) 269 deps = (bb.data.getVarFlag('do_package_write_deb', 'depends', d) or "").split()
270 deps.append('dpkg-native:do_populate_staging')
271 deps.append('fakeroot-native:do_populate_staging')
272 bb.data.setVarFlag('do_package_write_deb', 'depends', " ".join(deps), d)
270} 273}
271 274
272python do_package_write_deb () { 275python do_package_write_deb () {
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 877ea980e3..abb679830d 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -303,7 +303,10 @@ python do_package_ipk () {
303python () { 303python () {
304 import bb 304 import bb
305 if bb.data.getVar('PACKAGES', d, True) != '': 305 if bb.data.getVar('PACKAGES', d, True) != '':
306 bb.data.setVarFlag('do_package_write_ipk', 'depends', 'ipkg-utils-native:do_populate_staging fakeroot-native:do_populate_staging', d) 306 deps = (bb.data.getVarFlag('do_package_write_ipk', 'depends', d) or "").split()
307 deps.append('ipkg-utils-native:do_populate_staging')
308 deps.append('fakeroot-native:do_populate_staging')
309 bb.data.setVarFlag('do_package_write_ipk', 'depends', " ".join(deps), d)
307} 310}
308 311
309python do_package_write_ipk () { 312python do_package_write_ipk () {
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 7fc5e8ea96..6713f8fcad 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -134,7 +134,10 @@ python do_package_rpm () {
134python () { 134python () {
135 import bb 135 import bb
136 if bb.data.getVar('PACKAGES', d, True) != '': 136 if bb.data.getVar('PACKAGES', d, True) != '':
137 bb.data.setVarFlag('do_package_write_rpm', 'depends', 'rpm-native:do_populate_staging', d) 137 deps = (bb.data.getVarFlag('do_package_write_rpm', 'depends', d) or "").split()
138 deps.append('rpm-native:do_populate_staging')
139 deps.append('fakeroot-native:do_populate_staging')
140 bb.data.setVarFlag('do_package_write_rpm', 'depends', " ".join(deps), d)
138} 141}
139 142
140 143
diff --git a/meta/classes/package_tar.bbclass b/meta/classes/package_tar.bbclass
index cb4c42b261..392a4f222e 100644
--- a/meta/classes/package_tar.bbclass
+++ b/meta/classes/package_tar.bbclass
@@ -99,7 +99,10 @@ python do_package_tar () {
99python () { 99python () {
100 import bb 100 import bb
101 if bb.data.getVar('PACKAGES', d, True) != '': 101 if bb.data.getVar('PACKAGES', d, True) != '':
102 bb.data.setVarFlag('do_package_write_tar', 'depends', 'tar-native:do_populate_staging', d) 102 deps = (bb.data.getVarFlag('do_package_write_tar', 'depends', d) or "").split()
103 deps.append('tar-native:do_populate_staging')
104 deps.append('fakeroot-native:do_populate_staging')
105 bb.data.setVarFlag('do_package_write_tar', 'depends', " ".join(deps), d)
103} 106}
104 107
105 108