diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-19 11:52:23 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-23 13:49:11 +0100 |
commit | 568f62214bca3ac6d35eef8d9f4562596fb4c9ab (patch) | |
tree | c9beaddae7102ea5fe2c95c9e83425a5bec90ded | |
parent | 3dfd4ed0ef61daa55745b3ab378593e653562a30 (diff) | |
download | poky-568f62214bca3ac6d35eef8d9f4562596fb4c9ab.tar.gz |
package_ipk/deb/rpm: Drop recursive do_build task dependencies
This is a controversial change which removes the recursive dependencies
from the do_build target of packaging tasks of recipes.
Currently this means when you "bitbake <image>" or "bitbake <recipe>",
the packaging tasks run for all packaging backends enabled for all recipes
in the dependency chain. The same therefore then applies to images.
We don't actually need that, it is a convinience thing. Removing it
massively simplifies the task graph and causes much fewer tasks to execute
in many common scenarios. It also means less sstate is fetched for
example when building an image.
This means when building a recipe all package formats would be built
but when building an image, only the format used by the image would be
generated. This should be an improvement in most cases but some CI systems
may need to be explict about what they're building.
'bitbake XXX --runall build' would give the previous behaviour.
(From OE-Core rev: 220d29a5abb5be8b80c64d8f2f48949bc8c534a3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/package_deb.bbclass | 5 | ||||
-rw-r--r-- | meta/classes/package_ipk.bbclass | 4 | ||||
-rw-r--r-- | meta/classes/package_rpm.bbclass | 4 |
3 files changed, 3 insertions, 10 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index eca43e1787..77caaa55c8 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass | |||
@@ -315,10 +315,7 @@ python do_package_write_deb () { | |||
315 | do_package_write_deb[dirs] = "${PKGWRITEDIRDEB}" | 315 | do_package_write_deb[dirs] = "${PKGWRITEDIRDEB}" |
316 | do_package_write_deb[cleandirs] = "${PKGWRITEDIRDEB}" | 316 | do_package_write_deb[cleandirs] = "${PKGWRITEDIRDEB}" |
317 | do_package_write_deb[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}" | 317 | do_package_write_deb[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}" |
318 | addtask package_write_deb after do_packagedata do_package | 318 | addtask package_write_deb after do_packagedata do_package before do_build |
319 | |||
320 | 319 | ||
321 | PACKAGEINDEXDEPS += "dpkg-native:do_populate_sysroot" | 320 | PACKAGEINDEXDEPS += "dpkg-native:do_populate_sysroot" |
322 | PACKAGEINDEXDEPS += "apt-native:do_populate_sysroot" | 321 | PACKAGEINDEXDEPS += "apt-native:do_populate_sysroot" |
323 | |||
324 | do_build[recrdeptask] += "do_package_write_deb" | ||
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index c3b53854e8..998e18ba6c 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass | |||
@@ -274,9 +274,7 @@ python do_package_write_ipk () { | |||
274 | do_package_write_ipk[dirs] = "${PKGWRITEDIRIPK}" | 274 | do_package_write_ipk[dirs] = "${PKGWRITEDIRIPK}" |
275 | do_package_write_ipk[cleandirs] = "${PKGWRITEDIRIPK}" | 275 | do_package_write_ipk[cleandirs] = "${PKGWRITEDIRIPK}" |
276 | do_package_write_ipk[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}" | 276 | do_package_write_ipk[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}" |
277 | addtask package_write_ipk after do_packagedata do_package | 277 | addtask package_write_ipk after do_packagedata do_package before do_build |
278 | 278 | ||
279 | PACKAGEINDEXDEPS += "opkg-utils-native:do_populate_sysroot" | 279 | PACKAGEINDEXDEPS += "opkg-utils-native:do_populate_sysroot" |
280 | PACKAGEINDEXDEPS += "opkg-native:do_populate_sysroot" | 280 | PACKAGEINDEXDEPS += "opkg-native:do_populate_sysroot" |
281 | |||
282 | do_build[recrdeptask] += "do_package_write_ipk" | ||
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 88d861c0e7..60f8299d96 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -748,9 +748,7 @@ python do_package_write_rpm () { | |||
748 | do_package_write_rpm[dirs] = "${PKGWRITEDIRRPM}" | 748 | do_package_write_rpm[dirs] = "${PKGWRITEDIRRPM}" |
749 | do_package_write_rpm[cleandirs] = "${PKGWRITEDIRRPM}" | 749 | do_package_write_rpm[cleandirs] = "${PKGWRITEDIRRPM}" |
750 | do_package_write_rpm[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}" | 750 | do_package_write_rpm[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}" |
751 | addtask package_write_rpm after do_packagedata do_package | 751 | addtask package_write_rpm after do_packagedata do_package before do_build |
752 | 752 | ||
753 | PACKAGEINDEXDEPS += "rpm-native:do_populate_sysroot" | 753 | PACKAGEINDEXDEPS += "rpm-native:do_populate_sysroot" |
754 | PACKAGEINDEXDEPS += "createrepo-c-native:do_populate_sysroot" | 754 | PACKAGEINDEXDEPS += "createrepo-c-native:do_populate_sysroot" |
755 | |||
756 | do_build[recrdeptask] += "do_package_write_rpm" | ||