summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2019-11-15 15:42:02 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-21 23:08:19 +0000
commitbdfab842eb31edc26d3f343cce6b1a9a37ba829e (patch)
treec28c83cbd95a977b3f1460910190152685397fd6 /meta
parent9702544b3e75d761d86cae7e8b36f3f2625b68ce (diff)
downloadpoky-bdfab842eb31edc26d3f343cce6b1a9a37ba829e.tar.gz
systemd: remove ${PN}-xorg-xinitrc
In 50-systemd-user.sh which is packaged to sub-package ${PN}-xorg-xinitrc, it exports environment variables DISPLAY and XAUTHORITY to systemd. It fails to start systemd services which require these environment variables such as thunar.service: root@qemux86-64:~# systemctl --user status thunar ● thunar.service - Thunar file manager Loaded: loaded (/usr/lib/systemd/user/thunar.service; disabled; vendor preset: enabled) Active: inactive (dead) Docs: man:Thunar(1) Nov 14 07:47:29 qemux86-64 systemd[352]: Starting Thunar file manager... Nov 14 07:47:29 qemux86-64 Thunar[873]: cannot open display: Nov 14 07:47:29 qemux86-64 systemd[352]: thunar.service: Main process exited, code=exited, status=1/FAILURE Nov 14 07:47:29 qemux86-64 systemd[352]: thunar.service: Failed with result 'exit-code'. Nov 14 07:47:29 qemux86-64 systemd[352]: Failed to start Thunar file manager. It is not convenient to make all such kind of packages require package ${PN}-xorg-xinitrc, so remove the sub-package and merge the only file provided by it to main package. No recipe depends on ${PN}-xorg-xinitrc in oe-core and meta-openembedded now, so no need to set rprovides for it. (From OE-Core rev: 9b7d65aa52171cb559cc12ca3fdeaee54b9022c1) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/systemd/systemd_243.bb4
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/recipes-core/systemd/systemd_243.bb b/meta/recipes-core/systemd/systemd_243.bb
index df56e557ff..b31d0b5ed4 100644
--- a/meta/recipes-core/systemd/systemd_243.bb
+++ b/meta/recipes-core/systemd/systemd_243.bb
@@ -317,7 +317,6 @@ PACKAGES =+ "\
317 ${PN}-rpm-macros \ 317 ${PN}-rpm-macros \
318 ${PN}-binfmt \ 318 ${PN}-binfmt \
319 ${PN}-zsh-completion \ 319 ${PN}-zsh-completion \
320 ${PN}-xorg-xinitrc \
321 ${PN}-container \ 320 ${PN}-container \
322 ${PN}-journal-gatewayd \ 321 ${PN}-journal-gatewayd \
323 ${PN}-journal-upload \ 322 ${PN}-journal-upload \
@@ -379,8 +378,6 @@ FILES_${PN}-kernel-install = "${bindir}/kernel-install \
379FILES_${PN}-rpm-macros = "${exec_prefix}/lib/rpm \ 378FILES_${PN}-rpm-macros = "${exec_prefix}/lib/rpm \
380 " 379 "
381 380
382FILES_${PN}-xorg-xinitrc = "${sysconfdir}/X11/xinit/xinitrc.d/*"
383
384FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" 381FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions"
385 382
386FILES_${PN}-binfmt = "${sysconfdir}/binfmt.d/ \ 383FILES_${PN}-binfmt = "${sysconfdir}/binfmt.d/ \
@@ -529,6 +526,7 @@ FILES_${PN} = " ${base_bindir}/* \
529 ${sysconfdir}/xdg/ \ 526 ${sysconfdir}/xdg/ \
530 ${sysconfdir}/init.d/README \ 527 ${sysconfdir}/init.d/README \
531 ${sysconfdir}/resolv-conf.systemd \ 528 ${sysconfdir}/resolv-conf.systemd \
529 ${sysconfdir}/X11/xinit/xinitrc.d/* \
532 ${rootlibexecdir}/systemd/* \ 530 ${rootlibexecdir}/systemd/* \
533 ${systemd_unitdir}/* \ 531 ${systemd_unitdir}/* \
534 ${base_libdir}/security/*.so \ 532 ${base_libdir}/security/*.so \