X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Frpm%2Fvpp.spec;h=532b9a219d4f0800b11ae5b6fd65cd90c33ee698;hb=82119542a895533e740952cc788076975204f71e;hp=1633e0ff76aef3876664e4ce19037c67f660a251;hpb=f6e3ad0f5e2be10a91b2a52c91e7792ec212dee9;p=vpp.git diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec index 1633e0ff76a..532b9a219d4 100644 --- a/extras/rpm/vpp.spec +++ b/extras/rpm/vpp.spec @@ -1,8 +1,10 @@ +%bcond_without aesni +%{!?_topdir:%define _topdir %(pwd)} %define _vpp_build_dir build-tool-native %define _unitdir /lib/systemd/system -%define _topdir %(pwd) %define _builddir %{_topdir} -%define _mu_build_dir %{_topdir}/%{name}-%{_version}/build-root +%define _tmp_build_dir %{name}-%{_version}.0 +%define _mu_build_dir %{_topdir}/%{_tmp_build_dir}/build-root %define _vpp_tag %{getenv:TAG} %if "%{_vpp_tag}" == "" %define _vpp_tag vpp @@ -29,9 +31,29 @@ Version: %{_version} Release: %{_release} Requires: vpp-lib = %{_version}-%{_release}, net-tools, pciutils, python BuildRequires: systemd, chrpath +BuildRequires: check, check-devel +BuildRequires: subunit, subunit-devel +%if 0%{?fedora} >= 26 +BuildRequires: compat-openssl10-devel +BuildRequires: python2-devel, python2-virtualenv +%else +%if 0%{?fedora} == 25 +BuildRequires: openssl-devel +BuildRequires: python-devel, python2-virtualenv +%else +BuildREquires: openssl-devel +BuildRequires: python-devel, python-virtualenv +%endif +%endif +BuildRequires: libffi-devel +BuildRequires: glibc-static, java-1.8.0-openjdk, java-1.8.0-openjdk-devel yum-utils, redhat-lsb +BuildRequires: apr-devel +BuildRequires: numactl-devel +BuildRequires: autoconf automake libtool byacc bison flex +BuildRequires: boost boost-devel -# Source: %{name}-%{_version}-%{_release}.tar.xz -Source: vpp-latest.tar.xz +Source: %{name}-%{_version}-%{_release}.tar.xz +# Source: vpp-latest.tar.xz %description This package provides VPP executables: vpp, vpp_api_test, vpp_json_test @@ -69,7 +91,7 @@ vppinfra %package plugins Summary: Vector Packet Processing--runtime plugins Group: System Environment/Libraries -Requires: vpp = %{_version}-%{_release} +Requires: vpp = %{_version}-%{_release} numactl-libs %description plugins This package contains VPP plugins @@ -98,15 +120,27 @@ Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}, pyth This package contains the python bindings for the vpp api %prep -%setup -q -n %{name}-%{_version} +# Unpack into dir with longer name as work around of debugedit bug in in rpm-build 4.13 +rm -rf %{name}-%{_version} +rm -rf %{_tmp_build_dir} +/usr/bin/xz -dc '%{_sourcedir}/%{name}-%{_version}-%{_release}.tar.xz' | /usr/bin/tar -xf - +mv %{name}-%{_version} %{_tmp_build_dir} +cd '%{_tmp_build_dir}' +/usr/bin/chmod -Rf a+rX,u+w,g-w,o-w . %pre # Add the vpp group groupadd -f -r vpp %build -make bootstrap -make -C build-root PLATFORM=vpp TAG=%{_vpp_tag} install-packages +cd '%{_tmp_build_dir}' +%if %{with aesni} + make bootstrap + make -C build-root PLATFORM=vpp TAG=%{_vpp_tag} install-packages +%else + make bootstrap AESNI=n + make -C build-root PLATFORM=vpp AESNI=n TAG=%{_vpp_tag} install-packages +%endif cd %{_mu_build_dir}/../src/vpp-api/python && %py2_build %install @@ -125,7 +159,7 @@ mkdir -p -m755 %{buildroot}/usr/share/vpp/api # mkdir -p -m755 %{buildroot}/etc/vpp mkdir -p -m755 %{buildroot}/etc/sysctl.d -install -p -m 644 %{_topdir}/vpp.service %{buildroot}%{_unitdir} +install -p -m 644 %{_mu_build_dir}/../extras/rpm/vpp.service %{buildroot}%{_unitdir} install -p -m 644 %{_mu_build_dir}/../src/vpp/conf/startup.conf %{buildroot}/etc/vpp/startup.conf install -p -m 644 %{_mu_build_dir}/../src/vpp/conf/80-vpp.conf %{buildroot}/etc/sysctl.d # @@ -156,10 +190,11 @@ install -p -m 644 %{_mu_build_dir}/../src/scripts/vppctl-cmd-list %{buildroot}/u # Lua bindings mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/lua/examples/cli mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/lua/examples/lute -for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/vpp-api/lua && git ls-files .) +# for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/vpp-api/lua && git ls-files .) +for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/vpp-api/lua && find . -type f -regex '.*/*.[luteamd]' -print | sed -e 's/^\.\///') do - install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/../../src/vpp-api/lua/$file \ - %{buildroot}/usr/share/doc/vpp/examples/lua/$file + ( cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/vpp-api/lua && install -p -m 644 $file \ + %{buildroot}/usr/share/doc/vpp/examples/lua/$file ) done # Java bindings @@ -195,10 +230,11 @@ done; # sample plugin mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/sample-plugin/sample -for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/examples/sample-plugin && git ls-files .) +#for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/examples/sample-plugin && git ls-files .) +for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/examples/sample-plugin && find . -type f -regex '.*/*.[acdhimp]' -print | sed -e 's/^\.\///') do - install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/../../src/examples/sample-plugin/$file \ - %{buildroot}/usr/share/doc/vpp/examples/sample-plugin/$file + ( cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/examples/sample-plugin && install -p -m 644 $file \ + %{buildroot}/usr/share/doc/vpp/examples/sample-plugin/$file ) done @@ -230,7 +266,9 @@ done %{_mu_build_dir}/scripts/remove-rpath %{buildroot} %post -sysctl --system +if [ $1 -eq 1 ] ; then + sysctl --system +fi %systemd_post vpp.service %preun @@ -238,23 +276,27 @@ sysctl --system %postun %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 ${f##*/} > ${d}/unbind - basename `dirname ${f}` | xargs echo -n "Removing driver"; echo " for PCI ID" `basename ${f}` - removed=y +if [ $1 -eq 0 ] ; then + echo "Uninstalling, unbind user-mode PCI drivers" + # 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 ${f##*/} > ${d}/unbind + basename `dirname ${f}` | xargs echo -n "Removing driver"; echo " for PCI ID" `basename ${f}` + removed=y + done done -done -if [ -n "${removed}" ]; then - echo "There are changes in PCI drivers, rescaning" - echo 1 > /sys/bus/pci/rescan + 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 else - echo "There weren't PCI devices binded" + echo "Upgrading package, dont' unbind interfaces" fi %files @@ -263,8 +305,8 @@ fi /usr/bin/vpp* /usr/bin/svm* /usr/bin/elftool -%config /etc/sysctl.d/80-vpp.conf -%config /etc/vpp/startup.conf +%config(noreplace) /etc/sysctl.d/80-vpp.conf +%config(noreplace) /etc/vpp/startup.conf /usr/share/vpp/api/* %files lib @@ -295,6 +337,7 @@ fi %{_includedir}/* %{python2_sitelib}/jvppgen/* /usr/share/doc/vpp/examples/sample-plugin +/usr/share/vpp %files plugins %defattr(-,bin,bin)