Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
PAPI: Expose API enums to tests / applications
[vpp.git]
/
extras
/
rpm
/
vpp-suse.spec
diff --git
a/extras/rpm/vpp-suse.spec
b/extras/rpm/vpp-suse.spec
index
2649081
..
91e12ba
100644
(file)
--- a/
extras/rpm/vpp-suse.spec
+++ b/
extras/rpm/vpp-suse.spec
@@
-1,7
+1,7
@@
#
# spec file for package vpp
#
#
# spec file for package vpp
#
-# Copyright (c) 201
7
SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 201
8
SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@
-18,7
+18,7
@@
%define _vpp_build_dir %{buildroot}/../../BUILD/vpp-%{version}/build-root
%define _vpp_install_dir %{_vpp_build_dir}/install-vpp-native/
%define _vpp_build_dir %{buildroot}/../../BUILD/vpp-%{version}/build-root
%define _vpp_install_dir %{_vpp_build_dir}/install-vpp-native/
-%define _vpp_plugins_lib_dir %{_vpp_install_dir}/vpp/lib
64
+%define _vpp_plugins_lib_dir %{_vpp_install_dir}/vpp/lib
%define lname libvpp0
%define lname libvpp0
@@
-38,17
+38,23
@@
BuildRequires: check-devel
BuildRequires: chrpath
BuildRequires: distribution-release
BuildRequires: gcc
BuildRequires: chrpath
BuildRequires: distribution-release
BuildRequires: gcc
+BuildRequires: gcc-c++
+BuildRequires: glibc-devel
BuildRequires: glibc-devel-static
BuildRequires: glibc-devel-static
-BuildRequires: java-1_8_0-openjdk-devel
+BuildRequires: java-devel >= 1.8
+BuildRequires: libboost_headers-devel
+BuildRequires: libboost_thread-devel
BuildRequires: libnuma-devel
BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: lsb-release
BuildRequires: make
BuildRequires: libnuma-devel
BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: lsb-release
BuildRequires: make
+BuildRequires: mbedtls-devel
BuildRequires: openssl-devel
BuildRequires: python-devel
BuildRequires: python-pip
BuildRequires: python-rpm-macros
BuildRequires: openssl-devel
BuildRequires: python-devel
BuildRequires: python-pip
BuildRequires: python-rpm-macros
+BuildRequires: python2-ply
BuildRequires: python3-devel
BuildRequires: python3-pip
BuildRequires: shadow
BuildRequires: python3-devel
BuildRequires: python3-pip
BuildRequires: shadow
@@
-112,6
+118,7
@@
Summary: VPP api lua bindings
Group: Development/Libraries/Other
Requires: %{lname} = %{version}
Requires: %{name} = %{version}
Group: Development/Libraries/Other
Requires: %{lname} = %{version}
Requires: %{name} = %{version}
+Requires: %{name}-devel = %{version}
Conflicts: otherproviders(%{name}-any-api-lua)
Provides: %{name}-any-api-lua = %{version}
Conflicts: otherproviders(%{name}-any-api-lua)
Provides: %{name}-any-api-lua = %{version}
@@
-123,6
+130,7
@@
Summary: VPP api java bindings
Group: Development/Libraries/Java
Requires: %{lname} = %{version}
Requires: %{name} = %{version}
Group: Development/Libraries/Java
Requires: %{lname} = %{version}
Requires: %{name} = %{version}
+Requires: %{name}-devel = %{version}
Conflicts: otherproviders(%{name}-any-api-java)
Provides: %{name}-any-api-java = %{version}
Conflicts: otherproviders(%{name}-any-api-java)
Provides: %{name}-any-api-java = %{version}
@@
-134,6
+142,7
@@
Summary: VPP api python bindings
Group: Development/Libraries/Python
Requires: %{lname} = %{version}
Requires: %{name} = %{version}
Group: Development/Libraries/Python
Requires: %{lname} = %{version}
Requires: %{name} = %{version}
+Requires: %{name}-devel = %{version}
Requires: python-setuptools
Conflicts: otherproviders(%{name}-any-python-api)
Provides: %{name}-any-python-api = %{version}
Requires: python-setuptools
Conflicts: otherproviders(%{name}-any-python-api)
Provides: %{name}-any-python-api = %{version}
@@
-148,8
+157,7
@@
This package contains the python bindings for the vpp api
export VPP_BUILD_USER=suse
export VPP_BUILD_HOST=SUSE
export VPP_BUILD_USER=suse
export VPP_BUILD_HOST=SUSE
-make V=1 PLATFORM=vpp bootstrap
-make V=1 PLATFORM=vpp build-release
+make -C build-root V=1 CC=gcc-7 CXX=g++-7 PLATFORM=vpp TAG=vpp install-packages
cd %{_vpp_build_dir}/../src/vpp-api/python && %{py2_build}
cd %{_vpp_build_dir}/../src/vpp-api/python && %{py2_build}
@@
-174,7
+182,7
@@
mkdir -p -m755 %{buildroot}%{_datadir}/vpp/api
#
mkdir -p -m755 %{buildroot}%{_datadir}/vpp/api
install -p -m 644 %{_vpp_install_dir}/vpp/share/vpp/api/core/*.api.json %{buildroot}%{_datadir}/vpp/api
#
mkdir -p -m755 %{buildroot}%{_datadir}/vpp/api
install -p -m 644 %{_vpp_install_dir}/vpp/share/vpp/api/core/*.api.json %{buildroot}%{_datadir}/vpp/api
-install -p -m 644 %{_vpp_install_dir}/vpp/share/vpp/api/plugins/*.api.json %{buildroot}%{_datadir}/vpp/api
+
#
# configs
#
#
# configs
#
@@
-189,7
+197,7
@@
install -p -m 644 %{_vpp_build_dir}/../src/vpp/conf/80-vpp.conf %{buildroot}%{_s
mkdir -p -m755 %{buildroot}%{_libdir}
mkdir -p -m755 %{buildroot}%{_sysconfdir}/bash_completion.d
mkdir -p -m755 %{buildroot}%{_datadir}/vpp
mkdir -p -m755 %{buildroot}%{_libdir}
mkdir -p -m755 %{buildroot}%{_sysconfdir}/bash_completion.d
mkdir -p -m755 %{buildroot}%{_datadir}/vpp
-for file in $(find %{_vpp_install_dir}/*/lib* -type f -name '*.so.*.*
.*
' -print )
+for file in $(find %{_vpp_install_dir}/*/lib* -type f -name '*.so.*.*' -print )
do
install -p -m 755 $file %{buildroot}%{_libdir}
done
do
install -p -m 755 $file %{buildroot}%{_libdir}
done
@@
-205,8
+213,6
@@
for file in $(find %{_vpp_install_dir}/vpp/share/vpp/api -type f -name '*.api.j
do
install -p -m 644 $file %{buildroot}%{_datadir}/vpp/api
done
do
install -p -m 644 $file %{buildroot}%{_datadir}/vpp/api
done
-install -p -m 644 %{_vpp_build_dir}/../src/scripts/vppctl_completion %{buildroot}%{_sysconfdir}/bash_completion.d
-install -p -m 644 %{_vpp_build_dir}/../src/scripts/vppctl-cmd-list %{buildroot}%{_datadir}/vpp
# Lua bindings
mkdir -p -m755 %{buildroot}%{_datadir}/doc/vpp/examples/lua/examples/cli
# Lua bindings
mkdir -p -m755 %{buildroot}%{_datadir}/doc/vpp/examples/lua/examples/cli
@@
-219,7
+225,7
@@
done
# Java bindings
mkdir -p -m755 %{buildroot}%{_datadir}/java
# Java bindings
mkdir -p -m755 %{buildroot}%{_datadir}/java
-for file in $(find %{_vpp_install_dir}/
vpp
/share/java -type f -name '*.jar' -print )
+for file in $(find %{_vpp_install_dir}/
japi
/share/java -type f -name '*.jar' -print )
do
install -p -m 644 $file %{buildroot}%{_datadir}/java
done
do
install -p -m 644 $file %{buildroot}%{_datadir}/java
done
@@
-250,8
+256,8
@@
do
done
mkdir -p -m755 %{buildroot}%{python_sitelib}/jvppgen
done
mkdir -p -m755 %{buildroot}%{python_sitelib}/jvppgen
-install -p -m755 %{_vpp_build_dir}/../
src/vpp-
api/java/jvpp/gen/jvpp_gen.py %{buildroot}%{_prefix}/bin
-for i in $(ls %{_vpp_build_dir}/../
src/vpp-
api/java/jvpp/gen/jvppgen/*.py); do
+install -p -m755 %{_vpp_build_dir}/../
extras/j
api/java/jvpp/gen/jvpp_gen.py %{buildroot}%{_prefix}/bin
+for i in $(ls %{_vpp_build_dir}/../
extras/j
api/java/jvpp/gen/jvppgen/*.py); do
install -p -m755 ${i} %{buildroot}%{python_sitelib}/jvppgen
done;
install -p -m755 ${i} %{buildroot}%{python_sitelib}/jvppgen
done;
@@
-280,7
+286,7
@@
do
%{buildroot}/%{_libdir}/vpp_api_test_plugins/$file
done
%{buildroot}/%{_libdir}/vpp_api_test_plugins/$file
done
-for file in $(find %{_vpp_install_dir}/plugins -type f -name '*.api.json' -print )
+for file in $(find %{_vpp_install_dir}/
vpp/share/vpp/api/
plugins -type f -name '*.api.json' -print )
do
install -p -m 644 $file %{buildroot}%{_datadir}/vpp/api
done
do
install -p -m 644 $file %{buildroot}%{_datadir}/vpp/api
done
@@
-313,9
+319,7
@@
export NO_BRP_CHECK_RPATH=true
%dir %{_sysconfdir}/vpp
%config %{_sysconfdir}/sysctl.d/80-vpp.conf
%config %{_sysconfdir}/vpp/startup.conf
%dir %{_sysconfdir}/vpp
%config %{_sysconfdir}/sysctl.d/80-vpp.conf
%config %{_sysconfdir}/vpp/startup.conf
-%{_sysconfdir}/bash_completion.d/vppctl_completion
-%{_datadir}/vpp/vppctl-cmd-list
-%doc LICENSE
+%license LICENSE
%files -n %{lname}
%exclude %{_libdir}/vpp_plugins
%files -n %{lname}
%exclude %{_libdir}/vpp_plugins
@@
-330,7
+334,7
@@
export NO_BRP_CHECK_RPATH=true
%files api-python
%dir %{python_sitelib}/vpp_papi*
%files api-python
%dir %{python_sitelib}/vpp_papi*
-%{python_sitelib}/vpp_*
+%{python_sitelib}/vpp_
papi
*
%files devel
%dir %{python_sitelib}/jvppgen
%files devel
%dir %{python_sitelib}/jvppgen