VPP-474 Revert "FIX sysctl configuration directory"

[vpp.git] / build-root / rpm / vpp.spec

diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec
index d442e79..5fd9629 100644 (file)
--- a/build-root/rpm/vpp.spec
+++ b/build-root/rpm/vpp.spec
@@ -17,12 +17,15 @@
 
 %{!?python2_minor_version: %define python2_minor_version %(%{__python} -c "import sys ; print sys.version[2:3]")}
 
+%{?systemd_requires}
+
 Name: vpp
 Summary: Vector Packet Processing
 License: MIT
 Version: %{_version}
 Release: %{_release}
-Requires: vpp-lib = %{_version}-%{_release}, net-tools, pciutils
+Requires: vpp-lib = %{_version}-%{_release}, net-tools, pciutils, python
+BuildRequires: systemd
 
 %description
 This package provides VPP executables: vpp, vpp_api_test, vpp_json_test
@@ -70,7 +73,7 @@ This package contains VPP plugins
 %package python-api
 Summary: VPP api python bindings
 Group: Development/Libraries
-Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}, vpp-devel = %{_version}-%{_release}
+Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}
 
 %description python-api
 This package contains the python bindings for the vpp api
@@ -92,10 +95,10 @@ install -p -m 755 ../../vppapigen/pyvppapigen.py %{buildroot}%{_bindir}
 # configs
 #
 mkdir -p -m755 %{buildroot}/etc/vpp
-mkdir -p -m755 %{buildroot}/usr/lib/sysctl.d
+mkdir -p -m755 %{buildroot}/etc/sysctl.d
 install -p -m 644 vpp.service %{buildroot}%{_unitdir}
 install -p -m 644 ../../vpp/conf/startup.uiopcigeneric.conf %{buildroot}/etc/vpp/startup.conf
-install -p -m 644 ../../vpp/conf/80-vpp.conf %{buildroot}/usr/lib/sysctl.d
+install -p -m 644 ../../vpp/conf/80-vpp.conf %{buildroot}/etc/sysctl.d
 #
 # libraries
 #
@@ -171,8 +174,29 @@ done
 sysctl --system
 %systemd_post vpp.service
 
+%preun
+%systemd_preun vpp.service
+
 %postun
-%systemd_postun_with_restart vpp.service
+%systemd_postun
+
+# Unbind user-mode PCI drivers
+removed=
+pci_dirs=`find /sys/bus/pci/drivers -type d -name igb_uio -o -name uio_pci_generic -o -name vfio-pci`
+for d in $pci_dirs; do
+    for f in ${d}/*; do
+        [ -e "${f}/config" ] || continue
+        echo 1 > ${f}/remove
+        basename `dirname ${f}` | xargs echo -n "Removing driver"; echo " for PCI ID" `basename ${f}`
+        removed=y
+    done
+done
+if [ -n "${removed}" ]; then
+    echo "There are changes in PCI drivers, rescaning"
+    echo 1 > /sys/bus/pci/rescan
+else
+    echo "There weren't PCI devices binded"
+fi
 
 %files
 %defattr(-,bin,bin)
@@ -180,7 +204,7 @@ sysctl --system
 /usr/bin/vpp*
 /usr/bin/svm*
 /usr/bin/elftool
-%config /usr/lib/sysctl.d/80-vpp.conf
+%config /etc/sysctl.d/80-vpp.conf
 %config /etc/vpp/startup.conf
 
 %files lib