diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-23 14:27:33 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-25 12:42:47 +0000 |
commit | 32472926832ed1344889c992c1919a2a8b778b2c (patch) | |
tree | 56e2f50861fcfaf09c4ce63a3047630377984e9e /meta/classes/image.bbclass | |
parent | c13e458b22ca1b870332540e0edbc1975c342c79 (diff) | |
download | poky-32472926832ed1344889c992c1919a2a8b778b2c.tar.gz |
Split do_packagedata task from do_package
Currently, do_rootfs has a dependency on all the do_package output being present
due to its usage of the pkgdata directories. This means that if you run:
bitbake xxxx-image -c rootfs
you end up having to fetch and unpack all the do_package data which is usually
large and inefficient. It also means rm_work has to leave all the do_package
data lying around so rootfs works.
This patch splits the actual creation of the pkgdata directory off into a separate
task, "packagedata" which happens immediately after do_package. We can then remap
the dependencies so this task is depended upon, not do_package. Sstate can then be
programmed not to require do_package at the appropriate times.
Whilst this patch doesn't do so, it opens the possibility of rm_work wiping
out the do_package output from WORKDIR as long as it also removed the do_package
stamp (both normal and setscene variants) and allowing more space savings
with rm_work which has been regularly requested.
(From OE-Core rev: 6107ee294afde395e39d084c33e8e94013c625a9)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r-- | meta/classes/image.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 0293d2e358..9b4dec8496 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -83,7 +83,7 @@ LDCONFIGDEPEND_libc-uclibc = "" | |||
83 | 83 | ||
84 | do_rootfs[depends] += "makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND}" | 84 | do_rootfs[depends] += "makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND}" |
85 | do_rootfs[depends] += "virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot" | 85 | do_rootfs[depends] += "virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot" |
86 | do_rootfs[recrdeptask] += "do_package" | 86 | do_rootfs[recrdeptask] += "do_packagedata" |
87 | 87 | ||
88 | IMAGE_TYPE_live = '${@base_contains("IMAGE_FSTYPES", "live", "live", "empty", d)}' | 88 | IMAGE_TYPE_live = '${@base_contains("IMAGE_FSTYPES", "live", "live", "empty", d)}' |
89 | inherit image-${IMAGE_TYPE_live} | 89 | inherit image-${IMAGE_TYPE_live} |
@@ -480,6 +480,7 @@ do_compile[noexec] = "1" | |||
480 | do_install[noexec] = "1" | 480 | do_install[noexec] = "1" |
481 | do_populate_sysroot[noexec] = "1" | 481 | do_populate_sysroot[noexec] = "1" |
482 | do_package[noexec] = "1" | 482 | do_package[noexec] = "1" |
483 | do_packagedata[noexec] = "1" | ||
483 | do_package_write_ipk[noexec] = "1" | 484 | do_package_write_ipk[noexec] = "1" |
484 | do_package_write_deb[noexec] = "1" | 485 | do_package_write_deb[noexec] = "1" |
485 | do_package_write_rpm[noexec] = "1" | 486 | do_package_write_rpm[noexec] = "1" |