image.bbclass: Separate out image generation into a new task, do_image
I've heard complaints from people trying to create more interesting image types about how hard it is to understand the rootfs/image generation code and that its a pain to develop/test/debug. Having looked at it myself, the internal construction of shell functions which then gets passed into a multiprocessing pool is rather convoluted and it places rather odd constraints on when variables are expanded. Its therefore no wonder people find it confusing/complex. This patch starts the process of splitting this up by separating out image generation from the do_rootfs task into a new do_image task. (From OE-Core rev: 57578d0ca6c3aaf6edf0af2c4862d43c97415156) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
0269219fbe
commit
cdc0aeed9b
|
@ -207,7 +207,6 @@ PACKAGE_EXCLUDE[type] = "list"
|
|||
|
||||
fakeroot python do_rootfs () {
|
||||
from oe.rootfs import create_rootfs
|
||||
from oe.image import create_image
|
||||
from oe.manifest import create_manifest
|
||||
|
||||
# Handle package exclusions
|
||||
|
@ -244,15 +243,22 @@ fakeroot python do_rootfs () {
|
|||
|
||||
# Generate rootfs
|
||||
create_rootfs(d)
|
||||
|
||||
# generate final images
|
||||
create_image(d)
|
||||
}
|
||||
do_rootfs[dirs] = "${TOPDIR}"
|
||||
do_rootfs[cleandirs] += "${S}"
|
||||
do_rootfs[umask] = "022"
|
||||
addtask rootfs before do_build
|
||||
|
||||
fakeroot python do_image () {
|
||||
from oe.image import create_image
|
||||
|
||||
# generate final images
|
||||
create_image(d)
|
||||
}
|
||||
do_image[dirs] = "${TOPDIR}"
|
||||
do_image[umask] = "022"
|
||||
addtask do_image after do_rootfs before do_build
|
||||
|
||||
MULTILIBRE_ALLOW_REP =. "${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|${sysconfdir}|${nonarch_base_libdir}/udev|/lib/modules/[^/]*/modules.*|"
|
||||
MULTILIB_CHECK_FILE = "${WORKDIR}/multilib_check.py"
|
||||
MULTILIB_TEMP_ROOTFS = "${WORKDIR}/multilib"
|
||||
|
|
Loading…
Reference in New Issue