diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-16 06:55:21 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-10-05 22:26:33 +0100 |
| commit | 2d93cb0a0d70e6219379363cd80d375e30abebae (patch) | |
| tree | 9c18ed6442ca653e1d4dcf75e1986cd17a75cc19 | |
| parent | 425435f403bce05614ab91d4f685135c30408a99 (diff) | |
| download | poky-2d93cb0a0d70e6219379363cd80d375e30abebae.tar.gz | |
Revert "classes: Disable setscene tasks for initial testing"
This reverts commit 084ec86402bba92418898a4c47667a0574a3b3ee.
| -rw-r--r-- | meta/classes/deploy.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/package.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/package_deb.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/package_ipk.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/package_rpm.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/staging.bbclass | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/deploy.bbclass b/meta/classes/deploy.bbclass index 99c4abb6a2..f697e70aa4 100644 --- a/meta/classes/deploy.bbclass +++ b/meta/classes/deploy.bbclass | |||
| @@ -7,5 +7,5 @@ do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}" | |||
| 7 | python do_deploy_setscene () { | 7 | python do_deploy_setscene () { |
| 8 | sstate_setscene(d) | 8 | sstate_setscene(d) |
| 9 | } | 9 | } |
| 10 | #addtask do_deploy_setscene | 10 | addtask do_deploy_setscene |
| 11 | do_deploy[dirs] = "${DEPLOYDIR} ${B}" | 11 | do_deploy[dirs] = "${DEPLOYDIR} ${B}" |
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index ddd1781c7a..b64ff5de58 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
| @@ -1095,7 +1095,7 @@ do_package[sstate-lockfile] = "${PACKAGELOCK}" | |||
| 1095 | python do_package_setscene () { | 1095 | python do_package_setscene () { |
| 1096 | sstate_setscene(d) | 1096 | sstate_setscene(d) |
| 1097 | } | 1097 | } |
| 1098 | #addtask do_package_setscene | 1098 | addtask do_package_setscene |
| 1099 | 1099 | ||
| 1100 | # Dummy task to mark when all packaging is complete | 1100 | # Dummy task to mark when all packaging is complete |
| 1101 | do_package_write () { | 1101 | do_package_write () { |
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 1bb2ebd766..eb4df5e704 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass | |||
| @@ -260,7 +260,7 @@ do_package_write_deb[sstate-outputdirs] = "${DEPLOY_DIR_DEB}" | |||
| 260 | python do_package_write_deb_setscene () { | 260 | python do_package_write_deb_setscene () { |
| 261 | sstate_setscene(d) | 261 | sstate_setscene(d) |
| 262 | } | 262 | } |
| 263 | #addtask do_package_write_deb_setscene | 263 | addtask do_package_write_deb_setscene |
| 264 | 264 | ||
| 265 | python () { | 265 | python () { |
| 266 | if bb.data.getVar('PACKAGES', d, True) != '': | 266 | if bb.data.getVar('PACKAGES', d, True) != '': |
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 014e4094be..1758283f61 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass | |||
| @@ -307,7 +307,7 @@ do_package_write_ipk[sstate-outputdirs] = "${DEPLOY_DIR_IPK}" | |||
| 307 | python do_package_write_ipk_setscene () { | 307 | python do_package_write_ipk_setscene () { |
| 308 | sstate_setscene(d) | 308 | sstate_setscene(d) |
| 309 | } | 309 | } |
| 310 | #addtask do_package_write_ipk_setscene | 310 | addtask do_package_write_ipk_setscene |
| 311 | 311 | ||
| 312 | python () { | 312 | python () { |
| 313 | if bb.data.getVar('PACKAGES', d, True) != '': | 313 | if bb.data.getVar('PACKAGES', d, True) != '': |
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index b70575cea0..98912cc1fe 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
| @@ -555,7 +555,7 @@ do_package_write_rpm[sstate-outputdirs] = "${DEPLOY_DIR_RPM}" | |||
| 555 | python do_package_write_rpm_setscene () { | 555 | python do_package_write_rpm_setscene () { |
| 556 | sstate_setscene(d) | 556 | sstate_setscene(d) |
| 557 | } | 557 | } |
| 558 | #addtask do_package_write_rpm_setscene | 558 | addtask do_package_write_rpm_setscene |
| 559 | 559 | ||
| 560 | python do_package_write_rpm () { | 560 | python do_package_write_rpm () { |
| 561 | bb.build.exec_func("read_subpackage_metadata", d) | 561 | bb.build.exec_func("read_subpackage_metadata", d) |
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index fd5e018e68..e82db83892 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass | |||
| @@ -110,7 +110,7 @@ do_populate_sysroot[sstate-outputdirs] = "${TMPDIR}/sysroots" | |||
| 110 | python do_populate_sysroot_setscene () { | 110 | python do_populate_sysroot_setscene () { |
| 111 | sstate_setscene(d) | 111 | sstate_setscene(d) |
| 112 | } | 112 | } |
| 113 | #addtask do_populate_sysroot_setscene | 113 | addtask do_populate_sysroot_setscene |
| 114 | 114 | ||
| 115 | 115 | ||
| 116 | python () { | 116 | python () { |
