Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sys-apps/systemd: updated to minor version 255.8 #2089

Merged
merged 4 commits into from
Jul 8, 2024
Merged

sys-apps/systemd: updated to minor version 255.8 #2089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5081a66
sys-apps/systemd: Sync with Gentoo
ader1990 Jul 3, 2024
278c496
overlay sys-apps/systemd: Apply Flatcar modifications
krnowak Mar 26, 2024
f89cc7d
sys-apps/systemd: remove patch 255-install-format-overflow.patch
ader1990 Jul 3, 2024
2821aca
sys-apps/systemd: add changelog for 225.8
ader1990 Jul 3, 2024
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
1 change: 1 addition & 0 deletions changelog/updates/2024-07-03-systemd-255-8.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- systemd ([255.8](https://github.com/systemd/systemd-stable/commits/v255.8/))
2 changes: 1 addition & 1 deletion sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/Manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DIST systemd-stable-255.4.tar.gz 14952427 BLAKE2B 27f5080f83a9e870fbe8e3ebcb500a63c42022f1f96f26f35c76eeeea85dab691291c31ee716cab330b76df5e576910a6a82f51267eff4f766b1d4c304d815c9 SHA512 8a2bde11a55f7f788ba7751789a5e9be6ce9634e88d54e49f6e832c4c49020c6cacaf2a610fe26f92998b0cbf43c6c2150a96b2c0953d23261009f57d71ea979
DIST systemd-stable-255.8.tar.gz 15070471 BLAKE2B b437404af7fd73ef527f80d9d14d46a781444103d1756c27494ecf2664c9c5efe1169c85b91148a3bf190dc7c5e31cf8d42a13c84102d101ea7e4a0570e8d719 SHA512 7692be761a393924669a90f6f343998a85707a9daa3ce169ce67f62ae2a39338c2c3496066b2659c6500849104fab0529fca5704a3eb32375f2f44131216d1f1
43 changes: 0 additions & 43 deletions ...r/src/third_party/coreos-overlay/sys-apps/systemd/files/255-install-format-overflow.patch
View file
Open in desktop

This file was deleted.

31 changes: 31 additions & 0 deletions ...ner/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-test-process-util.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From c3f91c76af292e3bd2c6e2b12e37de88cf5d7c72 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <[email protected]>
Date: Thu, 18 Apr 2024 00:04:44 -0400
Subject: [PATCH] test-process-util: remove assert that fails under pid-sandbox

Upstream refuses to fix this.

Bug: https://bugs.gentoo.org/674458
Bug: https://github.com/systemd/systemd/issues/25015
---
src/test/test-process-util.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c
index c96bd4341b..9ff1bdc082 100644
--- a/src/test/test-process-util.c
+++ b/src/test/test-process-util.c
@@ -92,8 +92,8 @@ static void test_pid_get_comm_one(pid_t pid) {
assert_se(r >= 0 || r == -EACCES);
log_info("PID"PID_FMT" strlen(environ): %zi", pid, env ? (ssize_t)strlen(env) : (ssize_t)-errno);

- if (!detect_container())
- assert_se(get_ctty_devnr(pid, &h) == -ENXIO || pid != 1);
+
+

(void) getenv_for_pid(pid, "PATH", &i);
log_info("PID"PID_FMT" $PATH: '%s'", pid, strna(i));
--
2.44.0

30 changes: 19 additions & 11 deletions ...lay/sys-apps/systemd/systemd-255.4.ebuild → ...lay/sys-apps/systemd/systemd-255.8.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,10 @@ BDEPEND="
$(python_gen_cond_dep "
dev-python/jinja[\${PYTHON_USEDEP}]
dev-python/lxml[\${PYTHON_USEDEP}]
boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
ukify? ( test? ( ${PEFILE_DEPEND} ) )
boot? (
>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
test? ( ${PEFILE_DEPEND} )
)
")
"

Expand All @@ -200,11 +202,6 @@ pkg_pretend() {
# die "systemd no longer supports split-usr"
# fi
if [[ ${MERGE_TYPE} != buildonly ]]; then
if use test && has pid-sandbox ${FEATURES}; then
ewarn "Tests are known to fail with PID sandboxing enabled."
ewarn "See https://bugs.gentoo.org/674458."
fi

local CONFIG_CHECK="~BLK_DEV_BSG ~CGROUPS
~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
Expand Down Expand Up @@ -258,7 +255,7 @@ src_unpack() {

src_prepare() {
local PATCHES=(
"${FILESDIR}"/255-install-format-overflow.patch
"${FILESDIR}/systemd-test-process-util.patch"
ader1990 marked this conversation as resolved.
Show resolved Hide resolved
# Flatcar: Adding our own patches here.
"${FILESDIR}/0001-wait-online-set-any-by-default.patch"
"${FILESDIR}/0002-networkd-default-to-kernel-IPForwarding-setting.patch"
Expand Down Expand Up @@ -454,9 +451,15 @@ multilib_src_configure() {
}

multilib_src_test() {
unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
local -x COLUMNS=80
meson_src_test
(
unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
export COLUMNS=80
addpredict /dev
addpredict /proc
addpredict /run
addpredict /sys/fs/cgroup
meson_src_test --timeout-multiplier=10
) || die
}

multilib_src_install_all() {
Expand Down Expand Up @@ -726,6 +729,11 @@ pkg_postinst() {
ebegin "Reexecuting system manager (systemd)"
systemctl daemon-reexec
eend $? || FAIL=1

# https://lists.freedesktop.org/archives/systemd-devel/2024-June/050466.html
ebegin "Signaling user managers to reexec"
systemctl kill --kill-whom='main' --signal='SIGRTMIN+25' 'user@*.service'
eend $?
fi

if [[ ${FAIL} ]]; then
Expand Down