Skip to content

Commit a5f4304

Browse files
authored
Merge pull request #7 from sorenisanerd/main
Enable systemd-sysupdated
2 parents fd8749b + 31353a1 commit a5f4304

File tree

2 files changed

+106
-0
lines changed

2 files changed

+106
-0
lines changed

mkosi.profiles/build-systemd/systemd.build.chroot

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
#!/bin/bash
2+
3+
set -e
4+
25
cd ${BUILDDIR}
36
dpkg-source -x ${SRCDIR}/pkg/systemd/systemd_258.1-1.dsc
47
cd systemd-258.1
8+
patch -p1 < ${SRCDIR}/mkosi.profiles/build-systemd/sysupdated.patch
59
dpkg-buildpackage -us -uc -b
610
cd ..
711
tarball=mangos-packages_${IMAGE_VERSION}.tar
Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
diff -ur systemd-258.1.orig/debian/changelog systemd-258.1/debian/changelog
2+
--- systemd-258.1.orig/debian/changelog 2025-10-23 11:20:37.535291463 -0700
3+
+++ systemd-258.1/debian/changelog 2025-10-23 11:24:31.060180155 -0700
4+
@@ -1,3 +1,9 @@
5+
+systemd (258.1-1mangos1) unstable; urgency=medium
6+
+
7+
+ * Enable sysupdated.
8+
+
9+
+ -- Soren Hansen <[email protected]> Thu, 23 Oct 2025 11:23:25 -0700
10+
+
11+
systemd (258.1-1) unstable; urgency=medium
12+
13+
* Override Lintian warning for groff-message. These manpages are
14+
diff -ur systemd-258.1.orig/debian/rules systemd-258.1/debian/rules
15+
--- systemd-258.1.orig/debian/rules 2025-10-23 11:20:37.536878900 -0700
16+
+++ systemd-258.1/debian/rules 2025-10-23 11:21:25.473318469 -0700
17+
@@ -149,7 +149,8 @@
18+
-Dpcre2=enabled \
19+
-Dukify=enabled \
20+
-Dbootloader=$(if $(filter amd64 i386 arm64 armhf loong64 riscv64,$(DEB_HOST_ARCH)),enabled,disabled) \
21+
- -Dsysupdate=enabled
22+
+ -Dsysupdate=enabled \
23+
+ -Dsysupdated=enabled
24+
else
25+
CONFFLAGS += \
26+
-Daudit=disabled \
27+
@@ -175,7 +176,8 @@
28+
-Dukify=disabled \
29+
-Dbootloader=disabled \
30+
-Dbpf-framework=disabled \
31+
- -Dsysupdate=disabled
32+
+ -Dsysupdate=disabled \
33+
+ -Dsysupdated=disabled
34+
endif
35+
36+
# BPF/BTF are only enabled and usable on a few architectures
37+
diff -ur systemd-258.1.orig/debian/systemd-container.install systemd-258.1/debian/systemd-container.install
38+
--- systemd-258.1.orig/debian/systemd-container.install 2025-10-23 11:20:37.537158893 -0700
39+
+++ systemd-258.1/debian/systemd-container.install 2025-10-23 11:55:01.302259102 -0700
40+
@@ -1,6 +1,6 @@
41+
#!/usr/bin/dh-exec
42+
usr/bin/importctl
43+
-<pkg.systemd.upstream> usr/bin/updatectl
44+
+usr/bin/updatectl
45+
usr/bin/systemd-vmspawn
46+
usr/lib/systemd/system/[email protected]
47+
usr/bin/machinectl
48+
@@ -34,7 +34,7 @@
49+
usr/lib/systemd/system/dbus-org.freedesktop.import1.service
50+
usr/lib/systemd/system/dbus-org.freedesktop.machine1.service
51+
usr/lib/systemd/system/dbus-org.freedesktop.portable1.service
52+
-<pkg.systemd.upstream> usr/lib/systemd/system/dbus-org.freedesktop.sysupdate1.service
53+
+usr/lib/systemd/system/dbus-org.freedesktop.sysupdate1.service
54+
usr/lib/systemd/user/machine.slice
55+
usr/lib/systemd/user/machines.target
56+
<pkg.systemd.upstream> usr/lib/systemd/user/dbus-org.freedesktop.machine1.service
57+
@@ -52,17 +52,17 @@
58+
usr/share/dbus-1/system.d/org.freedesktop.import1.conf
59+
usr/share/dbus-1/system.d/org.freedesktop.machine1.conf
60+
usr/share/dbus-1/system.d/org.freedesktop.portable1.conf
61+
-<pkg.systemd.upstream> usr/share/dbus-1/system.d/org.freedesktop.sysupdate1.conf
62+
+usr/share/dbus-1/system.d/org.freedesktop.sysupdate1.conf
63+
usr/share/dbus-1/system-services/org.freedesktop.import1.service
64+
usr/share/dbus-1/system-services/org.freedesktop.machine1.service
65+
usr/share/dbus-1/system-services/org.freedesktop.portable1.service
66+
-<pkg.systemd.upstream> usr/share/dbus-1/system-services/org.freedesktop.sysupdate1.service
67+
+usr/share/dbus-1/system-services/org.freedesktop.sysupdate1.service
68+
usr/share/polkit-1/actions/io.systemd.mount-file-system.policy
69+
usr/share/polkit-1/actions/io.systemd.namespace-resource.policy
70+
usr/share/polkit-1/actions/org.freedesktop.import1.policy
71+
usr/share/polkit-1/actions/org.freedesktop.machine1.policy
72+
usr/share/polkit-1/actions/org.freedesktop.portable1.policy
73+
-<pkg.systemd.upstream> usr/share/polkit-1/actions/org.freedesktop.sysupdate1.policy
74+
+usr/share/polkit-1/actions/org.freedesktop.sysupdate1.policy
75+
usr/share/zsh/vendor-completions/_systemd-nspawn
76+
usr/share/zsh/vendor-completions/_sd_machines
77+
usr/share/zsh/vendor-completions/_machinectl
78+
diff -ur systemd-258.1.orig/debian/systemd-container.manpages systemd-258.1/debian/systemd-container.manpages
79+
--- systemd-258.1.orig/debian/systemd-container.manpages 2025-10-23 11:20:37.537177719 -0700
80+
+++ systemd-258.1/debian/systemd-container.manpages 2025-10-23 11:54:36.741335543 -0700
81+
@@ -1,11 +1,11 @@
82+
#!/usr/bin/dh-exec
83+
debian/tmp/usr/share/man/man1/importctl.1
84+
-<pkg.systemd.upstream> debian/tmp/usr/share/man/man1/updatectl.1
85+
+debian/tmp/usr/share/man/man1/updatectl.1
86+
debian/tmp/usr/share/man/man1/systemd-vmspawn.1
87+
debian/tmp/usr/share/man/man1/mount.ddi.1
88+
debian/tmp/usr/share/man/man1/systemd-nspawn.1
89+
debian/tmp/usr/share/man/man5/org.freedesktop.import1.5
90+
-<pkg.systemd.upstream> debian/tmp/usr/share/man/man5/org.freedesktop.sysupdate1.5
91+
+debian/tmp/usr/share/man/man5/org.freedesktop.sysupdate1.5
92+
debian/tmp/usr/share/man/man5/systemd.nspawn.5
93+
debian/tmp/usr/share/man/man5/sysupdate.d.5
94+
debian/tmp/usr/share/man/man5/sysupdate.features.5
95+
@@ -28,5 +28,5 @@
96+
debian/tmp/usr/share/man/man8/systemd-sysupdate-reboot.timer.8
97+
debian/tmp/usr/share/man/man8/systemd-sysupdate.service.8
98+
debian/tmp/usr/share/man/man8/systemd-sysupdate.timer.8
99+
-<pkg.systemd.upstream> debian/tmp/usr/share/man/man8/systemd-sysupdated.8
100+
-<pkg.systemd.upstream> debian/tmp/usr/share/man/man8/systemd-sysupdated.service.8
101+
+debian/tmp/usr/share/man/man8/systemd-sysupdated.8
102+
+debian/tmp/usr/share/man/man8/systemd-sysupdated.service.8

0 commit comments

Comments
 (0)