]> code.ossystems Code Review - openembedded-core.git/commitdiff
image-live.bbclass: optional depends when ROOTFS empty
authorGuillaume Champagne <champagne.guillaume.c@gmail.com>
Thu, 1 Apr 2021 20:48:49 +0000 (16:48 -0400)
committerSteve Sakoman <steve@sakoman.com>
Mon, 19 Apr 2021 14:27:15 +0000 (04:27 -1000)
`ROOTFS` is optional. It can be empty if the live image doesn't require
a rootfs.  In such cases, the build doesn't depend on
`do_image_{LIVE_ROOTFS_TYPE}`.

Signed-off-by: Guillaume Champagne <champagne.guillaume.c@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 96f47c39f1d17f073243913d524bde84add41d8f)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/classes/image-live.bbclass

index 54058b350ddeb88d63108ce4f29eb3f305bdfb3c..e9eba1fc4ba9fcba71c18cd7e24a784644513cc4 100644 (file)
@@ -30,7 +30,7 @@ do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \
                         virtual/kernel:do_deploy \
                         ${MLPREFIX}syslinux:do_populate_sysroot \
                         syslinux-native:do_populate_sysroot \
-                        ${PN}:do_image_${@d.getVar('LIVE_ROOTFS_TYPE').replace('-', '_')} \
+                        ${@'%s:do_image_%s' % (d.getVar('PN'), d.getVar('LIVE_ROOTFS_TYPE').replace('-', '_')) if d.getVar('ROOTFS') else ''} \
                         "