summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Freihofer <adrian.freihofer@gmail.com>2018-11-25 20:45:03 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-27 22:13:11 +0000
commitd0b2cedfb0996739c79a1011159b4047988851bf (patch)
treea8e05cb101a6b751eb3fdb392a02c4183d62165b
parent2cba73f2b138245d93979d7327a94de2ce91103e (diff)
downloadpoky-d0b2cedfb0996739c79a1011159b4047988851bf.tar.gz
systemd: fix PN-container package splitting
- Fix package splitting for services installed with systemd-container. Some files have been installed with systemd package instead of systemd-container package. (*.service, *.socket, *.html...) - Split journal-upload, journal-remote, journal-gatewayd into separate packages. These services are not strictly related to nspawn containers. Remote logging is now possible without installing all the container stuff. - systemd-container package rrecommends journal-upload, journal- remote, journal-gatewayd packages. (From OE-Core rev: d31ff84a5f4723700ed48fd14ace81d3c707065e) Signed-off-by: Adrian Freihofer <adrian.freihofer@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd_239.bb61
1 files changed, 53 insertions, 8 deletions
diff --git a/meta/recipes-core/systemd/systemd_239.bb b/meta/recipes-core/systemd/systemd_239.bb
index e19a8babce..c53ce0d78e 100644
--- a/meta/recipes-core/systemd/systemd_239.bb
+++ b/meta/recipes-core/systemd/systemd_239.bb
@@ -240,6 +240,9 @@ do_install() {
240 # Delete journal README, as log can be symlinked inside volatile. 240 # Delete journal README, as log can be symlinked inside volatile.
241 rm -f ${D}/${localstatedir}/log/README 241 rm -f ${D}/${localstatedir}/log/README
242 242
243 # journal-remote creates this at start
244 rm -rf ${D}/${localstatedir}/log/journal/remote
245
243 install -d ${D}${systemd_unitdir}/system/graphical.target.wants 246 install -d ${D}${systemd_unitdir}/system/graphical.target.wants
244 install -d ${D}${systemd_unitdir}/system/multi-user.target.wants 247 install -d ${D}${systemd_unitdir}/system/multi-user.target.wants
245 install -d ${D}${systemd_unitdir}/system/poweroff.target.wants 248 install -d ${D}${systemd_unitdir}/system/poweroff.target.wants
@@ -310,19 +313,35 @@ PACKAGES =+ "\
310 ${PN}-zsh-completion \ 313 ${PN}-zsh-completion \
311 ${PN}-xorg-xinitrc \ 314 ${PN}-xorg-xinitrc \
312 ${PN}-container \ 315 ${PN}-container \
316 ${PN}-journal-gatewayd \
317 ${PN}-journal-upload \
318 ${PN}-journal-remote \
313 ${PN}-extra-utils \ 319 ${PN}-extra-utils \
314" 320"
315 321
316SUMMARY_${PN}-container = "Tools for containers and VMs" 322SUMMARY_${PN}-container = "Tools for containers and VMs"
317DESCRIPTION_${PN}-container = "Systemd tools to spawn and manage containers and virtual machines." 323DESCRIPTION_${PN}-container = "Systemd tools to spawn and manage containers and virtual machines."
318 324
319SYSTEMD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', '${PN}-binfmt', '', d)}" 325SUMMARY_${PN}-journal-gatewayd = "HTTP server for journal events"
326DESCRIPTION_${PN}-journal-gatewayd = "systemd-journal-gatewayd serves journal events over the network. Clients must connect using HTTP. The server listens on port 19531 by default."
327
328SUMMARY_${PN}-journal-upload = "Send journal messages over the network"
329DESCRIPTION_${PN}-journal-upload = "systemd-journal-upload uploads journal entries to a specified URL."
330
331SUMMARY_${PN}-journal-remote = "Receive journal messages over the network"
332DESCRIPTION_${PN}-journal-remote = "systemd-journal-remote is a command to receive serialized journal events and store them to journal files."
333
334SYSTEMD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', '${PN}-binfmt', '', d)} \
335 ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-gatewayd', '', d)} \
336 ${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '${PN}-journal-upload', '', d)} \
337 ${@bb.utils.contains('PACKAGECONFIG', '', '${PN}-journal-remote', '', d)} \
338"
320SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" 339SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service"
321 340
322USERADD_PACKAGES = "${PN} ${PN}-extra-utils" 341USERADD_PACKAGES = "${PN} ${PN}-extra-utils ${PN}-journal-gateway ${PN}-journal-upload ${PN}-journal-remote"
323USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '--system -d / -M --shell /bin/nologin systemd-journal-gateway;', '', d)}" 342USERADD_PARAM_${PN}-journal-gateway += "${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '--system -d / -M --shell /bin/nologin systemd-journal-gateway;', '', d)}"
324USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '--system -d / -M --shell /bin/nologin systemd-journal-remote;', '', d)}" 343USERADD_PARAM_${PN}-journal-remote += "${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '--system -d / -M --shell /bin/nologin systemd-journal-remote;', '', d)}"
325USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '--system -d / -M --shell /bin/nologin systemd-journal-upload;', '', d)}" 344USERADD_PARAM_${PN}-journal-upload += "${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '--system -d / -M --shell /bin/nologin systemd-journal-upload;', '', d)}"
326USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'timesyncd', '--system -d / -M --shell /bin/nologin systemd-timesync;', '', d)}" 345USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'timesyncd', '--system -d / -M --shell /bin/nologin systemd-timesync;', '', d)}"
327USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'networkd', '--system -d / -M --shell /bin/nologin systemd-network;', '', d)}" 346USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'networkd', '--system -d / -M --shell /bin/nologin systemd-network;', '', d)}"
328USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /bin/nologin systemd-coredump;', '', d)}" 347USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /bin/nologin systemd-coredump;', '', d)}"
@@ -363,6 +382,29 @@ RRECOMMENDS_${PN}-binfmt = "kernel-module-binfmt-misc"
363 382
364RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps" 383RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps"
365 384
385
386FILES_${PN}-journal-gatewayd = "${rootlibexecdir}/systemd/systemd-journal-gatewayd \
387 ${systemd_system_unitdir}/systemd-journal-gatewayd.service \
388 ${systemd_system_unitdir}/systemd-journal-gatewayd.socket \
389 ${systemd_system_unitdir}/sockets.target.wants/systemd-journal-gatewayd.socket \
390 ${datadir}/systemd/gatewayd/browse.html \
391 "
392SYSTEMD_SERVICE_${PN}-journal-gatewayd = "systemd-journal-gatewayd.socket"
393
394FILES_${PN}-journal-upload = "${rootlibexecdir}/systemd/systemd-journal-upload \
395 ${systemd_system_unitdir}/systemd-journal-upload.service \
396 ${sysconfdir}/systemd/journal-upload.conf \
397 "
398SYSTEMD_SERVICE_${PN}-journal-upload = "systemd-journal-upload.service"
399
400FILES_${PN}-journal-remote = "${rootlibexecdir}/systemd/systemd-journal-remote \
401 ${sysconfdir}/systemd/journal-remote.conf \
402 ${systemd_system_unitdir}/systemd-journal-remote.service \
403 ${systemd_system_unitdir}/systemd-journal-remote.socket \
404 "
405SYSTEMD_SERVICE_${PN}-remote = "systemd-journal-remote.socket"
406
407
366FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf \ 408FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf \
367 ${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf \ 409 ${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf \
368 ${base_bindir}/machinectl \ 410 ${base_bindir}/machinectl \
@@ -381,9 +423,6 @@ FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.c
381 ${systemd_system_unitdir}/var-lib-machines.mount \ 423 ${systemd_system_unitdir}/var-lib-machines.mount \
382 ${rootlibexecdir}/systemd/systemd-import \ 424 ${rootlibexecdir}/systemd/systemd-import \
383 ${rootlibexecdir}/systemd/systemd-importd \ 425 ${rootlibexecdir}/systemd/systemd-importd \
384 ${rootlibexecdir}/systemd/systemd-journal-gatewayd \
385 ${rootlibexecdir}/systemd/systemd-journal-remote \
386 ${rootlibexecdir}/systemd/systemd-journal-upload \
387 ${rootlibexecdir}/systemd/systemd-machined \ 426 ${rootlibexecdir}/systemd/systemd-machined \
388 ${rootlibexecdir}/systemd/systemd-pull \ 427 ${rootlibexecdir}/systemd/systemd-pull \
389 ${exec_prefix}/lib/tmpfiles.d/systemd-nspawn.conf \ 428 ${exec_prefix}/lib/tmpfiles.d/systemd-nspawn.conf \
@@ -397,6 +436,12 @@ FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.c
397 ${datadir}/polkit-1/actions/org.freedesktop.machine1.policy \ 436 ${datadir}/polkit-1/actions/org.freedesktop.machine1.policy \
398 " 437 "
399 438
439RRECOMMENDS_${PN}-container += "\
440 ${PN}-journal-upload \
441 ${PN}-journal-remote \
442 ${PN}-journal-gatewayd \
443 "
444
400FILES_${PN}-extra-utils = "\ 445FILES_${PN}-extra-utils = "\
401 ${base_bindir}/systemd-escape \ 446 ${base_bindir}/systemd-escape \
402 ${base_bindir}/systemd-inhibit \ 447 ${base_bindir}/systemd-inhibit \