From c9554c69371341346ab043e9ce580e9416d31c12 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 8 Mar 2022 13:17:45 -0500 Subject: [PATCH] xen: only package xencommon systemd components if systemd is enabled We've had reports of both the init.d xencommons and the systemd services attempting to initialize the console, and breaking boot. The systemd initialization really only needs to be enabled when systemd is in DISTRO_FEATURES, and init.d the opposite. Signed-off-by: Bruce Ashfield --- recipes-extended/xen/xen-tools.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xen-tools.inc index 6e25046e..6bbc8cd8 100644 --- a/recipes-extended/xen/xen-tools.inc +++ b/recipes-extended/xen/xen-tools.inc @@ -655,14 +655,14 @@ FILES:${PN}-xm = "\ FILES:${PN}-xencommons += "\ ${nonarch_libdir}/modules-load.d/xen.conf \ ${sysconfdir}/default/xencommons \ - ${sysconfdir}/init.d/xencommons \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', '${sysconfdir}/init.d/xencommons', d)} \ ${sysconfdir}/xen/scripts/launch-xenstore \ ${systemd_unitdir}/system/proc-xen.mount \ - ${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service \ - ${systemd_unitdir}/system/xenconsoled.service \ - ${systemd_unitdir}/system/xen-init-dom0.service \ - ${systemd_unitdir}/system/xenstored.service \ - ${systemd_unitdir}/system/var-lib-xenstored.mount \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/xenconsoled.service', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/xen-init-dom0.service', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/xenstored.service', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/var-lib-xenstored.mount', '', d)} \ " FILES:${PN}-xend += " \