summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2020-03-27 17:25:14 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-30 12:33:10 +0100
commit5da06b1e2f751e065bc8569201705c1abd30c57c (patch)
treeb0fe535d5abe159751b5806c944b3d716e610b1f
parent39ece7b3e604c9dfa046841e099e2a47b713f62c (diff)
downloadopenembedded-core-contrib-5da06b1e2f751e065bc8569201705c1abd30c57c.tar.gz
openembedded-core-contrib-5da06b1e2f751e065bc8569201705c1abd30c57c.tar.bz2
openembedded-core-contrib-5da06b1e2f751e065bc8569201705c1abd30c57c.zip
systemd: Remove X11 related files when disabled
When X11 isn't in DISTRO_FEATURES, remove X11 related files. Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd_244.3.bb4
1 files changed, 4 insertions, 0 deletions
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