diff mbox series

weston-init: remove kbd from RDEPENDS

Message ID 20241212212431.248280-1-hiagofranco@gmail.com
State New
Headers show
Series weston-init: remove kbd from RDEPENDS | expand

Commit Message

Hiago De Franco Dec. 12, 2024, 9:24 p.m. UTC
From: Hiago De Franco <hiago.franco@toradex.com>

The kbd package is no longer a hard dependency for weston-init, as
weston has replaced weston-launch with libseat and logind as its only
launchers (see [1]). Remove this dependency.

[1] https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/663/commits

Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
---
 meta/recipes-graphics/wayland/weston-init.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mathieu Dubois-Briand Dec. 13, 2024, 3:31 p.m. UTC | #1
On Thu Dec 12, 2024 at 10:24 PM CET, Hiago De Franco via lists.openembedded.org wrote:
> From: Hiago De Franco <hiago.franco@toradex.com>
>
> The kbd package is no longer a hard dependency for weston-init, as
> weston has replaced weston-launch with libseat and logind as its only
> launchers (see [1]). Remove this dependency.
>
> [1] https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/663/commits
>
> Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
> ---
>  meta/recipes-graphics/wayland/weston-init.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb
> index 5723655a9bba..0f79a44e48bc 100644
> --- a/meta/recipes-graphics/wayland/weston-init.bb
> +++ b/meta/recipes-graphics/wayland/weston-init.bb
> @@ -84,7 +84,7 @@ USERADD_PACKAGES = "${PN}"
>  #
>  require ${THISDIR}/required-distro-features.inc
>  
> -RDEPENDS:${PN} = "weston kbd ${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'weston-xwayland', '', d)}"
> +RDEPENDS:${PN} = "weston ${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'weston-xwayland', '', d)}"
>  
>  INITSCRIPT_NAME = "weston"
>  INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."

Hi Hiago,

I believe this patch is breaking some oe-selftest:

Traceback (most recent call last):
  File "/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/meta/lib/oeqa/core/decorator/__init__.py", line 35, in wrapped_f
    return func(*args, **kwargs)
  File "/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/meta/lib/oeqa/runtime/cases/weston.py", line 81, in test_weston_can_initialize_new_wayland_compositor
    self.assertTrue(new_wl_processes, msg='Could not get new weston-desktop-shell processes (%s, try_cnt:%s) weston log: %s' % (new_wl_processes, try_cnt, weston_log))
    ~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: [] is not true : Could not get new weston-desktop-shell processes ([], try_cnt:5) weston log: cat: can't open '/tmp/weston-2.log': No such file or directory
Traceback (most recent call last):
  File "/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/meta/lib/oeqa/core/decorator/__init__.py", line 35, in wrapped_f
    return func(*args, **kwargs)
  File "/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/meta/lib/oeqa/core/decorator/__init__.py", line 35, in wrapped_f
    return func(*args, **kwargs)
  File "/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/meta/lib/oeqa/runtime/cases/weston.py", line 89, in test_weston_supports_xwayland
    self.assertEqual(status, 0, msg=msg)
    ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^
AssertionError: 1 != 0 : xwayland does not appear to be running

https://valkyrie.yoctoproject.org/#/builders/48/builds/556/steps/14/logs/stdio
https://valkyrie.yoctoproject.org/#/builders/75/builds/581/steps/17/logs/stdio

And another QA error:

NOTE: recipe core-image-full-cmdline-1.0-r0: task do_testimage: Succeeded
Traceback (most recent call last):
  File "/srv/pokybuild/yocto-worker/no-x11/build/meta/lib/oeqa/core/decorator/__init__.py", line 35, in wrapped_f
    return func(*args, **kwargs)
  File "/srv/pokybuild/yocto-worker/no-x11/build/meta/lib/oeqa/runtime/cases/weston.py", line 81, in test_weston_can_initialize_new_wayland_compositor
    self.assertTrue(new_wl_processes, msg='Could not get new weston-desktop-shell processes (%s, try_cnt:%s) weston log: %s' % (new_wl_processes, try_cnt, weston_log))
AssertionError: [] is not true : Could not get new weston-desktop-shell processes ([], try_cnt:5) weston log: cat: can't open '/tmp/weston-2.log': No such file or directory

https://valkyrie.yoctoproject.org/#/builders/25/builds/638/steps/12/logs/stdio

Can you have a look at these issues ?
Hiago De Franco Dec. 13, 2024, 9:34 p.m. UTC | #2
Hi Mathieu,

On Fri, Dec 13, 2024 at 04:31:44PM +0100, Mathieu Dubois-Briand wrote:
> On Thu Dec 12, 2024 at 10:24 PM CET, Hiago De Franco via lists.openembedded.org wrote:
> > From: Hiago De Franco <hiago.franco@toradex.com>
> >
> > The kbd package is no longer a hard dependency for weston-init, as
> > weston has replaced weston-launch with libseat and logind as its only
> > launchers (see [1]). Remove this dependency.
> >
> > [1] https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/663/commits
> >
> > Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
> > ---
> >  meta/recipes-graphics/wayland/weston-init.bb | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb
> > index 5723655a9bba..0f79a44e48bc 100644
> > --- a/meta/recipes-graphics/wayland/weston-init.bb
> > +++ b/meta/recipes-graphics/wayland/weston-init.bb
> > @@ -84,7 +84,7 @@ USERADD_PACKAGES = "${PN}"
> >  #
> >  require ${THISDIR}/required-distro-features.inc
> >  
> > -RDEPENDS:${PN} = "weston kbd ${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'weston-xwayland', '', d)}"
> > +RDEPENDS:${PN} = "weston ${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'weston-xwayland', '', d)}"
> >  
> >  INITSCRIPT_NAME = "weston"
> >  INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
> 
> Hi Hiago,
> 
> I believe this patch is breaking some oe-selftest:
> 
> Traceback (most recent call last):
>   File "/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/meta/lib/oeqa/core/decorator/__init__.py", line 35, in wrapped_f
>     return func(*args, **kwargs)
>   File "/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/meta/lib/oeqa/runtime/cases/weston.py", line 81, in test_weston_can_initialize_new_wayland_compositor
>     self.assertTrue(new_wl_processes, msg='Could not get new weston-desktop-shell processes (%s, try_cnt:%s) weston log: %s' % (new_wl_processes, try_cnt, weston_log))
>     ~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> AssertionError: [] is not true : Could not get new weston-desktop-shell processes ([], try_cnt:5) weston log: cat: can't open '/tmp/weston-2.log': No such file or directory
> Traceback (most recent call last):
>   File "/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/meta/lib/oeqa/core/decorator/__init__.py", line 35, in wrapped_f
>     return func(*args, **kwargs)
>   File "/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/meta/lib/oeqa/core/decorator/__init__.py", line 35, in wrapped_f
>     return func(*args, **kwargs)
>   File "/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/meta/lib/oeqa/runtime/cases/weston.py", line 89, in test_weston_supports_xwayland
>     self.assertEqual(status, 0, msg=msg)
>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^
> AssertionError: 1 != 0 : xwayland does not appear to be running
> 
> https://valkyrie.yoctoproject.org/#/builders/48/builds/556/steps/14/logs/stdio
> https://valkyrie.yoctoproject.org/#/builders/75/builds/581/steps/17/logs/stdio
> 
> And another QA error:
> 
> NOTE: recipe core-image-full-cmdline-1.0-r0: task do_testimage: Succeeded
> Traceback (most recent call last):
>   File "/srv/pokybuild/yocto-worker/no-x11/build/meta/lib/oeqa/core/decorator/__init__.py", line 35, in wrapped_f
>     return func(*args, **kwargs)
>   File "/srv/pokybuild/yocto-worker/no-x11/build/meta/lib/oeqa/runtime/cases/weston.py", line 81, in test_weston_can_initialize_new_wayland_compositor
>     self.assertTrue(new_wl_processes, msg='Could not get new weston-desktop-shell processes (%s, try_cnt:%s) weston log: %s' % (new_wl_processes, try_cnt, weston_log))
> AssertionError: [] is not true : Could not get new weston-desktop-shell processes ([], try_cnt:5) weston log: cat: can't open '/tmp/weston-2.log': No such file or directory
> 
> https://valkyrie.yoctoproject.org/#/builders/25/builds/638/steps/12/logs/stdio
> 
> Can you have a look at these issues ?

Thanks for letting me know, sure, I will take a look.

> 
> -- 
> Mathieu Dubois-Briand, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
> 

Cheers,

Hiago.
diff mbox series

Patch

diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb
index 5723655a9bba..0f79a44e48bc 100644
--- a/meta/recipes-graphics/wayland/weston-init.bb
+++ b/meta/recipes-graphics/wayland/weston-init.bb
@@ -84,7 +84,7 @@  USERADD_PACKAGES = "${PN}"
 #
 require ${THISDIR}/required-distro-features.inc
 
-RDEPENDS:${PN} = "weston kbd ${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'weston-xwayland', '', d)}"
+RDEPENDS:${PN} = "weston ${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'weston-xwayland', '', d)}"
 
 INITSCRIPT_NAME = "weston"
 INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."