split-files: break out more files into networkd subpackage
There were some things left in the main package that should have been in the sub package (including networkd.conf). This is an attempt to make the list of files in the networkd package more correct. It explicitly tries to leave sytemd-network-generator and the network targets in the main package.
This commit is contained in:
parent
7d7120d566
commit
283a994776
@ -54,12 +54,10 @@ for file in files(buildroot):
|
|||||||
o = o_pam
|
o = o_pam
|
||||||
elif '/rpm/' in n:
|
elif '/rpm/' in n:
|
||||||
o = o_rpm_macros
|
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|(?<!/libsystemd-shared-...).so$', n):
|
|
||||||
o = o_devel
|
|
||||||
elif '/usr/lib/systemd/tests' in n:
|
elif '/usr/lib/systemd/tests' in n:
|
||||||
o = o_tests
|
o = o_tests
|
||||||
|
elif re.search(r'/lib.*\.pc|/man3/|/usr/include|(?<!/libsystemd-shared-...).so$', n):
|
||||||
|
o = o_devel
|
||||||
elif re.search(r'''journal-(remote|gateway|upload)|
|
elif re.search(r'''journal-(remote|gateway|upload)|
|
||||||
systemd-remote\.conf|
|
systemd-remote\.conf|
|
||||||
/usr/share/systemd/gatewayd|
|
/usr/share/systemd/gatewayd|
|
||||||
@ -74,10 +72,17 @@ for file in files(buildroot):
|
|||||||
/machine.slice|
|
/machine.slice|
|
||||||
/machines.target|
|
/machines.target|
|
||||||
var-lib-machines.mount|
|
var-lib-machines.mount|
|
||||||
network/80-container-v[ez]|
|
network/80-container|
|
||||||
|
network/80-vm|
|
||||||
org.freedesktop.(import|machine)1
|
org.freedesktop.(import|machine)1
|
||||||
''', n, re.X):
|
''', n, re.X):
|
||||||
o = o_container
|
o = o_container
|
||||||
|
elif re.search(r'''/usr/lib/systemd/network/..-wifi|
|
||||||
|
networkd|
|
||||||
|
networkctl|
|
||||||
|
org.freedesktop.network1
|
||||||
|
''', n, re.X):
|
||||||
|
o = o_networkd
|
||||||
elif '.so.' in n:
|
elif '.so.' in n:
|
||||||
o = o_libs
|
o = o_libs
|
||||||
elif re.search(r'''udev(?!\.pc)|
|
elif re.search(r'''udev(?!\.pc)|
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
Name: systemd
|
Name: systemd
|
||||||
Url: https://www.freedesktop.org/wiki/Software/systemd
|
Url: https://www.freedesktop.org/wiki/Software/systemd
|
||||||
Version: 246.6
|
Version: 246.6
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
# For a breakdown of the licensing, see README
|
# For a breakdown of the licensing, see README
|
||||||
License: LGPLv2+ and MIT and GPLv2+
|
License: LGPLv2+ and MIT and GPLv2+
|
||||||
Summary: System and Service Manager
|
Summary: System and Service Manager
|
||||||
@ -868,6 +868,10 @@ fi
|
|||||||
%files standalone-sysusers -f .file-list-standalone-sysusers
|
%files standalone-sysusers -f .file-list-standalone-sysusers
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Sep 30 2020 Dusty Mabe <dusty@dustymabe.com> - 246.6-3
|
||||||
|
- Try to make files in subpackages (especially the networkd subpackage)
|
||||||
|
more appropriate.
|
||||||
|
|
||||||
* Thu Sep 24 2020 Filipe Brandenburger <filbranden@gmail.com> - 246.6-2
|
* Thu Sep 24 2020 Filipe Brandenburger <filbranden@gmail.com> - 246.6-2
|
||||||
- Build a package with standalone binaries for non-systemd systems.
|
- Build a package with standalone binaries for non-systemd systems.
|
||||||
For now, only systemd-sysusers is included.
|
For now, only systemd-sysusers is included.
|
||||||
|
Loading…
Reference in New Issue
Block a user