summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
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:29 +0100
commited8d13bf60fa4825c6831eac11d8a110d0d689f0 (patch)
tree73a0ed244ede443f528b31c6ef5ec4b8cc23c6b1 /meta/recipes-core
parent8089cefed8e83c0348037768c292058f1bcbbbe5 (diff)
downloadpoky-ed8d13bf60fa4825c6831eac11d8a110d0d689f0.tar.gz
systemd: Remove X11 related files when disabled
When X11 isn't in DISTRO_FEATURES, remove X11 related files. (From OE-Core rev: 5da06b1e2f751e065bc8569201705c1abd30c57c) 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>
Diffstat (limited to 'meta/recipes-core')
-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() {
275 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 275 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
276 ln -s ../run/systemd/resolve/resolv.conf ${D}${sysconfdir}/resolv-conf.systemd 276 ln -s ../run/systemd/resolve/resolv.conf ${D}${sysconfdir}/resolv-conf.systemd
277 fi 277 fi
278 if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'false', 'true', d)}; then
279 rm ${D}${exec_prefix}/lib/tmpfiles.d/x11.conf
280 rm -r ${D}${sysconfdir}/X11
281 fi
278 282
279 # If polkit is setup fixup permissions and ownership 283 # If polkit is setup fixup permissions and ownership
280 if ${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'true', 'false', d)}; then 284 if ${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'true', 'false', d)}; then