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 96e6f0f..5fd9629 100644 (file)
--- a/build-root/rpm/vpp.spec
+++ b/build-root/rpm/vpp.spec
@@ -6,12 +6,26 @@
 %define _version         %(../scripts/version rpm-version)
 %define _release         %(../scripts/version rpm-release)
 
+# Failsafe backport of Python2-macros for RHEL <= 6
+%{!?python_sitelib: %global python_sitelib      %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python_sitearch:    %global python_sitearch     %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%{!?python_version: %global python_version      %(%{__python} -c "import sys; sys.stdout.write(sys.version[:3])")}
+%{!?__python2:      %global __python2       %{__python}}
+%{!?python2_sitelib:    %global python2_sitelib     %{python_sitelib}}
+%{!?python2_sitearch:   %global python2_sitearch    %{python_sitearch}}
+%{!?python2_version:    %global python2_version     %{python_version}}
+
+%{!?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
@@ -56,6 +70,14 @@ Requires: vpp = %{_version}-%{_release}
 %description plugins
 This package contains VPP plugins
 
+%package python-api
+Summary: VPP api python bindings
+Group: Development/Libraries
+Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}
+
+%description python-api
+This package contains the python bindings for the vpp api
+
 %pre
 # Add the vpp group
 groupadd -f -r vpp
@@ -68,6 +90,7 @@ mkdir -p -m755 %{buildroot}%{_bindir}
 mkdir -p -m755 %{buildroot}%{_unitdir}
 install -p -m 755 %{_vpp_install_dir}/*/bin/* %{buildroot}%{_bindir}
 install -p -m 755 %{_vpp_build_dir}/vppapigen/vppapigen %{buildroot}%{_bindir}
+install -p -m 755 ../../vppapigen/pyvppapigen.py %{buildroot}%{_bindir}
 #
 # configs
 #
@@ -93,6 +116,13 @@ do
           ln -fs $file $(echo $file | sed -e 's/\(\.so\)\.[0-9]\+.*/\1/') )
 done
 
+# Python bindings
+mkdir -p -m755 %{buildroot}%{python2_sitelib}/vpp_papi
+for file in $(find %{_vpp_install_dir}/*/lib/python2.7/site-packages/ -type f -print | grep -v pyc | grep -v pyo)
+do
+       install -p -m 666 $file %{buildroot}%{python2_sitelib}/vpp_papi/
+done
+
 #
 # devel
 #
@@ -144,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)
@@ -162,10 +213,15 @@ sysctl --system
 %exclude %{_libdir}/vpp_api_test_plugins
 %{_libdir}/*
 
+%files python-api
+%defattr(644,root,root)
+%{python2_sitelib}/vpp_papi/*
+
 %files devel
 %defattr(-,bin,bin)
 /usr/bin/vppapigen
 /usr/bin/jvpp_gen.py
+/usr/bin/pyvppapigen.py
 %{_includedir}/*
 %{python2_sitelib}/jvppgen/*
 /usr/share/doc/vpp/examples/sample-plugin