Skip to content

Update systemd from 241 to 242 #1072

Merged
merged 7 commits into from
Apr 18, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions systemd.be0
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env beesh

# BEE_VERSION systemd-239-2
# BEE_VERSION systemd-242-1

## this file was created by bee init and should be executed to build a
## bee-package. (Additional hints are located at the end of this file.)
Expand All @@ -15,7 +15,7 @@ SRCURL[0]="https://github.com/systemd/systemd/archive/v${PKGVERSION}.tar.gz"
## Add URLs/pathes to patch files to the PATCHURL array.
## The sources will be patched in the order of the array.

# PATCHURL+=()
PATCHURL+=(/src/mariux/patches/systemd-v242-0001-Prevent-loop-when-stopping-datagram-socket-units.patch)

BEE_BUILDTYPE=meson

Expand Down Expand Up @@ -71,7 +71,9 @@ mee_configure() {
-Dsplit-usr=true \
-Dsysusers=false \
-Ddefault-kill-user-processes=false \
-Db_lto=false
-Db_lto=false \
-Dbump-proc-sys-fs-file-max=false \
-Dbump-proc-sys-fs-nr-open=false
}

#mee_build() {
Expand All @@ -93,17 +95,14 @@ mee_install_post() {
# Remove systemd’s sysctl configuration
rm -rv ${D}/${LIBDIR}/sysctl.d/*

# Disable systemd-networkd
rm -rv ${D}/etc/systemd/system/sockets.target.wants/systemd-networkd.socket
rm -rv ${D}/etc/systemd/system/dbus-org.freedesktop.network1.service
rm -rv ${D}/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
rm -rv ${D}/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service

# Remove directory to disable persistent storage of logs
rm -rv ${D}/var/log/journal

# Explicitly configure volatile storage of logs
start_cmd sed -i 's/^#Storage=auto/Storage=volatile/' ${D}/etc/systemd/journald.conf

# Restore historical RLIMIT_NOFILE resource limit
echo "DefaultLimitNOFILE=1024:4096" >> ${D}/etc/systemd/system.conf
}

###############################################################################
Expand Down