From 7ec30dd8db9c7f02ee39706641d966e0b59f936c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 4 Jan 2022 20:20:33 +0100 Subject: [PATCH] Revert "packagegroup-gui-dev/packagegroup-gui-full: Add chromium-ozone-wayland" chromium-x11 and chromium-ozone-wayland cannot be installed in same image - oh man yet another disappointing experience This reverts commit 77991352d28e8be17bc435f20d5b55b6e08f9323. --- recipes-image/packagegroups/packagegroup-gui-dev.bb | 2 +- recipes-image/packagegroups/packagegroup-gui-full.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-image/packagegroups/packagegroup-gui-dev.bb b/recipes-image/packagegroups/packagegroup-gui-dev.bb index 7582bc0..72e24e9 100644 --- a/recipes-image/packagegroups/packagegroup-gui-dev.bb +++ b/recipes-image/packagegroups/packagegroup-gui-dev.bb @@ -48,7 +48,7 @@ RDEPENDS:${PN} = " \ pulseview qtiohelper minicom i2c-tools \ python3-pyserial python3-smbus python3-smbus2 python3-spidev \ \ - epiphany ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-ozone-wayland chromium-x11', '', d)} \ + epiphany ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \ ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-microcontroller', 'meta-microcontroller-world', '', d)} \ ${@bb.utils.contains('BBFILE_COLLECTIONS', 'rubygems', 'rubygems-jekyll', '', d)} \ " diff --git a/recipes-image/packagegroups/packagegroup-gui-full.bb b/recipes-image/packagegroups/packagegroup-gui-full.bb index 15c3870..19536fc 100644 --- a/recipes-image/packagegroups/packagegroup-gui-full.bb +++ b/recipes-image/packagegroups/packagegroup-gui-full.bb @@ -41,7 +41,7 @@ RDEPENDS:${PN} = " \ \ ${MACHINE_SPECIFICS_FULL} \ \ - epiphany ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-ozone-wayland chromium-x11', '', d)} \ + epiphany ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \ \ ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-retro', 'meta-retro-world', '', d)} \ \