From 5da06b1e2f751e065bc8569201705c1abd30c57c Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Fri, 27 Mar 2020 17:25:14 +0000 Subject: systemd: Remove X11 related files when disabled When X11 isn't in DISTRO_FEATURES, remove X11 related files. Signed-off-by: Alex Kiernan Acked-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_244.3.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index 287f07b29f..2b3dad602f 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb @@ -275,6 +275,10 @@ do_install() { sed -i -e "s%^L! /etc/resolv.conf.*$%L! /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf%g" ${D}${exec_prefix}/lib/tmpfiles.d/etc.conf ln -s ../run/systemd/resolve/resolv.conf ${D}${sysconfdir}/resolv-conf.systemd fi + if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'false', 'true', d)}; then + rm ${D}${exec_prefix}/lib/tmpfiles.d/x11.conf + rm -r ${D}${sysconfdir}/X11 + fi # If polkit is setup fixup permissions and ownership if ${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'true', 'false', d)}; then -- cgit 1.2.3-korg