From 91e5d6c31331a710dac749146e2c2af12b23468c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 4 May 2021 00:00:17 +0200 Subject: [PATCH] Get chromium-x11 back into our images after meta-browser layer split MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller (cherry picked from commit af1911a492402e0a5c6aea8e9e6b650ff5ca9a85) --- recipes-image/packagegroups/packagegroup-gui-dev.bb | 2 +- recipes-image/packagegroups/packagegroup-gui-full.bb | 2 +- recipes-image/xfce4/xfce4-music-dev-image.bb | 2 +- recipes-image/xfce4/xfce4-music-image.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-image/packagegroups/packagegroup-gui-dev.bb b/recipes-image/packagegroups/packagegroup-gui-dev.bb index 110d859..b44c0ed 100644 --- a/recipes-image/packagegroups/packagegroup-gui-dev.bb +++ b/recipes-image/packagegroups/packagegroup-gui-dev.bb @@ -42,7 +42,7 @@ RDEPENDS_${PN} = " \ \ pulseview qtiohelper \ \ - ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \ + ${@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)} \ " diff --git a/recipes-image/packagegroups/packagegroup-gui-full.bb b/recipes-image/packagegroups/packagegroup-gui-full.bb index 9c8fd65..d05637d 100644 --- a/recipes-image/packagegroups/packagegroup-gui-full.bb +++ b/recipes-image/packagegroups/packagegroup-gui-full.bb @@ -37,7 +37,7 @@ RDEPENDS_${PN} = " \ \ ${MACHINE_SPECIFICS_FULL} \ \ - ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \ + ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \ \ ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-retro', 'mame dosbox dosbox-x cage cass80 z80 vice stella opentyrian d1x-rebirth', '', d)} \ \ diff --git a/recipes-image/xfce4/xfce4-music-dev-image.bb b/recipes-image/xfce4/xfce4-music-dev-image.bb index 28ee58e..328e1ce 100644 --- a/recipes-image/xfce4/xfce4-music-dev-image.bb +++ b/recipes-image/xfce4/xfce4-music-dev-image.bb @@ -13,7 +13,7 @@ IMAGE_INSTALL += " \ packagegroup-gui-musicians \ \ ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libreoffice', '', d)} \ - ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \ + ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \ \ jack-dev \ lv2-dev \ diff --git a/recipes-image/xfce4/xfce4-music-image.bb b/recipes-image/xfce4/xfce4-music-image.bb index 63d54fe..17c9a0d 100644 --- a/recipes-image/xfce4/xfce4-music-image.bb +++ b/recipes-image/xfce4/xfce4-music-image.bb @@ -8,5 +8,5 @@ IMAGE_INSTALL += " \ packagegroup-gui-musicians \ \ ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libreoffice', '', d)} \ - ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \ + ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \ "