diff options
| author |   Thomas F Herbert <therbert@redhat.com> | 2017-08-03 11:04:24 -0400 |
|---|---|---|
| committer | Thomas F Herbert <therbert@redhat.com> | 2017-08-26 18:27:06 -0400 |
| commit | bd8e242024fcc2daffa77bdd6e2da1296ace5c69 (patch) | |
| tree | 7f61cc6cd80c2442b24fbf9967f1b7a06b28a906 /extras/rpm | |
| parent | d05282983af7728a5b3980eb25bf4a14c663b15a (diff) | |
Add Build Requirements from Makefile to spec file.
JIRA: VPP-498
Changes to build to help with downstream distro builds
for Fedora, Centos and RHEL distros.
Add nasm, automake, libtool, byacc, bison and flex.
Remove libconfuse and dependencies.
Remove epel-release rpm and dependencies.
Add conditionals to work around Python 2 packaging
inconsistency in Fed 25.
Add numactl to rpm requirements.
Change-Id: Ia39f8b931dc87e42df56414d38662eb33c7a4ca7
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
Diffstat (limited to 'extras/rpm')
| -rw-r--r-- | extras/rpm/vpp.spec | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec index ffb6382fefd..439e6bdaf41 100644 --- a/extras/rpm/vpp.spec +++ b/extras/rpm/vpp.spec @@ -29,6 +29,21 @@ Version: %{_version} Release: %{_release} Requires: vpp-lib = %{_version}-%{_release}, net-tools, pciutils, python BuildRequires: systemd, chrpath +BuildRequires: libffi-devel, openssl-devel +%if 0%{?fedora} >= 26 +BuildRequires: python2-devel, python2-virtualenv +%else +%if 0%{?fedora} == 25 +BuildRequires: python-devel, python2-virtualenv +%else +BuildRequires: python-devel, python-virtualenv +%endif +%endif +BuildRequires: glibc-static, java-1.8.0-openjdk, java-1.8.0-openjdk-devel yum-utils, redhat-lsb +BuildRequires: apr-devel +BuildRequires: nasm +BuildRequires: numactl-devel +BuildRequires: autoconf automake libtool byacc bison flex Source: %{name}-%{_version}-%{_release}.tar.xz # Source: vpp-latest.tar.xz @@ -156,10 +171,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 +211,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 |