rpms/systemd
7
0
Fork 0
Code Issues Pull Requests Releases Activity
ddde168891
systemd/split-files.py

234 lines
8.3 KiB
Python
Raw Normal View History

Update to snapshot, use generated lists of files Previous method was untenable, because rpm doesn't have a concept of put those files here, and the rest in there. So for every positive pattern that was added, we had to add an %exclude line somewhere else. So let's generate the lists using pattern matching. This is a bit messy too, but should not require updates when files are added or removed. (Sometimes it'll be necessary to add a new pattern if the new files should not land in the main binary package.) There's some intentional changes: - man pages are more consistently included with the files they describe - shell completion scripts similarly - various kernel-install and modules-load related files are moved to -udev subpackage
2017-12-11 23:41:07 +00:00
import re, sys, os, collections
buildroot = sys.argv[1]
split-files: also handle conditional packages This is a bit annoying, but meh. [skip changelog]
2023-11-23 14:10:10 +00:00
no_bootloader = '--no-bootloader' in sys.argv
split-files: move static filelist config into split-files.py The idea was that it's nicer to keep that config in .spec where it's subject to syntax highlighting. split-files.py was supposed to a stand-alone program. But in practice this split is confusing, because file rules are listed in two places and we need to modify split-files.py quite often. This will be easier if everything is in one file. [skip changelog]
2023-11-23 13:45:33 +00:00
known_files = '''
%ghost %config(noreplace) /etc/crypttab
%ghost %attr(0444,root,root) /etc/udev/hwdb.bin
/etc/inittab
/usr/lib/systemd/purge-nobody-user
Add comment [skip changelog]
2023-12-09 13:36:49 +00:00
# This directory is owned by openssh-server, but we don't want to introduce
# a dependency. So let's copy the config and co-own the directory.
Add /etc/ssh/sshd_config.d to the file list This is a bit of a mess: sshd can only load configuration from /etc/ssh/sshd_config.d, and that directory is declared as non-world-readable. This is in violation of the packaging guidelines which say that packaged files must be world-readable, and also makes very little sense, since those files are part of the package payload. If we create the directory with different permissions, and list it in %files, installation will fail. If we don't list it in %files, and the user doesn't have openssh-server installed, they will have an unowned directory. Another option would be to depend on owner of this directory, i.e. openssh-server, but we don't want to have that dependency. So let's copy the %files line from openssh-server and figure out what to do if it changes in openssh-server again.
2023-12-08 17:17:39 +00:00
%dir %attr(0700,root,root) /etc/ssh/sshd_config.d
split-files: move static filelist config into split-files.py The idea was that it's nicer to keep that config in .spec where it's subject to syntax highlighting. split-files.py was supposed to a stand-alone program. But in practice this split is confusing, because file rules are listed in two places and we need to modify split-files.py quite often. This will be easier if everything is in one file. [skip changelog]
2023-11-23 13:45:33 +00:00
%ghost %config(noreplace) /etc/vconsole.conf
%ghost %config(noreplace) /etc/X11/xorg.conf.d/00-keyboard.conf
%ghost %attr(0664,root,root) %verify(not group) /run/utmp
%ghost %attr(0664,root,root) %verify(not group) /var/log/wtmp
%ghost %attr(0660,root,root) %verify(not group) /var/log/btmp
%ghost %attr(0664,root,root) %verify(not md5 size mtime group) /var/log/lastlog
%ghost %config(noreplace) /etc/hostname
%ghost %config(noreplace) /etc/localtime
%ghost %config(noreplace) /etc/locale.conf
%ghost %attr(0444,root,root) %config(noreplace) /etc/machine-id
%ghost %config(noreplace) /etc/machine-info
%ghost %attr(0700,root,root) %dir /var/cache/private
%ghost %attr(0700,root,root) %dir /var/lib/private
%ghost %dir /var/lib/private/systemd
%ghost %dir /var/lib/private/systemd/journal-upload
%ghost /var/lib/private/systemd/journal-upload/state
%ghost %dir /var/lib/systemd/timesync
%ghost /var/lib/systemd/timesync/clock
%ghost %dir /var/lib/systemd/backlight
%ghost /var/lib/systemd/catalog/database
%ghost %dir /var/lib/systemd/coredump
%ghost /var/lib/systemd/journal-upload
%ghost %dir /var/lib/systemd/linger
%ghost %attr(0600,root,root) /var/lib/systemd/random-seed
%ghost %dir /var/lib/systemd/rfkill
%ghost %dir %verify(not mode group) /var/log/journal
%ghost %dir /var/log/journal/remote
%ghost %attr(0700,root,root) %dir /var/log/private
Fix previous commit [skip changelog]
2023-12-11 21:51:48 +00:00
'''
split-files: move static filelist config into split-files.py The idea was that it's nicer to keep that config in .spec where it's subject to syntax highlighting. split-files.py was supposed to a stand-alone program. But in practice this split is confusing, because file rules are listed in two places and we need to modify split-files.py quite often. This will be easier if everything is in one file. [skip changelog]
2023-11-23 13:45:33 +00:00
Add comment [skip changelog]
2023-12-09 13:36:49 +00:00
known_files = {line.split()[-1]:line for line in known_files.splitlines()
if line and not line.startswith('#')}
Update to snapshot, use generated lists of files Previous method was untenable, because rpm doesn't have a concept of put those files here, and the rest in there. So for every positive pattern that was added, we had to add an %exclude line somewhere else. So let's generate the lists using pattern matching. This is a bit messy too, but should not require updates when files are added or removed. (Sometimes it'll be necessary to add a new pattern if the new files should not land in the main binary package.) There's some intentional changes: - man pages are more consistently included with the files they describe - shell completion scripts similarly - various kernel-install and modules-load related files are moved to -udev subpackage
2017-12-11 23:41:07 +00:00
def files(root):
os.chdir(root)
todo = collections.deque(['.'])
while todo:
n = todo.pop()
files = os.scandir(n)
for file in files:
yield file
if file.is_dir() and not file.is_symlink():
todo.append(file)
split-files: use a dictionary instead of many little variables Just refactoring, to make it easier to act on the list of outputs. [skip changelog]
2023-11-23 13:53:53 +00:00
outputs = {suffix: open(f'.file-list-{suffix}', 'w')
for suffix in (
'libs',
'udev',
'ukify',
'boot',
'pam',
'rpm-macros',
'devel',
'container',
systemd rebase/bootstrap for c10s Resolves: RHEL-40924,RHEL-22621,RHEL-678,RHEL-40360,RHEL-36636
2024-06-26 15:26:24 +00:00
'oomd',
split-files: use a dictionary instead of many little variables Just refactoring, to make it easier to act on the list of outputs. [skip changelog]
2023-11-23 13:53:53 +00:00
'remote',
'resolve',
'main',
)}
Update to snapshot, use generated lists of files Previous method was untenable, because rpm doesn't have a concept of put those files here, and the rest in there. So for every positive pattern that was added, we had to add an %exclude line somewhere else. So let's generate the lists using pattern matching. This is a bit messy too, but should not require updates when files are added or removed. (Sometimes it'll be necessary to add a new pattern if the new files should not land in the main binary package.) There's some intentional changes: - man pages are more consistently included with the files they describe - shell completion scripts similarly - various kernel-install and modules-load related files are moved to -udev subpackage
2017-12-11 23:41:07 +00:00
for file in files(buildroot):
n = file.path[1:]
if re.match(r'''/usr/(share|include)$|
/usr/share/man(/man.|)$|
/usr/share/zsh(/site-functions|)$|
/usr/share/dbus-1$|
/usr/share/dbus-1/system.d$|
/usr/share/dbus-1/(system-|)services$|
/usr/share/polkit-1(/actions|/rules.d|)$|
/usr/share/pkgconfig$|
/usr/share/bash-completion(/completions|)$|
/usr(/lib|/lib64|/bin|/sbin|)$|
/usr/lib.*/(security|pkgconfig)$|
/usr/lib/rpm(/macros.d|)$|
/usr/lib/firewalld(/services|)$|
/usr/share/(locale|licenses|doc)| # no $
update split-files.py and list of ghost files
2017-12-12 06:49:18 +00:00
/etc(/pam\.d|/xdg|/X11|/X11/xinit|/X11.*\.d|)$|
Move /etc/yum/protected.d/systemd.conf to /etc/dnf/
2018-09-10 09:18:18 +00:00
/etc/(dnf|dnf/protected.d)$|
Update to snapshot, use generated lists of files Previous method was untenable, because rpm doesn't have a concept of put those files here, and the rest in there. So for every positive pattern that was added, we had to add an %exclude line somewhere else. So let's generate the lists using pattern matching. This is a bit messy too, but should not require updates when files are added or removed. (Sometimes it'll be necessary to add a new pattern if the new files should not land in the main binary package.) There's some intentional changes: - man pages are more consistently included with the files they describe - shell completion scripts similarly - various kernel-install and modules-load related files are moved to -udev subpackage
2017-12-11 23:41:07 +00:00
/usr/(src|lib/debug)| # no $
Fix some rpmlint issues and add filter for others
2020-04-01 17:42:04 +00:00
/run$|
update split-files.py and list of ghost files
2017-12-12 06:49:18 +00:00
/var(/cache|/log|/lib|/run|)$
Update to snapshot, use generated lists of files Previous method was untenable, because rpm doesn't have a concept of put those files here, and the rest in there. So for every positive pattern that was added, we had to add an %exclude line somewhere else. So let's generate the lists using pattern matching. This is a bit messy too, but should not require updates when files are added or removed. (Sometimes it'll be necessary to add a new pattern if the new files should not land in the main binary package.) There's some intentional changes: - man pages are more consistently included with the files they describe - shell completion scripts similarly - various kernel-install and modules-load related files are moved to -udev subpackage
2017-12-11 23:41:07 +00:00
''', n, re.X):
continue
Version 253~rc1 - See https://raw.githubusercontent.com/systemd/systemd/v253-rc1/NEWS - New subpackages: systemd-repart-standalone, systemd-shutdown-standalone, and systemd-ukify.
2023-01-24 23:16:28 +00:00
systemd rebase/bootstrap for c10s Resolves: RHEL-40924,RHEL-22621,RHEL-678,RHEL-40360,RHEL-36636
2024-06-26 15:26:24 +00:00
if '/security/pam_' in n or '/man8/pam_' in n:
split-files: use a dictionary instead of many little variables Just refactoring, to make it easier to act on the list of outputs. [skip changelog]
2023-11-23 13:53:53 +00:00
o = outputs['pam']
Add the sysusers compat parts
2020-02-07 15:34:30 +00:00
elif '/rpm/' in n:
split-files: use a dictionary instead of many little variables Just refactoring, to make it easier to act on the list of outputs. [skip changelog]
2023-11-23 13:53:53 +00:00
o = outputs['rpm-macros']
Version 253~rc1 - See https://raw.githubusercontent.com/systemd/systemd/v253-rc1/NEWS - New subpackages: systemd-repart-standalone, systemd-shutdown-standalone, and systemd-ukify.
2023-01-24 23:16:28 +00:00
elif 'ukify' in n:
split-files: use a dictionary instead of many little variables Just refactoring, to make it easier to act on the list of outputs. [skip changelog]
2023-11-23 13:53:53 +00:00
o = outputs['ukify']
Version 251-rc1
2022-03-29 20:07:50 +00:00
elif re.search(r'/libsystemd-(shared|core)-.*\.so$', n):
split-files: use a dictionary instead of many little variables Just refactoring, to make it easier to act on the list of outputs. [skip changelog]
2023-11-23 13:53:53 +00:00
o = outputs['main']
Fix the wrong file assignment done in previous version
2022-03-18 12:35:22 +00:00
elif re.search(r'/libcryptsetup-token-systemd-.*\.so$', n):
split-files: use a dictionary instead of many little variables Just refactoring, to make it easier to act on the list of outputs. [skip changelog]
2023-11-23 13:53:53 +00:00
o = outputs['udev']
Really move libcryptsetup plugins to -udev
2022-03-17 20:37:30 +00:00
elif re.search(r'/lib.*\.pc|/man3/|/usr/include|\.so$', n):
split-files: use a dictionary instead of many little variables Just refactoring, to make it easier to act on the list of outputs. [skip changelog]
2023-11-23 13:53:53 +00:00
o = outputs['devel']
Update to snapshot, use generated lists of files Previous method was untenable, because rpm doesn't have a concept of put those files here, and the rest in there. So for every positive pattern that was added, we had to add an %exclude line somewhere else. So let's generate the lists using pattern matching. This is a bit messy too, but should not require updates when files are added or removed. (Sometimes it'll be necessary to add a new pattern if the new files should not land in the main binary package.) There's some intentional changes: - man pages are more consistently included with the files they describe - shell completion scripts similarly - various kernel-install and modules-load related files are moved to -udev subpackage
2017-12-11 23:41:07 +00:00
elif re.search(r'''journal-(remote|gateway|upload)|
systemd-remote\.conf|
update split-files.py and list of ghost files
2017-12-12 06:49:18 +00:00
/usr/share/systemd/gatewayd|
/var/log/journal/remote
Update to snapshot, use generated lists of files Previous method was untenable, because rpm doesn't have a concept of put those files here, and the rest in there. So for every positive pattern that was added, we had to add an %exclude line somewhere else. So let's generate the lists using pattern matching. This is a bit messy too, but should not require updates when files are added or removed. (Sometimes it'll be necessary to add a new pattern if the new files should not land in the main binary package.) There's some intentional changes: - man pages are more consistently included with the files they describe - shell completion scripts similarly - various kernel-install and modules-load related files are moved to -udev subpackage
2017-12-11 23:41:07 +00:00
''', n, re.X):
split-files: use a dictionary instead of many little variables Just refactoring, to make it easier to act on the list of outputs. [skip changelog]
2023-11-23 13:53:53 +00:00
o = outputs['remote']
Really move libcryptsetup plugins to -udev
2022-03-17 20:37:30 +00:00
Update to snapshot, use generated lists of files Previous method was untenable, because rpm doesn't have a concept of put those files here, and the rest in there. So for every positive pattern that was added, we had to add an %exclude line somewhere else. So let's generate the lists using pattern matching. This is a bit messy too, but should not require updates when files are added or removed. (Sometimes it'll be necessary to add a new pattern if the new files should not land in the main binary package.) There's some intentional changes: - man pages are more consistently included with the files they describe - shell completion scripts similarly - various kernel-install and modules-load related files are moved to -udev subpackage
2017-12-11 23:41:07 +00:00
elif re.search(r'''mymachines|
machinectl|
systemd-nspawn|
Also build systemd-vmspawn
2023-11-07 17:41:08 +00:00
systemd-vmspawn|
Update to snapshot, use generated lists of files Previous method was untenable, because rpm doesn't have a concept of put those files here, and the rest in there. So for every positive pattern that was added, we had to add an %exclude line somewhere else. So let's generate the lists using pattern matching. This is a bit messy too, but should not require updates when files are added or removed. (Sometimes it'll be necessary to add a new pattern if the new files should not land in the main binary package.) There's some intentional changes: - man pages are more consistently included with the files they describe - shell completion scripts similarly - various kernel-install and modules-load related files are moved to -udev subpackage
2017-12-11 23:41:07 +00:00
import-pubring.gpg|
systemd-(machined|import|pull)|
/machine.slice|
/machines.target|
var-lib-machines.mount|
org.freedesktop.(import|machine)1
''', n, re.X):
split-files: use a dictionary instead of many little variables Just refactoring, to make it easier to act on the list of outputs. [skip changelog]
2023-11-23 13:53:53 +00:00
o = outputs['container']
Really move libcryptsetup plugins to -udev
2022-03-17 20:37:30 +00:00
Update to snapshot, use generated lists of files Previous method was untenable, because rpm doesn't have a concept of put those files here, and the rest in there. So for every positive pattern that was added, we had to add an %exclude line somewhere else. So let's generate the lists using pattern matching. This is a bit messy too, but should not require updates when files are added or removed. (Sometimes it'll be necessary to add a new pattern if the new files should not land in the main binary package.) There's some intentional changes: - man pages are more consistently included with the files they describe - shell completion scripts similarly - various kernel-install and modules-load related files are moved to -udev subpackage
2017-12-11 23:41:07 +00:00
elif '.so.' in n:
split-files: use a dictionary instead of many little variables Just refactoring, to make it easier to act on the list of outputs. [skip changelog]
2023-11-23 13:53:53 +00:00
o = outputs['libs']
Add Recommends for dlopened libs and move files into subpackages
2021-12-09 22:10:44 +00:00
systemd rebase/bootstrap for c10s Resolves: RHEL-40924,RHEL-22621,RHEL-678,RHEL-40360,RHEL-36636
2024-06-26 15:26:24 +00:00
elif re.search(r'''10-oomd-.*defaults\.conf|
oomd\.conf|
oomctl|
org.freedesktop.oom1|
systemd-oomd|
systemd-oom\.conf
''', n, re.X):
o = outputs['oomd']
Move oomd to systemd-udev It is really only useful on "full" machines, either VMs or bare metal, so it should be in systemd-udev.
2023-11-07 16:45:57 +00:00
Update to snapshot, use generated lists of files Previous method was untenable, because rpm doesn't have a concept of put those files here, and the rest in there. So for every positive pattern that was added, we had to add an %exclude line somewhere else. So let's generate the lists using pattern matching. This is a bit messy too, but should not require updates when files are added or removed. (Sometimes it'll be necessary to add a new pattern if the new files should not land in the main binary package.) There's some intentional changes: - man pages are more consistently included with the files they describe - shell completion scripts similarly - various kernel-install and modules-load related files are moved to -udev subpackage
2017-12-11 23:41:07 +00:00
elif re.search(r'''udev(?!\.pc)|
hwdb|
bootctl|
Move systemd-boot-update.service to -udev subpackage It will not be enabled on upgrades, but I think this is OK. sd-boot is not very widely used anyway.
2021-12-12 12:01:40 +00:00
boot-update|
Move boot-related files to -udev subpackage
2020-02-28 12:41:05 +00:00
bless-boot|
boot-system-token|
Move systemd-bsod is to udev subpackage
2023-12-08 08:43:00 +00:00
bsod|
Update to snapshot, use generated lists of files Previous method was untenable, because rpm doesn't have a concept of put those files here, and the rest in there. So for every positive pattern that was added, we had to add an %exclude line somewhere else. So let's generate the lists using pattern matching. This is a bit messy too, but should not require updates when files are added or removed. (Sometimes it'll be necessary to add a new pattern if the new files should not land in the main binary package.) There's some intentional changes: - man pages are more consistently included with the files they describe - shell completion scripts similarly - various kernel-install and modules-load related files are moved to -udev subpackage
2017-12-11 23:41:07 +00:00
kernel-install|
Provide /usr/sbin/installkernel ... (rhbz#2239008).
2023-09-15 08:57:19 +00:00
installkernel|
Update to snapshot, use generated lists of files Previous method was untenable, because rpm doesn't have a concept of put those files here, and the rest in there. So for every positive pattern that was added, we had to add an %exclude line somewhere else. So let's generate the lists using pattern matching. This is a bit messy too, but should not require updates when files are added or removed. (Sometimes it'll be necessary to add a new pattern if the new files should not land in the main binary package.) There's some intentional changes: - man pages are more consistently included with the files they describe - shell completion scripts similarly - various kernel-install and modules-load related files are moved to -udev subpackage
2017-12-11 23:41:07 +00:00
vconsole|
backlight|
rfkill|
random-seed|
modules-load|
update split-files.py and list of ghost files
2017-12-12 06:49:18 +00:00
timesync|
Add Recommends for dlopened libs and move files into subpackages
2021-12-09 22:10:44 +00:00
crypttab|
Move systemd-cryptenroll to systemd-udev
2021-11-30 20:00:44 +00:00
cryptenroll|
Update to snapshot, use generated lists of files Previous method was untenable, because rpm doesn't have a concept of put those files here, and the rest in there. So for every positive pattern that was added, we had to add an %exclude line somewhere else. So let's generate the lists using pattern matching. This is a bit messy too, but should not require updates when files are added or removed. (Sometimes it'll be necessary to add a new pattern if the new files should not land in the main binary package.) There's some intentional changes: - man pages are more consistently included with the files they describe - shell completion scripts similarly - various kernel-install and modules-load related files are moved to -udev subpackage
2017-12-11 23:41:07 +00:00
cryptsetup|
kmod|
quota|
Move a bunch more stuff to systemd-udev.rpm
2020-02-28 13:36:53 +00:00
pstore|
Update to snapshot, use generated lists of files Previous method was untenable, because rpm doesn't have a concept of put those files here, and the rest in there. So for every positive pattern that was added, we had to add an %exclude line somewhere else. So let's generate the lists using pattern matching. This is a bit messy too, but should not require updates when files are added or removed. (Sometimes it'll be necessary to add a new pattern if the new files should not land in the main binary package.) There's some intentional changes: - man pages are more consistently included with the files they describe - shell completion scripts similarly - various kernel-install and modules-load related files are moved to -udev subpackage
2017-12-11 23:41:07 +00:00
sleep|suspend|hibernate|
systemd-tmpfiles-setup-dev|
add "98-default-mac-none.link" to keep default MAC address of bridge/bond/team https://bugzilla.redhat.com/show_bug.cgi?id=2107754 https://fedoraproject.org/wiki/Changes/MAC_Address_Policy_none https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/FZGH473ZUGPXK2E3GOEQ5TBLJ62FYJBC/
2023-02-02 17:09:03 +00:00
network/98-default-mac-none.link|
Update to snapshot, use generated lists of files Previous method was untenable, because rpm doesn't have a concept of put those files here, and the rest in there. So for every positive pattern that was added, we had to add an %exclude line somewhere else. So let's generate the lists using pattern matching. This is a bit messy too, but should not require updates when files are added or removed. (Sometimes it'll be necessary to add a new pattern if the new files should not land in the main binary package.) There's some intentional changes: - man pages are more consistently included with the files they describe - shell completion scripts similarly - various kernel-install and modules-load related files are moved to -udev subpackage
2017-12-11 23:41:07 +00:00
network/99-default.link|
Move a bunch more stuff to systemd-udev.rpm
2020-02-28 13:36:53 +00:00
growfs|makefs|makeswap|mkswap|
fsck|
repart|
Update to snapshot, use generated lists of files Previous method was untenable, because rpm doesn't have a concept of put those files here, and the rest in there. So for every positive pattern that was added, we had to add an %exclude line somewhere else. So let's generate the lists using pattern matching. This is a bit messy too, but should not require updates when files are added or removed. (Sometimes it'll be necessary to add a new pattern if the new files should not land in the main binary package.) There's some intentional changes: - man pages are more consistently included with the files they describe - shell completion scripts similarly - various kernel-install and modules-load related files are moved to -udev subpackage
2017-12-11 23:41:07 +00:00
gpt-auto|
Move a bunch more stuff to systemd-udev.rpm
2020-02-28 13:36:53 +00:00
volatile-root|
Add Recommends for dlopened libs and move files into subpackages
2021-12-09 22:10:44 +00:00
veritysetup|
integritysetup|
integritytab|
Move a bunch more stuff to systemd-udev.rpm
2020-02-28 13:36:53 +00:00
remount-fs|
Version 252-rc1 ... (for details see https://raw.githubusercontent.com/systemd/systemd/v252-rc1/NEWS) systemd-pcrphase and systemd-measure and initrd-* units are moved to systemd-udev. systemd-udev should be part of the initrd, and those tools don't make much sense in systems without hardware (i.e. containers). (systemd-measure could possibly be useful, but we can always move it back if there's a good reason.)
2022-10-07 16:12:10 +00:00
/initrd|
Version 255~rc1 - See https://raw.githubusercontent.com/systemd/systemd/v255-rc1/NEWS - All the files and services related to pcrs are moved to -udev subpackage. This includes the new systemd-pcrlock binary.
2023-11-07 15:27:34 +00:00
systemd-pcr|
Correctly move systemd-measure to systemd-udev subpackage I had a local modification that didn't make it into commit.
2022-10-09 13:20:23 +00:00
systemd-measure|
Update to snapshot, use generated lists of files Previous method was untenable, because rpm doesn't have a concept of put those files here, and the rest in there. So for every positive pattern that was added, we had to add an %exclude line somewhere else. So let's generate the lists using pattern matching. This is a bit messy too, but should not require updates when files are added or removed. (Sometimes it'll be necessary to add a new pattern if the new files should not land in the main binary package.) There's some intentional changes: - man pages are more consistently included with the files they describe - shell completion scripts similarly - various kernel-install and modules-load related files are moved to -udev subpackage
2017-12-11 23:41:07 +00:00
/boot$|
/kernel/|
/kernel$|
Add Recommends for dlopened libs and move files into subpackages
2021-12-09 22:10:44 +00:00
/modprobe.d|
binfmt|
sysctl|
coredump|
homed|home1|
Move oomd to systemd-udev It is really only useful on "full" machines, either VMs or bare metal, so it should be in systemd-udev.
2023-11-07 16:45:57 +00:00
oomd|
Add Recommends for dlopened libs and move files into subpackages
2021-12-09 22:10:44 +00:00
portabled|portable1
''', n, re.X): # coredumpctl, homectl, portablectl are included in the main package because
# they can be used to interact with remote daemons. Also, the user could be
# confused if those user-facing binaries are not available.
split-files: use a dictionary instead of many little variables Just refactoring, to make it easier to act on the list of outputs. [skip changelog]
2023-11-23 13:53:53 +00:00
o = outputs['udev']
Add Recommends for dlopened libs and move files into subpackages
2021-12-09 22:10:44 +00:00
Move man pages for sd-boot into systemd-boot-unsigned
2023-03-01 13:09:03 +00:00
elif re.search(r'''/boot/efi|
Move /usr/lib/systemd/boot/ to systemd-boot-unsigned subpackage
2023-03-09 08:05:16 +00:00
/usr/lib/systemd/boot|
Move man pages for sd-boot into systemd-boot-unsigned
2023-03-01 13:09:03 +00:00
sd-boot|systemd-boot\.|loader.conf
''', n, re.X):
split-files: use a dictionary instead of many little variables Just refactoring, to make it easier to act on the list of outputs. [skip changelog]
2023-11-23 13:53:53 +00:00
o = outputs['boot']
Split out systemd-boot-unsigned package
2022-04-27 13:45:25 +00:00
Add Recommends for dlopened libs and move files into subpackages
2021-12-09 22:10:44 +00:00
elif re.search(r'''resolved|resolve1|
Create separate systemd-resolved package Move systemd-resolved daemon and related tools to its own subpackage. Keep only nss-resolve in systemd, the service itself is moved to subpackage. It has quite different functionality than systemd package and deserves own package. Still recommend resolved from main package Keep backward compatibility and still recommend systemd-resolved. Allow removal, but would be installed by default.
2021-06-16 15:03:00 +00:00
systemd-resolve|
resolvconf|
Add Recommends for dlopened libs and move files into subpackages
2021-12-09 22:10:44 +00:00
systemd\.(positive|negative)
''', n, re.X): # resolvectl and nss-resolve are in the main package.
split-files: use a dictionary instead of many little variables Just refactoring, to make it easier to act on the list of outputs. [skip changelog]
2023-11-23 13:53:53 +00:00
o = outputs['resolve']
Add Recommends for dlopened libs and move files into subpackages
2021-12-09 22:10:44 +00:00
Update to snapshot, use generated lists of files Previous method was untenable, because rpm doesn't have a concept of put those files here, and the rest in there. So for every positive pattern that was added, we had to add an %exclude line somewhere else. So let's generate the lists using pattern matching. This is a bit messy too, but should not require updates when files are added or removed. (Sometimes it'll be necessary to add a new pattern if the new files should not land in the main binary package.) There's some intentional changes: - man pages are more consistently included with the files they describe - shell completion scripts similarly - various kernel-install and modules-load related files are moved to -udev subpackage
2017-12-11 23:41:07 +00:00
else:
split-files: use a dictionary instead of many little variables Just refactoring, to make it easier to act on the list of outputs. [skip changelog]
2023-11-23 13:53:53 +00:00
o = outputs['main']
Update to snapshot, use generated lists of files Previous method was untenable, because rpm doesn't have a concept of put those files here, and the rest in there. So for every positive pattern that was added, we had to add an %exclude line somewhere else. So let's generate the lists using pattern matching. This is a bit messy too, but should not require updates when files are added or removed. (Sometimes it'll be necessary to add a new pattern if the new files should not land in the main binary package.) There's some intentional changes: - man pages are more consistently included with the files they describe - shell completion scripts similarly - various kernel-install and modules-load related files are moved to -udev subpackage
2017-12-11 23:41:07 +00:00
if n in known_files:
Do not remove modified config files Our config files in /etc/ were marked as %config(noreplace). This means that the would not be replaced on upgraded if local modifications have been made. But when we moved them to /usr/lib, they would be be renamed to .rpmsave, if they had local modifications. This is not what I expected, but what rpm apparently does. So we need to add them as %ghost to prevent the removal. This is probably for the better anyway.
2023-12-13 12:02:45 +00:00
prefix = known_files[n].split()[:-1]
Update to snapshot, use generated lists of files Previous method was untenable, because rpm doesn't have a concept of put those files here, and the rest in there. So for every positive pattern that was added, we had to add an %exclude line somewhere else. So let's generate the lists using pattern matching. This is a bit messy too, but should not require updates when files are added or removed. (Sometimes it'll be necessary to add a new pattern if the new files should not land in the main binary package.) There's some intentional changes: - man pages are more consistently included with the files they describe - shell completion scripts similarly - various kernel-install and modules-load related files are moved to -udev subpackage
2017-12-11 23:41:07 +00:00
elif file.is_dir() and not file.is_symlink():
Do not remove modified config files Our config files in /etc/ were marked as %config(noreplace). This means that the would not be replaced on upgraded if local modifications have been made. But when we moved them to /usr/lib, they would be be renamed to .rpmsave, if they had local modifications. This is not what I expected, but what rpm apparently does. So we need to add them as %ghost to prevent the removal. This is probably for the better anyway.
2023-12-13 12:02:45 +00:00
prefix = ['%dir']
Mark README files as doc /etc/rc.d/init.d/README was marked as %config(noreplace), which seems to be a clear bug. But this primarily affects new README files in all the .d directories.
2021-03-31 08:03:27 +00:00
elif 'README' in n:
Do not remove modified config files Our config files in /etc/ were marked as %config(noreplace). This means that the would not be replaced on upgraded if local modifications have been made. But when we moved them to /usr/lib, they would be be renamed to .rpmsave, if they had local modifications. This is not what I expected, but what rpm apparently does. So we need to add them as %ghost to prevent the removal. This is probably for the better anyway.
2023-12-13 12:02:45 +00:00
prefix = ['%doc']
Update to snapshot, use generated lists of files Previous method was untenable, because rpm doesn't have a concept of put those files here, and the rest in there. So for every positive pattern that was added, we had to add an %exclude line somewhere else. So let's generate the lists using pattern matching. This is a bit messy too, but should not require updates when files are added or removed. (Sometimes it'll be necessary to add a new pattern if the new files should not land in the main binary package.) There's some intentional changes: - man pages are more consistently included with the files they describe - shell completion scripts similarly - various kernel-install and modules-load related files are moved to -udev subpackage
2017-12-11 23:41:07 +00:00
elif n.startswith('/etc'):
Do not remove modified config files Our config files in /etc/ were marked as %config(noreplace). This means that the would not be replaced on upgraded if local modifications have been made. But when we moved them to /usr/lib, they would be be renamed to .rpmsave, if they had local modifications. This is not what I expected, but what rpm apparently does. So we need to add them as %ghost to prevent the removal. This is probably for the better anyway.
2023-12-13 12:02:45 +00:00
prefix = ['%config(noreplace)']
if file.stat().st_size == 0:
prefix += ['%ghost']
Update to snapshot, use generated lists of files Previous method was untenable, because rpm doesn't have a concept of put those files here, and the rest in there. So for every positive pattern that was added, we had to add an %exclude line somewhere else. So let's generate the lists using pattern matching. This is a bit messy too, but should not require updates when files are added or removed. (Sometimes it'll be necessary to add a new pattern if the new files should not land in the main binary package.) There's some intentional changes: - man pages are more consistently included with the files they describe - shell completion scripts similarly - various kernel-install and modules-load related files are moved to -udev subpackage
2017-12-11 23:41:07 +00:00
else:
Do not remove modified config files Our config files in /etc/ were marked as %config(noreplace). This means that the would not be replaced on upgraded if local modifications have been made. But when we moved them to /usr/lib, they would be be renamed to .rpmsave, if they had local modifications. This is not what I expected, but what rpm apparently does. So we need to add them as %ghost to prevent the removal. This is probably for the better anyway.
2023-12-13 12:02:45 +00:00
prefix = []
prefix = ' '.join(prefix + ['']) if prefix else ''
Update to snapshot, use generated lists of files Previous method was untenable, because rpm doesn't have a concept of put those files here, and the rest in there. So for every positive pattern that was added, we had to add an %exclude line somewhere else. So let's generate the lists using pattern matching. This is a bit messy too, but should not require updates when files are added or removed. (Sometimes it'll be necessary to add a new pattern if the new files should not land in the main binary package.) There's some intentional changes: - man pages are more consistently included with the files they describe - shell completion scripts similarly - various kernel-install and modules-load related files are moved to -udev subpackage
2017-12-11 23:41:07 +00:00
suffix = '*' if '/man/' in n else ''
print(f'{prefix}{n}{suffix}', file=o)
split-files: fail early if we split-files produces an empty output We would fail later anyway, because rpm refuses %files with an empty filelist file. But this is much later, after %check, so let's fail already in %install. [skip changelog]
2023-11-23 13:57:31 +00:00
if [print(f'ERROR: no file names were written to {o.name}')
split-files: also handle conditional packages This is a bit annoying, but meh. [skip changelog]
2023-11-23 14:10:10 +00:00
for name, o in outputs.items()
if (o.tell() == 0 and
Always build ukify package Even on non-uefi architectures, ukify can be used to build UKIs for UEFI images. For example, mkosi can use it to build UKIs on s390x. To enable this use case, let's always build ukify, but with a conditional dependency on systemd-boot only on arches that support UEFI. (cherry picked from commit a67221c3f0d0b81b9b5b3230a71d09044342f1a4) Resolves: RHEL-52634
2024-08-28 09:57:41 +00:00
not (no_bootloader and name == 'boot'))
split-files: also handle conditional packages This is a bit annoying, but meh. [skip changelog]
2023-11-23 14:10:10 +00:00
]:
split-files: fail early if we split-files produces an empty output We would fail later anyway, because rpm refuses %files with an empty filelist file. But this is much later, after %check, so let's fail already in %install. [skip changelog]
2023-11-23 13:57:31 +00:00
sys.exit(1)
Reference in New Issue Copy Permalink