Revert "image.bbclass: allow overriding dependency on virtual/kernel:do_deploy"

Message ID 20220509103251.674719-1-jacob.kroon@gmail.com
State Accepted, archived
Commit f0bd9e5d10dc86d7b2639a31ab12728ab67bebd5
Headers show
Series Revert "image.bbclass: allow overriding dependency on virtual/kernel:do_deploy" | expand

Commit Message

Jacob Kroon May 9, 2022, 10:32 a.m. UTC
As pointed out in
https://lists.openembedded.org/g/openembedded-core/message/165058
https://lists.openembedded.org/g/openembedded-core/message/165216
this patch sets KERNELDEPLOYDEPEND but then uses KERNELDEPMODDEPEND.

Revert the changes since no one seems interested enough to fix it.
If someone wants this then make the variable name readable by
adding underscores where appropriate, for example by calling it
KERNEL_DEPLOY_DEPEND.

This reverts commit dcf9dfa4e6305786cd713aa28deda94a50bd6635.

Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com>
---
 meta/classes/image.bbclass | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Patch

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 47776db2b0..7f1f6f80a4 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -132,12 +132,7 @@  def rootfs_variables(d):
 
 do_rootfs[vardeps] += "${@rootfs_variables(d)}"
 
-# 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.
-KERNELDEPLOYDEPEND ?= "virtual/kernel:do_deploy"
-do_build[depends] += "${KERNELDEPMODDEPEND}"
+do_build[depends] += "virtual/kernel:do_deploy"
 
 
 python () {