From daf98ffe956364770881532cc2c94f44cdf0d127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 25 Jun 2020 16:43:31 +0200 Subject: [PATCH] Drop installation-time dependency on systemd For rdma-core binary package, the dependency is really on systemd-udev which provides udevadm. Since systemd can be installed without udev, the dependency was not effective. But actually the dependency is not needed at all, because the system will behave the same with and without it. (If systemd-udev is installed later in the transaction, the call to udevadm trigger is not necessary. If systemd-udev is installed earlier in the transaction, the call to udevadm trigger will succeed. And if if systemd-udev is not installed at all, it means that there's no hardware support and udevadm doesn't need to be executed at all.) Similarly, %{systemd_requires} is not necessary for the systemd unit scriptlets. See https://pagure.io/packaging-committee/c/46010f8b6ab077bf. That commit also has a long explanation. Also co-own the directory to avoid unowned directory warning. --- rdma-core.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rdma-core.spec b/rdma-core.spec index 3b0af85..da51d84 100644 --- a/rdma-core.spec +++ b/rdma-core.spec @@ -1,6 +1,6 @@ Name: rdma-core Version: 30.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RDMA core userspace libraries and daemons # Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license @@ -54,7 +54,7 @@ BuildRequires: python-docutils BuildRequires: perl-generators %endif -Requires: dracut, kmod, systemd, pciutils +Requires: dracut, kmod, pciutils # Red Hat/Fedora previously shipped redhat/ as a stand-alone # package called 'rdma', which we're supplanting here. Provides: rdma = %{version}-%{release} @@ -141,7 +141,6 @@ compatibility reasons. %package -n libibverbs Summary: A library and drivers for direct userspace use of RDMA (InfiniBand/iWARP/RoCE) hardware -%{?systemd_requires} Requires: %{name}%{?_isa} = %{version}-%{release} Provides: libcxgb4 = %{version}-%{release} Obsoletes: libcxgb4 < %{version}-%{release} @@ -198,7 +197,6 @@ displays information about RDMA devices. %package -n ibacm Summary: InfiniBand Communication Manager Assistant -%{?systemd_requires} Requires: %{name}%{?_isa} = %{version}-%{release} %description -n ibacm @@ -213,7 +211,6 @@ library knows how to talk directly to the ibacm daemon to retrieve data. %package -n iwpmd Summary: iWarp Port Mapper userspace daemon -%{?systemd_requires} Requires: %{name}%{?_isa} = %{version}-%{release} %description -n iwpmd @@ -248,7 +245,6 @@ Summary: Tools for using the InfiniBand SRP protocol devices Obsoletes: srptools <= 1.0.3 Provides: srptools = %{version}-%{release} Obsoletes: openib-srptools <= 0.0.6 -%{?systemd_requires} Requires: %{name}%{?_isa} = %{version}-%{release} %description -n srp_daemon @@ -401,6 +397,7 @@ rm -f %{buildroot}/%{_sbindir}/srp_daemon.sh %{_unitdir}/rdma.service %dir %{dracutlibdir}/modules.d/05rdma %{dracutlibdir}/modules.d/05rdma/module-setup.sh +%dir %{_udevrulesdir} %{_udevrulesdir}/../rdma_rename %{_udevrulesdir}/60-rdma-ndd.rules %{_udevrulesdir}/60-rdma-persistent-naming.rules @@ -652,6 +649,9 @@ rm -f %{buildroot}/%{_sbindir}/srp_daemon.sh %endif %changelog +* Thu Jun 25 2020 Zbigniew Jędrzejewski-Szmek - 30.0-2 +- Drop dependencies on systemd (#1837812) + * Mon Jun 15 2020 Honggang Li - 30.0-1 - Rebase to upstream release v30.0