diff --git a/systemd-254.5-systemd-networkd-wait-online-condition-networks-managed.patch b/systemd-254.5-systemd-networkd-wait-online-condition-networks-managed.patch new file mode 100644 index 0000000..6ef350d --- /dev/null +++ b/systemd-254.5-systemd-networkd-wait-online-condition-networks-managed.patch @@ -0,0 +1,10 @@ +--- systemd-stable-254.5/units/systemd-networkd-wait-online.service.in.orig 2023-10-15 17:10:33.095380428 +0200 ++++ systemd-stable-254.5/units/systemd-networkd-wait-online.service.in 2023-10-15 17:10:05.247375884 +0200 +@@ -11,6 +11,7 @@ + Description=Wait for Network to be Configured + Documentation=man:systemd-networkd-wait-online.service(8) + ConditionCapability=CAP_NET_ADMIN ++ConditionPathExistsGlob=/etc/systemd/network/*.network + DefaultDependencies=no + Conflicts=shutdown.target + BindsTo=systemd-networkd.service diff --git a/systemd.spec b/systemd.spec index 77ff8b9..aea0655 100644 --- a/systemd.spec +++ b/systemd.spec @@ -27,7 +27,7 @@ Name: systemd Epoch: 2 Version: 254.5 -Release: 1mamba +Release: 3mamba Summary: A system and service manager compatible with SysV and LSB init scripts Group: System/Configuration Vendor: openmamba @@ -71,6 +71,7 @@ Patch20: systemd-240-upstream_fix_return_values.patch Patch21: systemd-247-upstream-fixes-1.patch Patch22: systemd-251-fix-format-string-type-mismatch.patch Patch23: systemd-251.2-add-stdbool-include-1.patch +Patch24: systemd-254.5-systemd-networkd-wait-online-condition-networks-managed.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -106,6 +107,7 @@ BuildRequires: kmod >= 28-3mamba BuildRequires: iptables-devel >= 1.8.3 BuildRequires: meson BuildRequires: ninja +BuildRequires: python3dist(pyelftools) BuildRequires: python3dist(jinja2) BuildRequires: vala-tools Conflicts: sysvinit @@ -219,11 +221,12 @@ This package include development files for building software using udev librarie %setup -q -n systemd-stable-%{version} #-D -T #:<< _EOF -#%patch21 -p1 -#%patch22 -p1 -b .fix-format-string-type-mismatch +#%patch 21 -p1 +#%patch 22 -p1 -b .fix-format-string-type-mismatch #%ifarch %{ix86} -#%patch23 -p1 +#%patch 23 -p1 #%endif +%patch24 -p 1 #sed -i "s|@bindir@|/bin|g" src/core/macros.systemd.in @@ -245,6 +248,8 @@ export LC_ALL="en_US.UTF-8" --localstatedir=%{_localstatedir} \ --mandir=%{_mandir} \ --infodir=%{_datadir}/info \ + -Dapparmor=true \ + -Dbootloader=true \ -Dc_std=gnu11 \ -Drootlibdir=%{_libdir} \ -Dpamlibdir=%{_libdir}/security \ @@ -262,7 +267,6 @@ export LC_ALL="en_US.UTF-8" -Dsupport-url="https://openmamba.org" \ -Dntp-servers="0.europe.pool.ntp.org 1.europe.pool.ntp.org 2.europe.pool.ntp.org 3.europe.pool.ntp.org" \ -Ddefault-hierarchy=unified \ - -Dapparmor=true \ -Dfallback-hostname="openmamba" \ -Dsbat-distro="openmamba" \ -Dsbat-distro-summary="openmamba Linux" \ @@ -649,6 +653,7 @@ systemctl daemon-reload &>/dev/null || : %{_sysconfdir}/xdg/systemd/user %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh %{_initrddir}/README +%{_bindir}/bootctl %{_bindir}/halt %{_bindir}/init %{_bindir}/mount.ddi @@ -733,11 +738,12 @@ systemctl daemon-reload &>/dev/null || : %dir %{_localstatedir}/log/journal %dir %{_localstatedir}/log/journal/remote %dir %{_localstatedir}/lib/systemd -#%{_mandir}/man1/bootctl.1* +%{_mandir}/man1/bootctl.1* %{_mandir}/man1/busctl.1* %{_mandir}/man1/coredumpctl.1* %{_mandir}/man1/homectl.1* %{_mandir}/man1/hostnamectl.1* +%{_mandir}/man1/init.1* %{_mandir}/man1/journalctl.1* %{_mandir}/man1/localectl.1* %{_mandir}/man1/loginctl.1* @@ -752,10 +758,10 @@ systemctl daemon-reload &>/dev/null || : %{_mandir}/man1/systemd-* %{_mandir}/man1/systemd.1* %{_mandir}/man1/timedatectl.1* +%{_mandir}/man1/ukify.1* %{_mandir}/man1/userdbctl.1* %{_mandir}/man5/*.5* %{_mandir}/man7/*.7* -%{_mandir}/man1/init.1* %{_mandir}/man8/30-systemd-environment-d-generator.8* %{_mandir}/man8/halt.8* %{_mandir}/man8/kernel-install.8* @@ -846,6 +852,12 @@ systemctl daemon-reload &>/dev/null || : %{_libdir}/pkgconfig/libudev.pc %changelog +* Sun Oct 15 2023 Silvan Calarco 254.5-3mamba +- patch systemd-networkd-wait-online.service so that it doesn't wait if no networks are configured + +* Sat Oct 14 2023 Silvan Calarco 254.5-2mamba +- rebuilt with bootloader=true + * Thu Sep 28 2023 Automatic Build System 254.5-1mamba - automatic version update by autodist