summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-10-22 16:34:06 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-10-22 16:34:06 +0100
commit48b42dae5115ef321dfddcf570ae517c3874c4b9 (patch)
tree790aaa4acb9618bfc18fd85a1b964bea99e5c7df /meta
parent535a77a9b681423e2f10744aca54858c25a03cb0 (diff)
downloadpoky-48b42dae5115ef321dfddcf570ae517c3874c4b9.tar.gz
classes: Only enable fakeroot on setscene tasks with packaging
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/base.bbclass1
-rw-r--r--meta/classes/package.bbclass2
-rw-r--r--meta/classes/package_deb.bbclass2
-rw-r--r--meta/classes/package_ipk.bbclass2
-rw-r--r--meta/classes/package_rpm.bbclass2
5 files changed, 4 insertions, 5 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index feee524a6b..2c71571b3f 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -485,6 +485,7 @@ python () {
485 deps.append('virtual/fakeroot-native:do_populate_sysroot') 485 deps.append('virtual/fakeroot-native:do_populate_sysroot')
486 bb.data.setVarFlag('do_package', 'depends', " ".join(deps),d) 486 bb.data.setVarFlag('do_package', 'depends', " ".join(deps),d)
487 bb.data.setVarFlag('do_package', 'fakeroot', 1, d) 487 bb.data.setVarFlag('do_package', 'fakeroot', 1, d)
488 bb.data.setVarFlag('do_package_setscene', 'fakeroot', 1, d)
488 source_mirror_fetch = bb.data.getVar('SOURCE_MIRROR_FETCH', d, 0) 489 source_mirror_fetch = bb.data.getVar('SOURCE_MIRROR_FETCH', d, 0)
489 if not source_mirror_fetch: 490 if not source_mirror_fetch:
490 need_host = bb.data.getVar('COMPATIBLE_HOST', d, 1) 491 need_host = bb.data.getVar('COMPATIBLE_HOST', d, 1)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index a35fbb29ef..b64ff5de58 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1096,8 +1096,6 @@ python do_package_setscene () {
1096 sstate_setscene(d) 1096 sstate_setscene(d)
1097} 1097}
1098addtask do_package_setscene 1098addtask do_package_setscene
1099do_package_setscene[fakeroot] = "1"
1100
1101 1099
1102# Dummy task to mark when all packaging is complete 1100# Dummy task to mark when all packaging is complete
1103do_package_write () { 1101do_package_write () {
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 2f0d78ddb4..71a58fb294 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -273,7 +273,6 @@ python do_package_write_deb_setscene () {
273 sstate_setscene(d) 273 sstate_setscene(d)
274} 274}
275addtask do_package_write_deb_setscene 275addtask do_package_write_deb_setscene
276do_package_write_deb_setscene[fakeroot] = "1"
277 276
278python () { 277python () {
279 if bb.data.getVar('PACKAGES', d, True) != '': 278 if bb.data.getVar('PACKAGES', d, True) != '':
@@ -282,6 +281,7 @@ python () {
282 deps.append('virtual/fakeroot-native:do_populate_sysroot') 281 deps.append('virtual/fakeroot-native:do_populate_sysroot')
283 bb.data.setVarFlag('do_package_write_deb', 'depends', " ".join(deps), d) 282 bb.data.setVarFlag('do_package_write_deb', 'depends', " ".join(deps), d)
284 bb.data.setVarFlag('do_package_write_deb', 'fakeroot', "1", d) 283 bb.data.setVarFlag('do_package_write_deb', 'fakeroot', "1", d)
284 bb.data.setVarFlag('do_package_write_deb_setscene', 'fakeroot', "1", d)
285} 285}
286 286
287python do_package_write_deb () { 287python do_package_write_deb () {
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index e93d7e2b16..c1393fa764 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -317,7 +317,6 @@ python do_package_write_ipk_setscene () {
317 sstate_setscene(d) 317 sstate_setscene(d)
318} 318}
319addtask do_package_write_ipk_setscene 319addtask do_package_write_ipk_setscene
320do_package_write_ipk_setscene[fakeroot] = "1"
321 320
322python () { 321python () {
323 if bb.data.getVar('PACKAGES', d, True) != '': 322 if bb.data.getVar('PACKAGES', d, True) != '':
@@ -326,6 +325,7 @@ python () {
326 deps.append('virtual/fakeroot-native:do_populate_sysroot') 325 deps.append('virtual/fakeroot-native:do_populate_sysroot')
327 bb.data.setVarFlag('do_package_write_ipk', 'depends', " ".join(deps), d) 326 bb.data.setVarFlag('do_package_write_ipk', 'depends', " ".join(deps), d)
328 bb.data.setVarFlag('do_package_write_ipk', 'fakeroot', "1", d) 327 bb.data.setVarFlag('do_package_write_ipk', 'fakeroot', "1", d)
328 bb.data.setVarFlag('do_package_write_ipk_setscene', 'fakeroot', "1", d)
329} 329}
330 330
331python do_package_write_ipk () { 331python do_package_write_ipk () {
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 4ad97c35c5..fbe0626d6e 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -545,6 +545,7 @@ python () {
545 deps.append('virtual/fakeroot-native:do_populate_sysroot') 545 deps.append('virtual/fakeroot-native:do_populate_sysroot')
546 bb.data.setVarFlag('do_package_write_rpm', 'depends', " ".join(deps), d) 546 bb.data.setVarFlag('do_package_write_rpm', 'depends', " ".join(deps), d)
547 bb.data.setVarFlag('do_package_write_rpm', 'fakeroot', 1, d) 547 bb.data.setVarFlag('do_package_write_rpm', 'fakeroot', 1, d)
548 bb.data.setVarFlag('do_package_write_rpm_setscene', 'fakeroot', 1, d)
548} 549}
549 550
550SSTATETASKS += "do_package_write_rpm" 551SSTATETASKS += "do_package_write_rpm"
@@ -556,7 +557,6 @@ python do_package_write_rpm_setscene () {
556 sstate_setscene(d) 557 sstate_setscene(d)
557} 558}
558addtask do_package_write_rpm_setscene 559addtask do_package_write_rpm_setscene
559do_package_write_rpm_setscene[fakeroot] = "1"
560 560
561python do_package_write_rpm () { 561python do_package_write_rpm () {
562 bb.build.exec_func("read_subpackage_metadata", d) 562 bb.build.exec_func("read_subpackage_metadata", d)