From f455b2249ac56d83b05ae75ebfc8bc792e529399 Mon Sep 17 00:00:00 2001 From: Christian Glombek Date: Thu, 24 Sep 2020 17:21:29 +0200 Subject: [PATCH] Split out networkd sub-package And add it to main package as recommended dependency. --- split-files.py | 3 +++ systemd.spec | 33 +++++++++++++++++++++++++++++---- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/split-files.py b/split-files.py index f3e3aa6..3b62a7f 100644 --- a/split-files.py +++ b/split-files.py @@ -23,6 +23,7 @@ o_devel = open('.file-list-devel', 'w') o_container = open('.file-list-container', 'w') o_remote = open('.file-list-remote', 'w') o_tests = open('.file-list-tests', 'w') +o_networkd = open('.file-list-networkd', 'w') o_rest = open('.file-list-rest', 'w') for file in files(buildroot): n = file.path[1:] @@ -51,6 +52,8 @@ for file in files(buildroot): o = o_pam elif '/rpm/' in n: o = o_rpm_macros + elif re.search(r'networkd(?!.*\.conf)', n, re.X): + o = o_networkd elif re.search(r'/lib.*\.pc|/man3/|/usr/include|(?= 1.9.18 Requires: %{name}-pam = %{version}-%{release} Requires: %{name}-rpm-macros = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} +Recommends: %{name}-networkd = %{version}-%{release} Recommends: diffutils Requires: util-linux Recommends: libxkbcommon%{?_isa} @@ -166,7 +167,7 @@ Provides: system-setup-keyboard = 0.9 # systemd-sysv-convert was removed in f20: https://fedorahosted.org/fpc/ticket/308 Obsoletes: systemd-sysv < 206 # self-obsoletes so that dnf will install new subpackages on upgrade (#1260394) -Obsoletes: %{name} < 229-5 +Obsoletes: %{name} < 246.6-2 Provides: systemd-sysv = 206 Conflicts: initscripts < 9.56.1 %if 0%{?fedora} @@ -311,6 +312,19 @@ and to write journal files from serialized journal contents. This package contains systemd-journal-gatewayd, systemd-journal-remote, and systemd-journal-upload. +%package networkd +Summary: A system service that manages network configurations +Requires: %{name}%{?_isa} = %{version}-%{release} +License: LGPLv2+ +# https://src.fedoraproject.org/rpms/systemd/pull-request/34 +Obsoletes: systemd < 246.6-2 + +%description networkd +%{summary}. + +It detects and configures network devices as they appear, +as well as creating virtual network devices. + %package tests Summary: Internal unit tests for systemd Requires: %{name}%{?_isa} = %{version}-%{release} @@ -631,8 +645,6 @@ if [ $1 -eq 0 ] ; then serial-getty@.service \ console-getty.service \ debug-shell.service \ - systemd-networkd.service \ - systemd-networkd-wait-online.service \ systemd-resolved.service \ systemd-homed.service \ >/dev/null || : @@ -767,6 +779,14 @@ fi %systemd_postun_with_restart systemd-journal-upload.service %firewalld_reload +%preun networkd +if [ $1 -eq 0 ] ; then + systemctl disable --quiet \ + systemd-networkd.service \ + systemd-networkd-wait-online.service \ + >/dev/null || : +fi + %global _docdir_fmt %{name} %files -f %{name}.lang -f .file-list-rest @@ -805,9 +825,14 @@ fi %files journal-remote -f .file-list-remote +%files networkd -f .file-list-networkd + %files tests -f .file-list-tests %changelog +* Thu Sep 24 2020 Christian Glombek - 246.6-2 +- Split out networkd sub-package and add to main package as recommended dependency + * Sun Sep 20 2020 Zbigniew Jędrzejewski-Szmek - 246.6-1 - Update to latest stable release (various minor fixes: manager, networking, bootct, kernel-install, systemd-dissect, systemd-homed,