rpms/systemd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Really move libcryptsetup plugins to -udev

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-03-17 21:37:30 +01:00
parent 4a979feb16
commit 0078f9a102
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
split-files.py
View File

@ -28,7 +28,7 @@ o_resolve = open('.file-list-resolve', 'w')
o_tests = open('.file-list-tests', 'w') o_tests = open('.file-list-tests', 'w')
o_standalone_tmpfiles = open('.file-list-standalone-tmpfiles', 'w') o_standalone_tmpfiles = open('.file-list-standalone-tmpfiles', 'w')
o_standalone_sysusers = open('.file-list-standalone-sysusers', 'w') o_standalone_sysusers = open('.file-list-standalone-sysusers', 'w')
o_rest = open('.file-list-rest', 'w') o_main = open('.file-list-main', 'w')
for file in files(buildroot): for file in files(buildroot):
n = file.path[1:] n = file.path[1:]
if re.match(r'''/usr/(share|include)$| if re.match(r'''/usr/(share|include)$|
@ -58,7 +58,11 @@ for file in files(buildroot):
o = o_rpm_macros o = o_rpm_macros
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): elif re.match(r'/libsystemd-shared-*.so$', n):
o = o_main
elif re.match(r'/libcryptsetup-token-systemd-.*\.so$', n):
o = o_udev
elif re.search(r'/lib.*\.pc|/man3/|/usr/include|\.so$', n):
o = o_devel 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|
@ -66,6 +70,7 @@ for file in files(buildroot):
/var/log/journal/remote /var/log/journal/remote
''', n, re.X): ''', n, re.X):
o = o_remote o = o_remote
elif re.search(r'''mymachines| elif re.search(r'''mymachines|
machinectl| machinectl|
systemd-nspawn| systemd-nspawn|
@ -77,12 +82,14 @@ for file in files(buildroot):
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/80-| elif re.search(r'''/usr/lib/systemd/network/80-|
networkd| networkd|
networkctl| networkctl|
org.freedesktop.network1 org.freedesktop.network1
''', n, re.X): ''', n, re.X):
o = o_networkd o = o_networkd
elif '.so.' in n: elif '.so.' in n:
o = o_libs o = o_libs
@ -103,7 +110,6 @@ for file in files(buildroot):
crypttab| crypttab|
cryptenroll| cryptenroll|
cryptsetup| cryptsetup|
libcryptsetup-token-systemd|
kmod| kmod|
quota| quota|
pstore| pstore|
@ -153,7 +159,7 @@ for file in files(buildroot):
assert False, 'Found .standalone not belonging to known packages' assert False, 'Found .standalone not belonging to known packages'
else: else:
o = o_rest o = o_main
if n in known_files: if n in known_files:
prefix = ' '.join(known_files[n].split()[:-1]) prefix = ' '.join(known_files[n].split()[:-1])

5
systemd.spec
View File

@ -951,7 +951,7 @@ fi
%global _docdir_fmt %{name} %global _docdir_fmt %{name}
%files -f %{name}.lang -f .file-list-rest %files -f %{name}.lang -f .file-list-main
%doc %{_pkgdocdir} %doc %{_pkgdocdir}
%exclude %{_pkgdocdir}/LICENSE* %exclude %{_pkgdocdir}/LICENSE*
# Only the licenses texts for the licenses in License line are included. # Only the licenses texts for the licenses in License line are included.
@ -1004,6 +1004,9 @@ fi
%files standalone-sysusers -f .file-list-standalone-sysusers %files standalone-sysusers -f .file-list-standalone-sysusers
%changelog %changelog
* Thu Mar 17 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 250.3-7
- Move libcryptsetup plugins to -udev (#2031873)
* Mon Mar 14 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 250.3-7 * Mon Mar 14 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 250.3-7
- Disable default DNS over TLS (#1889901) - Disable default DNS over TLS (#1889901)