| Message ID | 20230824090414.9198-1-f_l_k@t-online.de |
|---|---|
| State | Accepted, archived |
| Commit | e86b572f260fae7837694aa4c6d61de639bc71e8 |
| Headers | show |
| Series | qemu: fix libudev packageconfig for systemd images | expand |
On Thu, 24 Aug 2023 at 11:04, Markus Volk <f_l_k@t-online.de> wrote: > -PACKAGECONFIG[libudev] = "--enable-libudev,--disable-libudev,eudev" > +UDEV_PROVIDER = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'eudev', d)}" > +PACKAGECONFIG[libudev] = "--enable-libudev,--disable-libudev,${UDEV_PROVIDER}" Both systemd and eudev contain PROVIDES = "udev" so the dependency can simply be changed to udev? Alex
On Thu, Aug 24 2023 at 11:12:27 AM +02:00:00, Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
> so the dependency can simply be changed to udev?
I think I remember a few years ago there was a problem with "multiple
providers", but now it works as you write :)
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index ea02bf0c73..dfd4f1b97f 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -199,7 +199,8 @@ PACKAGECONFIG[usb-redir] = "--enable-usb-redir,--disable-usb-redir,usbredir" PACKAGECONFIG[snappy] = "--enable-snappy,--disable-snappy,snappy" PACKAGECONFIG[glusterfs] = "--enable-glusterfs,--disable-glusterfs,glusterfs" PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon" -PACKAGECONFIG[libudev] = "--enable-libudev,--disable-libudev,eudev" +UDEV_PROVIDER = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'eudev', d)}" +PACKAGECONFIG[libudev] = "--enable-libudev,--disable-libudev,${UDEV_PROVIDER}" PACKAGECONFIG[attr] = "--enable-attr,--disable-attr,attr," PACKAGECONFIG[rbd] = "--enable-rbd,--disable-rbd,ceph,ceph" PACKAGECONFIG[vhost] = "--enable-vhost-net,--disable-vhost-net,,"
eudev is needed to provide libudev when not using systemd, but including eudev breaks things for systemd. We can't include eudev here since systemd provides libudev itself. Signed-off-by: Markus Volk <f_l_k@t-online.de> --- meta/recipes-devtools/qemu/qemu.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)