pool/systemd
SHA256
2
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- systemd.spec: minor simplification by assuming that %{bootstrap} is always

Browse Source 
defined.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1261
This commit is contained in:
Franck Bui 2022-03-08 19:07:58 +00:00 committed by Git OBS Bridge
parent 309d52f8ce
commit a38ff3ffe3
6 changed files with 51 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files.container
View File

@ -3,7 +3,7 @@
#
%dir %{_sysconfdir}/systemd/nspawn
%{_bindir}/systemd-nspawn
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%{_datadir}/bash-completion/completions/systemd-nspawn
%{_datadir}/zsh/site-functions/_systemd-nspawn
%{_mandir}/man1/systemd-nspawn.1.gz

2
files.devel
View File

@ -7,7 +7,7 @@
%{_libdir}/libudev.so
%{_libdir}/pkgconfig/libsystemd.pc
%{_libdir}/pkgconfig/libudev.pc
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%{_mandir}/man3/SD_ALERT.3.gz
%{_mandir}/man3/SD_BUS_ERROR_ACCESS_DENIED.3.gz
%{_mandir}/man3/SD_BUS_ERROR_ADDRESS_IN_USE.3.gz

44
files.systemd
View File

@ -8,7 +8,7 @@
%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf
%config(noreplace) %{_sysconfdir}/systemd/user.conf
%dir %{_binfmtdir}
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%dir %{_datadir}/bash-completion
%dir %{_datadir}/bash-completion/completions
%endif
@ -21,13 +21,15 @@
%dir %{_datadir}/polkit-1
%dir %{_datadir}/polkit-1/actions
%dir %{_datadir}/systemd
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%dir %{_datadir}/zsh
%dir %{_datadir}/zsh/site-functions
%endif
%dir %{_environmentdir}
%dir %{_journalcatalogdir}
%if ! %{bootstrap}
%dir %{_libdir}/cryptsetup
%endif
%dir %{_localstatedir}/lib/systemd
%dir %{_localstatedir}/lib/systemd/catalog
%dir %{_modprobedir}
@ -116,7 +118,7 @@
%{_bindir}/systemd-cgls
%{_bindir}/systemd-cgtop
%{_bindir}/systemd-creds
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%{_bindir}/systemd-cryptenroll
%endif
%{_bindir}/systemd-delta
@ -139,7 +141,7 @@
%{_bindir}/systemd-tty-ask-password-agent
%{_bindir}/systemd-umount
%{_bindir}/timedatectl
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%if %{with sd_boot}
%{_datadir}/bash-completion/completions/bootctl
%endif
@ -207,7 +209,7 @@
%{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
%{_datadir}/systemd/kbd-model-map
%{_datadir}/systemd/language-fallback-map
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%if %{with sd_boot}
%{_datadir}/zsh/site-functions/_bootctl
%endif
@ -527,14 +529,14 @@
%endif
%{_systemd_util_dir}/systemd-boot-check-no-failures
%{_systemd_util_dir}/systemd-cgroups-agent
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%{_systemd_util_dir}/systemd-cryptsetup
%endif
%{_systemd_util_dir}/systemd-fsck
%{_systemd_util_dir}/systemd-growfs
%{_systemd_util_dir}/systemd-hibernate-resume
%{_systemd_util_dir}/systemd-hostnamed
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%{_systemd_util_dir}/systemd-integritysetup
%endif
%{_systemd_util_dir}/systemd-journald
@ -560,7 +562,7 @@
%{_systemd_util_dir}/systemd-user-runtime-dir
%{_systemd_util_dir}/systemd-user-sessions
%{_systemd_util_dir}/systemd-vconsole-setup
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%{_systemd_util_dir}/systemd-veritysetup
%endif
%{_systemd_util_dir}/systemd-volatile-root
@ -592,7 +594,7 @@
%if %{with sd_boot}
%{_systemdgeneratordir}/systemd-bless-boot-generator
%endif
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%{_systemdgeneratordir}/systemd-cryptsetup-generator
%endif
%{_systemdgeneratordir}/systemd-debug-generator
@ -600,12 +602,12 @@
%{_systemdgeneratordir}/systemd-getty-generator
%{_systemdgeneratordir}/systemd-gpt-auto-generator
%{_systemdgeneratordir}/systemd-hibernate-resume-generator
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%{_systemdgeneratordir}/systemd-integritysetup-generator
%endif
%{_systemdgeneratordir}/systemd-run-generator
%{_systemdgeneratordir}/systemd-system-update-generator
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%{_systemdgeneratordir}/systemd-veritysetup-generator
%endif
%{_sysusersdir}/systemd-journal.conf
@ -633,7 +635,7 @@
%{_unitdir}/boot-complete.target
%{_unitdir}/console-getty.service
%{_unitdir}/container-getty@.service
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%{_unitdir}/cryptsetup-pre.target
%{_unitdir}/cryptsetup.target
%endif
@ -663,7 +665,7 @@
%{_unitdir}/initrd-fs.target
%{_unitdir}/initrd-parse-etc.service
%{_unitdir}/initrd-root-device.target
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%{_unitdir}/initrd-root-device.target.wants/remote-cryptsetup.target
%{_unitdir}/initrd-root-device.target.wants/remote-veritysetup.target
%endif
@ -672,7 +674,7 @@
%{_unitdir}/initrd-switch-root.target
%{_unitdir}/initrd-usr-fs.target
%{_unitdir}/initrd.target
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%{_unitdir}/integritysetup-pre.target
%{_unitdir}/integritysetup.target
%endif
@ -698,12 +700,12 @@
%{_unitdir}/proc-sys-fs-binfmt_misc.mount
%{_unitdir}/quotaon.service
%{_unitdir}/reboot.target
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%{_unitdir}/remote-cryptsetup.target
%endif
%{_unitdir}/remote-fs-pre.target
%{_unitdir}/remote-fs.target
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%{_unitdir}/remote-veritysetup.target
%endif
%{_unitdir}/rescue.service
@ -727,12 +729,12 @@
%{_unitdir}/sys-kernel-debug.mount
%{_unitdir}/sys-kernel-tracing.mount
%{_unitdir}/sysinit.target
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%{_unitdir}/sysinit.target.wants/cryptsetup.target
%endif
%{_unitdir}/sysinit.target.wants/dev-hugepages.mount
%{_unitdir}/sysinit.target.wants/dev-mqueue.mount
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%{_unitdir}/sysinit.target.wants/integritysetup.target
%endif
%{_unitdir}/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount
@ -758,11 +760,11 @@
%{_unitdir}/sysinit.target.wants/systemd-tmpfiles-setup.service
%{_unitdir}/sysinit.target.wants/systemd-update-done.service
%{_unitdir}/sysinit.target.wants/systemd-update-utmp.service
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%{_unitdir}/sysinit.target.wants/veritysetup.target
%endif
%{_unitdir}/syslog.socket
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%{_unitdir}/system-systemd\x2dcryptsetup.slice
%endif
%{_unitdir}/system-update-cleanup.service
@ -840,7 +842,7 @@
%{_unitdir}/user-runtime-dir@.service
%{_unitdir}/user.slice
%{_unitdir}/user@.service
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%{_unitdir}/veritysetup-pre.target
%{_unitdir}/veritysetup.target
%endif

6
files.udev
View File

@ -14,14 +14,14 @@
%ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation
%{_bindir}/systemd-hwdb
%{_bindir}/udevadm
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%{_datadir}/bash-completion/completions/udevadm
%endif
%{_datadir}/pkgconfig/udev.pc
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%{_datadir}/zsh/site-functions/_udevadm
%endif
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%{_mandir}/man5/udev.conf.5.gz
%{_mandir}/man7/hwdb.7.gz
%{_mandir}/man7/udev.7.gz

6
systemd.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Mar 8 19:08:03 UTC 2022 - Franck Bui <fbui@suse.com>
- systemd.spec: minor simplification by assuming that %{bootstrap} is always
defined.
-------------------------------------------------------------------
Tue Mar 8 17:50:57 UTC 2022 - Franck Bui <fbui@suse.com>

34
systemd.spec
View File

@ -37,7 +37,7 @@
%define __when_2() %{expand:%%{?with_%{1}:%{2}}%%{!?with_%{1}:false}}
%define when() %{expand:%%__when_%# %{*}}
%if 0%{?bootstrap}
%if %{bootstrap}
%bcond_with coredump
%bcond_with importd
%bcond_with journal_remote
@ -76,7 +76,7 @@ Release: 0
Summary: A System and Session Manager
License: LGPL-2.1-or-later
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
BuildRequires: docbook-xsl-stylesheets
BuildRequires: kbd
BuildRequires: libapparmor-devel
@ -132,7 +132,7 @@ BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33
BuildRequires: gnu-efi
%endif
%if 0%{?bootstrap}
%if %{bootstrap}
#!BuildIgnore: dbus-1
Provides: systemd = %{version}-%{release}
Conflicts: systemd
@ -242,7 +242,7 @@ drop-in replacement for sysvinit.
%package doc
Summary: HTML documentation for systemd
License: LGPL-2.1-or-later
%if 0%{?bootstrap}
%if %{bootstrap}
Conflicts: systemd-doc
Requires: this-is-only-for-build-envs
%else
@ -260,7 +260,7 @@ Requires: libudev%{?mini}1 = %{version}-%{release}
Requires: systemd-rpm-macros
Provides: libudev%{?mini}-devel = %{version}-%{release}
Obsoletes: libudev%{?mini}-devel < %{version}-%{release}
%if 0%{?bootstrap}
%if %{bootstrap}
Provides: systemd-devel = %{version}-%{release}
Conflicts: systemd-devel
Provides: libudev-devel = %{version}-%{release}
@ -293,7 +293,7 @@ Please note that the content of this package is considered as deprecated.
%package -n libsystemd0%{?mini}
Summary: Component library for systemd
License: LGPL-2.1-or-later
%if 0%{?bootstrap}
%if %{bootstrap}
Conflicts: kiwi
Conflicts: libsystemd0
Provides: libsystemd0 = %{version}-%{release}
@ -339,7 +339,7 @@ Conflicts: dracut < 044.1
Conflicts: filesystem < 11.5
Conflicts: mkinitrd < 2.7.0
Conflicts: util-linux < 2.16
%if 0%{?bootstrap}
%if %{bootstrap}
Conflicts: udev
Provides: udev = %{version}-%{release}
%endif
@ -354,7 +354,7 @@ call tools to initialize a device, or load needed kernel modules.
%package -n libudev%{?mini}1
Summary: Dynamic library to access udev device information
License: LGPL-2.1-or-later
%if 0%{?bootstrap}
%if %{bootstrap}
Conflicts: kiwi
Conflicts: libudev1
Provides: libudev1 = %{version}-%{release}
@ -388,7 +388,7 @@ Obsoletes: nss-mymachines < %{version}-%{release}
Provides: nss-mymachines = %{version}-%{release}
Provides: systemd-container = %{version}-%{release}
Provides: systemd:%{_bindir}/systemd-nspawn
%if 0%{?bootstrap}
%if %{bootstrap}
Conflicts: systemd-container
Provides: systemd-container = %{version}-%{release}
%endif
@ -459,7 +459,7 @@ http://0pointer.net/blog/walkthrough-for-portable-services.html
https://systemd.io/PORTABLE_SERVICES
%endif
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%package -n nss-systemd
Summary: Plugin for local virtual host name resolution
License: LGPL-2.1-or-later
@ -626,7 +626,7 @@ The package contains: homed, pstore, repart, userdbd.
Have fun with these services at your own risk.
%endif
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%lang_package
%endif
@ -671,7 +671,7 @@ Have fun with these services at your own risk.
-Dima=false \
-Delfutils=auto \
-Doomd=false \
%if 0%{?bootstrap}
%if %{bootstrap}
-Dbashcompletiondir=no \
-Dzshcompletiondir=no \
-Dtranslations=false \
@ -915,7 +915,7 @@ rm %{buildroot}%{_testsuitedir}/test/test-keymap-util/kbd-model-map
find %{buildroot}%{_testsuitedir}/ -name .git\* -exec rm -fr {} \;
%endif
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%find_lang systemd
%endif
@ -944,7 +944,7 @@ if [ "$(stat -c%a %{_sysconfdir}/machine-id)" != 444 ]; then
chmod 444 %{_sysconfdir}/machine-id
fi
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
pam-config --add --systemd || :
%endif
@ -1132,7 +1132,7 @@ fi
%sysusers_create systemd-coredump.conf
%endif
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%ldconfig_scriptlets -n nss-myhostname
%ldconfig_scriptlets -n nss-systemd
%endif
@ -1296,14 +1296,14 @@ fi
%{_sysusersdir}/systemd-coredump.conf
%config(noreplace) %{_sysconfdir}/systemd/coredump.conf
%dir %{_localstatedir}/lib/systemd/coredump
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%{_mandir}/man1/coredumpctl*
%{_mandir}/man5/coredump.conf*
%{_mandir}/man8/systemd-coredump*
%endif
%endif
%if ! 0%{?bootstrap}
%if ! %{bootstrap}
%files lang -f systemd.lang
%files -n nss-myhostname