diff options
-rw-r--r-- | meta/recipes-core/systemd/systemd_239.bb | 61 |
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 3dbeaac342..ed10f634b9 100644 --- a/meta/recipes-core/systemd/systemd_239.bb +++ b/meta/recipes-core/systemd/systemd_239.bb | |||
@@ -239,6 +239,9 @@ do_install() { | |||
239 | # Delete journal README, as log can be symlinked inside volatile. | 239 | # Delete journal README, as log can be symlinked inside volatile. |
240 | rm -f ${D}/${localstatedir}/log/README | 240 | rm -f ${D}/${localstatedir}/log/README |
241 | 241 | ||
242 | # journal-remote creates this at start | ||
243 | rm -rf ${D}/${localstatedir}/log/journal/remote | ||
244 | |||
242 | install -d ${D}${systemd_unitdir}/system/graphical.target.wants | 245 | install -d ${D}${systemd_unitdir}/system/graphical.target.wants |
243 | install -d ${D}${systemd_unitdir}/system/multi-user.target.wants | 246 | install -d ${D}${systemd_unitdir}/system/multi-user.target.wants |
244 | install -d ${D}${systemd_unitdir}/system/poweroff.target.wants | 247 | install -d ${D}${systemd_unitdir}/system/poweroff.target.wants |
@@ -309,19 +312,35 @@ PACKAGES =+ "\ | |||
309 | ${PN}-zsh-completion \ | 312 | ${PN}-zsh-completion \ |
310 | ${PN}-xorg-xinitrc \ | 313 | ${PN}-xorg-xinitrc \ |
311 | ${PN}-container \ | 314 | ${PN}-container \ |
315 | ${PN}-journal-gatewayd \ | ||
316 | ${PN}-journal-upload \ | ||
317 | ${PN}-journal-remote \ | ||
312 | ${PN}-extra-utils \ | 318 | ${PN}-extra-utils \ |
313 | " | 319 | " |
314 | 320 | ||
315 | SUMMARY_${PN}-container = "Tools for containers and VMs" | 321 | SUMMARY_${PN}-container = "Tools for containers and VMs" |
316 | DESCRIPTION_${PN}-container = "Systemd tools to spawn and manage containers and virtual machines." | 322 | DESCRIPTION_${PN}-container = "Systemd tools to spawn and manage containers and virtual machines." |
317 | 323 | ||
318 | SYSTEMD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', '${PN}-binfmt', '', d)}" | 324 | SUMMARY_${PN}-journal-gatewayd = "HTTP server for journal events" |
325 | DESCRIPTION_${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." | ||
326 | |||
327 | SUMMARY_${PN}-journal-upload = "Send journal messages over the network" | ||
328 | DESCRIPTION_${PN}-journal-upload = "systemd-journal-upload uploads journal entries to a specified URL." | ||
329 | |||
330 | SUMMARY_${PN}-journal-remote = "Receive journal messages over the network" | ||
331 | DESCRIPTION_${PN}-journal-remote = "systemd-journal-remote is a command to receive serialized journal events and store them to journal files." | ||
332 | |||
333 | SYSTEMD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', '${PN}-binfmt', '', d)} \ | ||
334 | ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-gatewayd', '', d)} \ | ||
335 | ${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '${PN}-journal-upload', '', d)} \ | ||
336 | ${@bb.utils.contains('PACKAGECONFIG', '', '${PN}-journal-remote', '', d)} \ | ||
337 | " | ||
319 | SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" | 338 | SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" |
320 | 339 | ||
321 | USERADD_PACKAGES = "${PN} ${PN}-extra-utils" | 340 | USERADD_PACKAGES = "${PN} ${PN}-extra-utils ${PN}-journal-gateway ${PN}-journal-upload ${PN}-journal-remote" |
322 | USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '--system -d / -M --shell /bin/nologin systemd-journal-gateway;', '', d)}" | 341 | USERADD_PARAM_${PN}-journal-gateway += "${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '--system -d / -M --shell /bin/nologin systemd-journal-gateway;', '', d)}" |
323 | USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '--system -d / -M --shell /bin/nologin systemd-journal-remote;', '', d)}" | 342 | USERADD_PARAM_${PN}-journal-remote += "${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '--system -d / -M --shell /bin/nologin systemd-journal-remote;', '', d)}" |
324 | USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '--system -d / -M --shell /bin/nologin systemd-journal-upload;', '', d)}" | 343 | USERADD_PARAM_${PN}-journal-upload += "${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '--system -d / -M --shell /bin/nologin systemd-journal-upload;', '', d)}" |
325 | USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'timesyncd', '--system -d / -M --shell /bin/nologin systemd-timesync;', '', d)}" | 344 | USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'timesyncd', '--system -d / -M --shell /bin/nologin systemd-timesync;', '', d)}" |
326 | USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'networkd', '--system -d / -M --shell /bin/nologin systemd-network;', '', d)}" | 345 | USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'networkd', '--system -d / -M --shell /bin/nologin systemd-network;', '', d)}" |
327 | USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /bin/nologin systemd-coredump;', '', d)}" | 346 | USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /bin/nologin systemd-coredump;', '', d)}" |
@@ -362,6 +381,29 @@ RRECOMMENDS_${PN}-binfmt = "kernel-module-binfmt-misc" | |||
362 | 381 | ||
363 | RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps" | 382 | RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps" |
364 | 383 | ||
384 | |||
385 | FILES_${PN}-journal-gatewayd = "${rootlibexecdir}/systemd/systemd-journal-gatewayd \ | ||
386 | ${systemd_system_unitdir}/systemd-journal-gatewayd.service \ | ||
387 | ${systemd_system_unitdir}/systemd-journal-gatewayd.socket \ | ||
388 | ${systemd_system_unitdir}/sockets.target.wants/systemd-journal-gatewayd.socket \ | ||
389 | ${datadir}/systemd/gatewayd/browse.html \ | ||
390 | " | ||
391 | SYSTEMD_SERVICE_${PN}-journal-gatewayd = "systemd-journal-gatewayd.socket" | ||
392 | |||
393 | FILES_${PN}-journal-upload = "${rootlibexecdir}/systemd/systemd-journal-upload \ | ||
394 | ${systemd_system_unitdir}/systemd-journal-upload.service \ | ||
395 | ${sysconfdir}/systemd/journal-upload.conf \ | ||
396 | " | ||
397 | SYSTEMD_SERVICE_${PN}-journal-upload = "systemd-journal-upload.service" | ||
398 | |||
399 | FILES_${PN}-journal-remote = "${rootlibexecdir}/systemd/systemd-journal-remote \ | ||
400 | ${sysconfdir}/systemd/journal-remote.conf \ | ||
401 | ${systemd_system_unitdir}/systemd-journal-remote.service \ | ||
402 | ${systemd_system_unitdir}/systemd-journal-remote.socket \ | ||
403 | " | ||
404 | SYSTEMD_SERVICE_${PN}-remote = "systemd-journal-remote.socket" | ||
405 | |||
406 | |||
365 | FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf \ | 407 | FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf \ |
366 | ${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf \ | 408 | ${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf \ |
367 | ${base_bindir}/machinectl \ | 409 | ${base_bindir}/machinectl \ |
@@ -380,9 +422,6 @@ FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.c | |||
380 | ${systemd_system_unitdir}/var-lib-machines.mount \ | 422 | ${systemd_system_unitdir}/var-lib-machines.mount \ |
381 | ${rootlibexecdir}/systemd/systemd-import \ | 423 | ${rootlibexecdir}/systemd/systemd-import \ |
382 | ${rootlibexecdir}/systemd/systemd-importd \ | 424 | ${rootlibexecdir}/systemd/systemd-importd \ |
383 | ${rootlibexecdir}/systemd/systemd-journal-gatewayd \ | ||
384 | ${rootlibexecdir}/systemd/systemd-journal-remote \ | ||
385 | ${rootlibexecdir}/systemd/systemd-journal-upload \ | ||
386 | ${rootlibexecdir}/systemd/systemd-machined \ | 425 | ${rootlibexecdir}/systemd/systemd-machined \ |
387 | ${rootlibexecdir}/systemd/systemd-pull \ | 426 | ${rootlibexecdir}/systemd/systemd-pull \ |
388 | ${exec_prefix}/lib/tmpfiles.d/systemd-nspawn.conf \ | 427 | ${exec_prefix}/lib/tmpfiles.d/systemd-nspawn.conf \ |
@@ -396,6 +435,12 @@ FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.c | |||
396 | ${datadir}/polkit-1/actions/org.freedesktop.machine1.policy \ | 435 | ${datadir}/polkit-1/actions/org.freedesktop.machine1.policy \ |
397 | " | 436 | " |
398 | 437 | ||
438 | RRECOMMENDS_${PN}-container += "\ | ||
439 | ${PN}-journal-upload \ | ||
440 | ${PN}-journal-remote \ | ||
441 | ${PN}-journal-gatewayd \ | ||
442 | " | ||
443 | |||
399 | FILES_${PN}-extra-utils = "\ | 444 | FILES_${PN}-extra-utils = "\ |
400 | ${base_bindir}/systemd-escape \ | 445 | ${base_bindir}/systemd-escape \ |
401 | ${base_bindir}/systemd-inhibit \ | 446 | ${base_bindir}/systemd-inhibit \ |