| Message ID | 20220510154327.2436624-1-dmitry.baryshkov@linaro.org |
|---|---|
| State | Accepted, archived |
| Commit | dcf9dfa4e6305786cd713aa28deda94a50bd6635 |
| Headers | show |
| Series | [v2] image.bbclass: allow overriding dependency on virtual/kernel:do_deploy | expand |
Hi Dmitry, Il giorno Tue, 10 May 2022 18:43:27 +0300 "Dmitry Baryshkov" <dbaryshkov@gmail.com> ha scritto: > From: Dmitry Baryshkov <dbaryshkov@gmail.com> > > Since the commit fe26b2379ecd ("image.bbclass: Depend on > virtual/kernel:do_deploy"), the image.bbclass made building images > depend on virtual/kernel. For some images, including small initramfs, > this is not the case. Allow overriding this dependency in case > developers knows what they are doing. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > > Changes since v1: > - Use the same variable in both lines > - Change the var name to KERNEL_DEPLOY_DEPEND as suggested in the > revert message. > > --- > meta/classes/image.bbclass | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > index 7f1f6f80a464..c4051961c030 100644 > --- a/meta/classes/image.bbclass > +++ b/meta/classes/image.bbclass > @@ -132,7 +132,12 @@ def rootfs_variables(d): > > do_rootfs[vardeps] += "${@rootfs_variables(d)}" > > -do_build[depends] += "virtual/kernel:do_deploy" > +# This is needed to have kernel image in DEPLOY_DIR. > +# This follow many common usecases and user expectations. Typo: follow -> follows. I'm taking this patch for testing and I fixed the typo while doing that. Please fix it on your side in case you need to send another version. Kind regards.
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 7f1f6f80a464..c4051961c030 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -132,7 +132,12 @@ def rootfs_variables(d): do_rootfs[vardeps] += "${@rootfs_variables(d)}" -do_build[depends] += "virtual/kernel:do_deploy" +# This is needed to have kernel image in DEPLOY_DIR. +# This follow many common usecases and user expectations. +# But if you are building an image which doesn't need the kernel image at all, +# you can unset this variable manually. +KERNEL_DEPLOY_DEPEND ?= "virtual/kernel:do_deploy" +do_build[depends] += "${KERNEL_DEPLOY_DEPEND}" python () {