From 26798cfb931a7113abbbf105d1e1bcf87685a2d2 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Wed, 24 May 2023 12:23:40 +0200 Subject: [PATCH] imx-gpu-viv: avoid pulling in kernel-module-imx-gpu-viv We used to use BAD_RECOMMENDATIONS to remove this package in ccimx6 builds, we enable the imx-gpu-viv driver as built-in in our kernel, but this method isn't working anymore. Instead, undo the specific RRECOMMENDS that pulls the module in. Apply the change for the aarch32 version of the package only, since this change is only needed for the ccimx6 platforms. https://onedigi.atlassian.net/browse/DEL-8540 Signed-off-by: Gabriel Valcazar --- meta-digi-dey/classes/dey-image.bbclass | 3 --- .../imx-gpu-viv/imx-gpu-viv_6.4.3.p4.6-aarch32.bbappend | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.6-aarch32.bbappend diff --git a/meta-digi-dey/classes/dey-image.bbclass b/meta-digi-dey/classes/dey-image.bbclass index ca180b916..7d17cfa14 100644 --- a/meta-digi-dey/classes/dey-image.bbclass +++ b/meta-digi-dey/classes/dey-image.bbclass @@ -62,8 +62,5 @@ toolchain_create_sdk_dey_version[vardepsexclude] = "DATETIME" # DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}" -# Remove kernel-module-imx-gpu-viv from all images -BAD_RECOMMENDATIONS += "kernel-module-imx-gpu-viv" - # Do not include kernel in rootfs images PACKAGE_EXCLUDE = "kernel-image-*" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.6-aarch32.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.6-aarch32.bbappend new file mode 100644 index 000000000..7effe3064 --- /dev/null +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.6-aarch32.bbappend @@ -0,0 +1,5 @@ +# Copyright (C) 2023 Digi International + +# We configure imx-gpu-viv driver as built-in, so there's no need to install +# the module. +RRECOMMENDS:libgal-imx:remove:ccimx6 = "kernel-module-imx-gpu-viv"