It looks we had some multi-level inclusion of chromium in ti-world if meta-browser and meta-python2 were both included in the build. meta-python2 was removed as supported quite a while back so let's clean up the logic and variable names to just check if meta-browser is in the build.
Signed-off-by: Ryan Eatmon <[email protected]> --- .../recipes-core/packagegroups/ti-world.bb | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb index 6b6315ed..2cdb364a 100644 --- a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb +++ b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb @@ -7,17 +7,7 @@ inherit packagegroup INSANE_SKIP:${PN} += "dev-deps" -CHROMIUM = "" -CHROMIUM:append:am57xx = "\ - chromium-ozone-wayland \ -" -CHROMIUM:append:k3 = "\ - chromium-ozone-wayland \ -" - -PYTHON2APPS = " \ - ${@bb.utils.contains("BBFILE_COLLECTIONS","browser-layer",bb.utils.contains('DISTRO_FEATURES','wayland',"${CHROMIUM}",'',d),'',d)} \ -" +CHROMIUM_TOOLS = "chromium-ozone-wayland" DEVTOOLS = " \ linux-libc-headers-dev \ @@ -39,7 +29,7 @@ RDEPENDS:${PN} = "\ packagegroup-arago-addons \ packagegroup-arago-addons-extra \ ${@bb.utils.contains('DISTRO_FEATURES','opengl','','packagegroup-arago-base-server-extra',d)} \ - ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "${PYTHON2APPS}", "", d)} \ + ${@bb.utils.contains("BBFILE_COLLECTIONS","browser-layer",bb.utils.contains('DISTRO_FEATURES','wayland',"${CHROMIUM_TOOLS}",'',d),'',d)} \ ${DEVTOOLS} \ packagegroup-arago-misc \ ${PREFERRED_PROVIDER_virtual/docker} \ -- 2.43.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17708): https://lists.yoctoproject.org/g/meta-arago/message/17708 Mute This Topic: https://lists.yoctoproject.org/mt/121433920/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
