Skip to contentSkip to conversation

weston-init: remove kbd from RDEPENDS

PATCH In review Hiago De Franco 2 participants 3 messages Dec 12, 2024 – Dec 13, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 weston-init: remove kbd from RDEPENDS

From: Hiago De Franco <[email protected]>

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

---
 meta/recipes-graphics/wayland/weston-init.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/wayland/weston-init.bb +1 -1
index 5723655a9bba..0f79a44e48bc 100644
@@ -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 ."
Signature · 1 line
2.39.5
#1 lore raw
Quoted 18 lines · Hiago De Franco via lists.openembedded.org

From: Hiago De Franco <[email protected]>

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

---
 meta/recipes-graphics/wayland/weston-init.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/wayland/weston-init.bb +0 -0
index 5723655a9bba..0f79a44e48bc 100644

meta/recipes-graphics/wayland/weston-init.bb USERADD_PACKAGES = "${PN}" · line 90

Quoted 8 lines
meta/recipes-graphics/wayland/weston-init.bb +1 -1
@@ -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 ?

Signature · 3 lines
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

Hi Mathieu,

Quoted 62 lines · Mathieu Dubois-Briand
Quoted 18 lines · Hiago De Franco via lists.openembedded.org

From: Hiago De Franco <[email protected]>

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

---
 meta/recipes-graphics/wayland/weston-init.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/wayland/weston-init.bb +0 -0
index 5723655a9bba..0f79a44e48bc 100644

meta/recipes-graphics/wayland/weston-init.bb USERADD_PACKAGES = "${PN}" · line 90

Quoted 8 lines
meta/recipes-graphics/wayland/weston-init.bb +1 -1
@@ -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

Quoted 3 lines

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.

Quoted 6 lines
Signature · 4 lines
-- 
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Cheers,

Hiago.