rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

fix previous commit: kernel-install needs to be installed only when sd_boot is enabled

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1269
This commit is contained in:
Franck Bui 2022-03-31 08:26:50 +00:00 committed by Git OBS Bridge
parent 3c809e7c63
commit 742e4740f8
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
files.udev
View File

@ -5,8 +5,6 @@
%if ! %{bootstrap} %if ! %{bootstrap}
%dir %{_libdir}/cryptsetup %dir %{_libdir}/cryptsetup
%dir %{_modulesloaddir} %dir %{_modulesloaddir}
%dir %{_prefix}/lib/kernel
%dir %{_prefix}/lib/kernel/install.d
%endif %endif
%dir %{_prefix}/lib/udev %dir %{_prefix}/lib/udev
%if ! %{bootstrap} %if ! %{bootstrap}
@ -23,18 +21,15 @@
%ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation %ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation
%ghost %{_localstatedir}/lib/systemd/backlight %ghost %{_localstatedir}/lib/systemd/backlight
%if ! %{bootstrap} %if ! %{bootstrap}
%{_bindir}/kernel-install
%{_bindir}/systemd-cryptenroll %{_bindir}/systemd-cryptenroll
%endif %endif
%{_bindir}/systemd-hwdb %{_bindir}/systemd-hwdb
%{_bindir}/udevadm %{_bindir}/udevadm
%if ! %{bootstrap} %if ! %{bootstrap}
%{_datadir}/bash-completion/completions/kernel-install
%{_datadir}/bash-completion/completions/udevadm %{_datadir}/bash-completion/completions/udevadm
%endif %endif
%{_datadir}/pkgconfig/udev.pc %{_datadir}/pkgconfig/udev.pc
%if ! %{bootstrap} %if ! %{bootstrap}
%{_datadir}/zsh/site-functions/_kernel-install
%{_datadir}/zsh/site-functions/_udevadm %{_datadir}/zsh/site-functions/_udevadm
%endif %endif
%if ! %{bootstrap} %if ! %{bootstrap}
@ -49,7 +44,6 @@
%{_mandir}/man5/veritytab.5.gz %{_mandir}/man5/veritytab.5.gz
%{_mandir}/man7/hwdb.7.gz %{_mandir}/man7/hwdb.7.gz
%{_mandir}/man7/udev.7.gz %{_mandir}/man7/udev.7.gz
%{_mandir}/man8/kernel-install.8.gz
%{_mandir}/man8/systemd-backlight.8.gz %{_mandir}/man8/systemd-backlight.8.gz
%{_mandir}/man8/systemd-backlight@.service.8.gz %{_mandir}/man8/systemd-backlight@.service.8.gz
%{_mandir}/man8/systemd-cryptsetup-generator.8.gz %{_mandir}/man8/systemd-cryptsetup-generator.8.gz
@ -84,9 +78,6 @@
%{_mandir}/man8/systemd-volatile-root.8.gz %{_mandir}/man8/systemd-volatile-root.8.gz
%{_mandir}/man8/systemd-volatile-root.service.8.gz %{_mandir}/man8/systemd-volatile-root.service.8.gz
%{_mandir}/man8/udevadm.8.gz %{_mandir}/man8/udevadm.8.gz
%{_prefix}/lib/kernel/install.conf
%{_prefix}/lib/kernel/install.d/50-depmod.install
%{_prefix}/lib/kernel/install.d/90-loaderentry.install
%endif %endif
%{_prefix}/lib/udev/ata_id %{_prefix}/lib/udev/ata_id
%{_prefix}/lib/udev/cdrom_id %{_prefix}/lib/udev/cdrom_id

9
files.uefi-boot
View File

@ -2,12 +2,17 @@
# Please keep the list sorted (with `LC_ALL=C sort`). # Please keep the list sorted (with `LC_ALL=C sort`).
# #
%if %{with sd_boot} %if %{with sd_boot}
%dir %{_prefix}/lib/kernel
%dir %{_prefix}/lib/kernel/install.d
%dir %{_systemd_util_dir}/boot %dir %{_systemd_util_dir}/boot
%dir %{_systemd_util_dir}/boot/efi %dir %{_systemd_util_dir}/boot/efi
%{_bindir}/bootctl %{_bindir}/bootctl
%{_bindir}/kernel-install
%if ! %{bootstrap} %if ! %{bootstrap}
%{_datadir}/bash-completion/completions/bootctl %{_datadir}/bash-completion/completions/bootctl
%{_datadir}/bash-completion/completions/kernel-install
%{_datadir}/zsh/site-functions/_bootctl %{_datadir}/zsh/site-functions/_bootctl
%{_datadir}/zsh/site-functions/_kernel-install
%{_mandir}/man1/bootctl.1.gz %{_mandir}/man1/bootctl.1.gz
%{_mandir}/man5/loader.conf.5.gz %{_mandir}/man5/loader.conf.5.gz
%{_mandir}/man7/linuxaa64.efi.stub.7.gz %{_mandir}/man7/linuxaa64.efi.stub.7.gz
@ -16,11 +21,15 @@
%{_mandir}/man7/sd-boot.7.gz %{_mandir}/man7/sd-boot.7.gz
%{_mandir}/man7/systemd-boot.7.gz %{_mandir}/man7/systemd-boot.7.gz
%{_mandir}/man7/systemd-stub.7.gz %{_mandir}/man7/systemd-stub.7.gz
%{_mandir}/man8/kernel-install.8.gz
%{_mandir}/man8/systemd-bless-boot-generator.8.gz %{_mandir}/man8/systemd-bless-boot-generator.8.gz
%{_mandir}/man8/systemd-bless-boot.8.gz %{_mandir}/man8/systemd-bless-boot.8.gz
%{_mandir}/man8/systemd-bless-boot.service.8.gz %{_mandir}/man8/systemd-bless-boot.service.8.gz
%{_mandir}/man8/systemd-boot-system-token.service.8.gz %{_mandir}/man8/systemd-boot-system-token.service.8.gz
%endif %endif
%{_prefix}/lib/kernel/install.conf
%{_prefix}/lib/kernel/install.d/50-depmod.install
%{_prefix}/lib/kernel/install.d/90-loaderentry.install
# These are part of the very few exceptions where glob pattern is allowd. # These are part of the very few exceptions where glob pattern is allowd.
%{_systemd_util_dir}/boot/efi/linux*.efi.stub %{_systemd_util_dir}/boot/efi/linux*.efi.stub
%{_systemd_util_dir}/boot/efi/linux*.elf.stub %{_systemd_util_dir}/boot/efi/linux*.elf.stub