[PATCH kirkstone+ 1/2] conf: machine: include: k3: Select correct WKS file

[PATCH kirkstone+ 1/2] conf: machine: include: k3: Select correct WKS file

[Daniel Schultz]

Select the correct WKS file according to the MACHINE_FEATURE efi.

Right now, the sdimage-2part-efi.wks is set by default. Switch to the
sdimage-2part.wks file, if efi was removed from MACHINE_FEATURES to allow
non-efi boot methods.

Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
---
 meta-ti-bsp/conf/machine/include/k3.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
index 31da2ca9..fff15505 100644
--- a/meta-ti-bsp/conf/machine/include/k3.inc
+++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -50,7 +50,8 @@ IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}"
 EFI_PROVIDER ?= "grub-efi"
 MACHINE_FEATURES += "efi"
 
-WKS_FILE ?= "sdimage-2part-efi.wks"
+WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks", "sdimage-2part.wks", d)}"
+
 do_image_wic[depends] += "virtual/bootloader:do_deploy"
 do_image_complete[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy"
 
-- 
2.25.1

[PATCH kirkstone+ 2/2] recipes-graphics: ti-img-rogue-umlibs: Make -vulkan optional

[Daniel Schultz]

Only include the ti-img-rogue-umlibs-vulkan package if the
DISTRO_FEATURES x11 is enabled. Right now, this recipe has a failed
build dependency on images without x11.

Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
---
 .../libgles/ti-img-rogue-umlibs_23.1.6404501.bb   | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_23.1.6404501.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_23.1.6404501.bb
index c33f8ae0..a6ed57f4 100644
--- a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_23.1.6404501.bb
+++ b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_23.1.6404501.bb
@@ -29,10 +29,18 @@ do_install:append() {
         mv ${D}/lib/firmware ${D}${nonarch_base_libdir}
         rmdir ${D}/lib
     fi
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'false', 'true', d)}; then
+        rm -rf ${D}${libdir}/libVK_IMG.so*
+    fi 
     rm -rf "${D}/etc/init.d"
 }
 
-PACKAGES = "${PN}-vulkan ${PN}-tools ${PN}-firmware ${PN}"
+PACKAGES = " \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "${PN}-vulkan", "", d)} \
+    ${PN}-tools \
+    ${PN}-firmware \
+    ${PN} \
+"
 
 FILES:${PN}-vulkan = " \
     ${datadir}/vulkan \
@@ -56,7 +64,10 @@ RDEPENDS:${PN}-tools = "python3-core"
 FILES:${PN}-firmware = "${base_libdir}/firmware/*"
 INSANE_SKIP:${PN}-firmware += "arch"
 
-RRECOMMENDS:${PN} += "${PN}-vulkan ${PN}-tools"
+RRECOMMENDS:${PN} += " \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "${PN}-vulkan", "", d)} \
+    ${PN}-tools \
+"
 RDEPENDS:${PN} += " ${PN}-firmware"
 
 INSANE_SKIP:${PN} += "already-stripped dev-so"
-- 
2.25.1

Re: [meta-ti] [PATCH kirkstone+ 1/2] conf: machine: include: k3: Select correct WKS file

[Denys Dmytriyenko]

On Thu, May 04, 2023 at 05:37:35AM -0700, Daniel Schultz wrote:
> Select the correct WKS file according to the MACHINE_FEATURE efi.
> 
> Right now, the sdimage-2part-efi.wks is set by default. Switch to the
> sdimage-2part.wks file, if efi was removed from MACHINE_FEATURES to allow
> non-efi boot methods.
> 
> Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
> ---
>  meta-ti-bsp/conf/machine/include/k3.inc | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
> index 31da2ca9..fff15505 100644
> --- a/meta-ti-bsp/conf/machine/include/k3.inc
> +++ b/meta-ti-bsp/conf/machine/include/k3.inc
> @@ -50,7 +50,8 @@ IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}"
>  EFI_PROVIDER ?= "grub-efi"
>  MACHINE_FEATURES += "efi"
>  
> -WKS_FILE ?= "sdimage-2part-efi.wks"
> +WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks", "sdimage-2part.wks", d)}"

Well, "efi" gets added to MACHINE_FEATURES just one line above. So, in order 
to disable it, you'd have to modify MACHINE_FEATURES in your configuration, at 
which point it is even more easier to set WKS_FILE there too, as it's weakly 
assigned here anyway...

But I guess I don't mind a little bit more automation either, even if it gets 
the code more complicated.


>  do_image_wic[depends] += "virtual/bootloader:do_deploy"
>  do_image_complete[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy"
>  
> -- 
> 2.25.1

Re: [meta-ti] [PATCH kirkstone+ 2/2] recipes-graphics: ti-img-rogue-umlibs: Make -vulkan optional

[Denys Dmytriyenko]

On Thu, May 04, 2023 at 05:37:36AM -0700, Daniel Schultz wrote:
> Only include the ti-img-rogue-umlibs-vulkan package if the
> DISTRO_FEATURES x11 is enabled. Right now, this recipe has a failed
> build dependency on images without x11.

Just to clarify - this recipe has run-time dependency from vulkan package 
to libx11-xcb, which itself won't build w/o "x11" distro feature.


> Signed-off-by: Daniel Schultz <d.schultz@phytec.de>

Tested-by: Denys Dmytriyenko <denys@konsulko.com>


> ---
>  .../libgles/ti-img-rogue-umlibs_23.1.6404501.bb   | 15 +++++++++++++--
>  1 file changed, 13 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_23.1.6404501.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_23.1.6404501.bb
> index c33f8ae0..a6ed57f4 100644
> --- a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_23.1.6404501.bb
> +++ b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_23.1.6404501.bb
> @@ -29,10 +29,18 @@ do_install:append() {
>          mv ${D}/lib/firmware ${D}${nonarch_base_libdir}
>          rmdir ${D}/lib
>      fi
> +    if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'false', 'true', d)}; then
> +        rm -rf ${D}${libdir}/libVK_IMG.so*
> +    fi 
>      rm -rf "${D}/etc/init.d"
>  }
>  
> -PACKAGES = "${PN}-vulkan ${PN}-tools ${PN}-firmware ${PN}"
> +PACKAGES = " \
> +    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "${PN}-vulkan", "", d)} \
> +    ${PN}-tools \
> +    ${PN}-firmware \
> +    ${PN} \
> +"
>  
>  FILES:${PN}-vulkan = " \
>      ${datadir}/vulkan \
> @@ -56,7 +64,10 @@ RDEPENDS:${PN}-tools = "python3-core"
>  FILES:${PN}-firmware = "${base_libdir}/firmware/*"
>  INSANE_SKIP:${PN}-firmware += "arch"
>  
> -RRECOMMENDS:${PN} += "${PN}-vulkan ${PN}-tools"
> +RRECOMMENDS:${PN} += " \
> +    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "${PN}-vulkan", "", d)} \
> +    ${PN}-tools \
> +"
>  RDEPENDS:${PN} += " ${PN}-firmware"
>  
>  INSANE_SKIP:${PN} += "already-stripped dev-so"
> -- 
> 2.25.1