X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Frpm%2Fvpp.spec;h=bf2d83a84c8c782bd4f26aef3cef3dafba3e50ad;hb=refs%2Fchanges%2F33%2F16133%2F2;hp=fe4f3d8399989d3d7bc4322717147cb76bd27e85;hpb=30ec82161f5dd943fbc88e5bcfccfed66d1bf1a2;p=vpp.git diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec index fe4f3d83999..bf2d83a84c8 100644 --- a/extras/rpm/vpp.spec +++ b/extras/rpm/vpp.spec @@ -3,8 +3,7 @@ %define _vpp_build_dir build-tool-native %define _unitdir /lib/systemd/system %define _builddir %{_topdir} -%define _tmp_build_dir %{name}-%{_version}.0 -%define _mu_build_dir %{_topdir}/%{_tmp_build_dir}/build-root +%define _mu_build_dir %{_topdir}/%{name}-%{_version}/build-root %define _vpp_tag %{getenv:TAG} %if "%{_vpp_tag}" == "" %define _vpp_tag vpp @@ -50,17 +49,20 @@ Release: %{_release} Requires: vpp-lib = %{_version}-%{_release}, vpp-selinux-policy = %{_version}-%{_release}, net-tools, pciutils, python BuildRequires: systemd, chrpath BuildRequires: check, check-devel -BuildRequires: subunit, subunit-devel %if 0%{?fedora} >= 26 +BuildRequires: subunit, subunit-devel BuildRequires: compat-openssl10-devel -BuildRequires: python2-devel, python2-virtualenv +BuildRequires: python2-devel, python2-virtualenv, python2-ply +BuildRequires: mbedtls-devel %else %if 0%{?fedora} == 25 +BuildRequires: subunit, subunit-devel BuildRequires: openssl-devel -BuildRequires: python-devel, python2-virtualenv +BuildRequires: python-devel, python2-virtualenv, python2-ply +BuildRequires: mbedtls-devel %else BuildREquires: openssl-devel -BuildRequires: python-devel, python-virtualenv +BuildRequires: python-devel, python-virtualenv, python-ply %endif %endif BuildRequires: libffi-devel @@ -70,7 +72,6 @@ BuildRequires: numactl-devel BuildRequires: autoconf automake libtool byacc bison flex BuildRequires: boost boost-devel BuildRequires: selinux-policy selinux-policy-devel -BuildRequires: mbedtls-devel Source: %{name}-%{_version}-%{_release}.tar.xz # Source: vpp-latest.tar.xz @@ -149,20 +150,13 @@ Requires(post): selinux-policy-base >= %{selinux_policyver}, selinux-policy-targ This package contains a tailored VPP SELinux policy %prep -# 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 . +%setup -q -n %{name}-%{_version} %pre # Add the vpp group groupadd -f -r vpp %build -cd '%{_tmp_build_dir}' %if %{with aesni} make bootstrap make -C build-root PLATFORM=vpp TAG=%{_vpp_tag} install-packages @@ -198,7 +192,7 @@ install -p -m 644 %{_mu_build_dir}/../src/vpp/conf/80-vpp.conf %{buildroot}/etc/ mkdir -p -m755 %{buildroot}%{_libdir} mkdir -p -m755 %{buildroot}/etc/bash_completion.d mkdir -p -m755 %{buildroot}/usr/share/vpp -for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/*/lib* -type f -name '*.so.*.*.*' -print ) +for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/*/lib* -type f -name '*.so.*.*' -print ) do install -p -m 755 $file %{buildroot}%{_libdir} done @@ -214,8 +208,6 @@ for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/vpp/share/vpp/api -type do install -p -m 644 $file %{buildroot}/usr/share/vpp/api done -install -p -m 644 %{_mu_build_dir}/../src/scripts/vppctl_completion %{buildroot}/etc/bash_completion.d -install -p -m 644 %{_mu_build_dir}/../src/scripts/vppctl-cmd-list %{buildroot}/usr/share/vpp # Lua bindings mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/lua/examples/cli @@ -229,7 +221,7 @@ done # Java bindings mkdir -p -m755 %{buildroot}/usr/share/java -for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/vpp/share/java -type f -name '*.jar' -print ) +for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/japi/share/java -type f -name '*.jar' -print ) do install -p -m 644 $file %{buildroot}/usr/share/java done @@ -266,13 +258,13 @@ do done mkdir -p -m755 %{buildroot}%{python2_sitelib}/jvppgen -install -p -m755 %{_mu_build_dir}/../src/vpp-api/java/jvpp/gen/jvpp_gen.py %{buildroot}/usr/bin -for i in $(ls %{_mu_build_dir}/../src/vpp-api/java/jvpp/gen/jvppgen/*.py); do +install -p -m755 %{_mu_build_dir}/../extras/japi/java/jvpp/gen/jvpp_gen.py %{buildroot}/usr/bin +for i in $(ls %{_mu_build_dir}/../extras/japi/java/jvpp/gen/jvppgen/*.py); do install -p -m666 ${i} %{buildroot}%{python2_sitelib}/jvppgen done; -install -p -m 644 %{_mu_build_dir}/../src/tools/vppapigen/C.py %{buildroot}/usr/share/vpp -install -p -m 644 %{_mu_build_dir}/../src/tools/vppapigen/JSON.py %{buildroot}/usr/share/vpp +install -p -m 644 %{_mu_build_dir}/../src/tools/vppapigen/vppapigen_c.py %{buildroot}/usr/share/vpp +install -p -m 644 %{_mu_build_dir}/../src/tools/vppapigen/vppapigen_json.py %{buildroot}/usr/share/vpp # sample plugin mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/sample-plugin/sample @@ -290,22 +282,22 @@ mkdir -p -m755 %{buildroot}%{_localstatedir}/log/vpp # # vpp-plugins -# +# mkdir -p -m755 %{buildroot}/usr/lib/vpp_plugins mkdir -p -m755 %{buildroot}/usr/lib/vpp_api_test_plugins -for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_plugins && find -type f -print) +for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib/vpp_plugins && find -type f -print) do - install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_plugins/$file \ + install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib/vpp_plugins/$file \ %{buildroot}/usr/lib/vpp_plugins/$file done -for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_api_test_plugins && find -type f -print) +for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib/vpp_api_test_plugins && find -type f -print) do - install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_api_test_plugins/$file \ + install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib/vpp_api_test_plugins/$file \ %{buildroot}/usr/lib/vpp_api_test_plugins/$file done -for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/plugins -type f -name '*.api.json' -print ) +for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/vpp/share/vpp/api/plugins -type f -name '*.api.json' -print ) do install -p -m 644 $file %{buildroot}/usr/share/vpp/api done @@ -385,12 +377,11 @@ fi %files lib %defattr(-,bin,bin) +%global __requires_exclude_from %{_libdir}/librte_pmd_mlx[45]_glue\\.so.*$ %exclude %{_libdir}/vpp_plugins %exclude %{_libdir}/vpp_api_test_plugins %{_libdir}/* /usr/share/vpp/api/* -/etc/bash_completion.d/vppctl_completion -/usr/share/vpp/vppctl-cmd-list %files api-lua %defattr(644,root,root,644) @@ -401,8 +392,8 @@ fi /usr/share/java/* %files api-python -%defattr(644,root,root) -%{python2_sitelib}/vpp_papi* +%defattr(644,root,root,755) +%{python2_sitelib}/vpp_* %files selinux-policy %defattr(-,root,root,0755)