| Message ID | 20241108170156.2057761-8-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/8] rxvt-unicode: change virtual/x-terminal-emulator PROVIDES to RPROVIDES | expand |
On Fri, 2024-11-08 at 17:01 +0000, Ross Burton via lists.openembedded.org wrote: > Don't hardcode matchbox-terminal, but use the alternative. > > Signed-off-by: Ross Burton <ross.burton@arm.com> > --- > meta/recipes-graphics/images/core-image-weston.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-graphics/images/core-image-weston.bb b/meta/recipes-graphics/images/core-image-weston.bb > index 62305cc1cee..d5248cf480b 100644 > --- a/meta/recipes-graphics/images/core-image-weston.bb > +++ b/meta/recipes-graphics/images/core-image-weston.bb > @@ -7,6 +7,6 @@ LICENSE = "MIT" > inherit core-image > > CORE_IMAGE_BASE_INSTALL += "gtk+3-demo" > -CORE_IMAGE_BASE_INSTALL += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'weston-xwayland matchbox-terminal', '', d)}" > +CORE_IMAGE_BASE_INSTALL += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'weston-xwayland virtual-x-terminal-emulator', '', d)}" > > QB_MEM = "-m 512" > This breaks one of the selftests: https://valkyrie.yoctoproject.org/#/builders/54/builds/382/steps/14/logs/stdio ERROR: core-image-weston-1.0-r0 do_rootfs: Package rxvt-unicode cannot be installed into the image because it has incompatible license(s): GPL-3.0-only Cheers, Richard
On Tue, 2024-11-12 at 09:33 +0000, Richard Purdie via lists.openembedded.org wrote: > On Fri, 2024-11-08 at 17:01 +0000, Ross Burton via > lists.openembedded.org wrote: > > Don't hardcode matchbox-terminal, but use the alternative. > > > > Signed-off-by: Ross Burton <ross.burton@arm.com> > > --- > > meta/recipes-graphics/images/core-image-weston.bb | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/meta/recipes-graphics/images/core-image-weston.bb > > b/meta/recipes-graphics/images/core-image-weston.bb > > index 62305cc1cee..d5248cf480b 100644 > > --- a/meta/recipes-graphics/images/core-image-weston.bb > > +++ b/meta/recipes-graphics/images/core-image-weston.bb > > @@ -7,6 +7,6 @@ LICENSE = "MIT" > > inherit core-image > > > > CORE_IMAGE_BASE_INSTALL += "gtk+3-demo" > > -CORE_IMAGE_BASE_INSTALL += > > "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'weston-xwayland > > matchbox-terminal', '', d)}" > > +CORE_IMAGE_BASE_INSTALL += > > "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'weston-xwayland > > virtual-x-terminal-emulator', '', d)}" > > > > QB_MEM = "-m 512" > > > > This breaks one of the selftests: > > https://valkyrie.yoctoproject.org/#/builders/54/builds/382/steps/14/logs/stdio > > ERROR: core-image-weston-1.0-r0 do_rootfs: Package rxvt-unicode > cannot be installed into the image because it has incompatible > license(s): GPL-3.0-only Even with this patch dropped, the series still fails in the no-x11 build: https://valkyrie.yoctoproject.org/#/builders/25/builds/411/steps/11/logs/stdio Cheers, Richard
diff --git a/meta/recipes-graphics/images/core-image-weston.bb b/meta/recipes-graphics/images/core-image-weston.bb index 62305cc1cee..d5248cf480b 100644 --- a/meta/recipes-graphics/images/core-image-weston.bb +++ b/meta/recipes-graphics/images/core-image-weston.bb @@ -7,6 +7,6 @@ LICENSE = "MIT" inherit core-image CORE_IMAGE_BASE_INSTALL += "gtk+3-demo" -CORE_IMAGE_BASE_INSTALL += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'weston-xwayland matchbox-terminal', '', d)}" +CORE_IMAGE_BASE_INSTALL += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'weston-xwayland virtual-x-terminal-emulator', '', d)}" QB_MEM = "-m 512"
Don't hardcode matchbox-terminal, but use the alternative. Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta/recipes-graphics/images/core-image-weston.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)