ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build rpm-packaging: Remove boost dependencies from VOM

Browse Source 
- VOM was deprecated in VPP 21.06, but the boost library
  dependencies did not get cleaned up.

Type: make

Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: I0fb860a7a37676c1a1a0981c91f383882d9a820a
This commit is contained in:
Dave Wallace
2021-11-30 11:00:23 -05:00
committed by Andrew Yourtchenko
parent 8d42c75d6c
commit bfcd239682
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -168,12 +168,12 @@ RPM_SUSE_PLATFORM_DEPS = distribution-release shadow rpm-build
ifeq ($(OS_ID),opensuse-leap) ifeq ($(OS_ID),opensuse-leap)
ifeq ($(OS_VERSION_ID),15.3) ifeq ($(OS_VERSION_ID),15.3)
RPM_SUSE_DEVEL_DEPS += curl libstdc++-devel bison gcc-c++ zlib-devel xmlto RPM_SUSE_DEVEL_DEPS += curl libstdc++-devel bison gcc-c++ zlib-devel xmlto
RPM_SUSE_DEVEL_DEPS += libboost_headers-devel libboost_thread-devel lsb-release RPM_SUSE_DEVEL_DEPS += lsb-release
RPM_SUSE_DEVEL_DEPS += asciidoc git RPM_SUSE_DEVEL_DEPS += asciidoc git
RPM_SUSE_PYTHON_DEPS += python3 python2-ply RPM_SUSE_PYTHON_DEPS += python3 python2-ply
endif endif
ifeq ($(OS_VERSION_ID),15.0) ifeq ($(OS_VERSION_ID),15.0)
RPM_SUSE_DEVEL_DEPS += libboost_headers-devel libboost_thread-devel gcc git curl RPM_SUSE_DEVEL_DEPS += gcc git curl
RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv
endif endif
endif endif

2
extras/rpm/opensuse/vpp.spec
View File

@ -41,8 +41,6 @@ BuildRequires: gcc
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: glibc-devel BuildRequires: glibc-devel
BuildRequires: glibc-devel-static BuildRequires: glibc-devel-static
BuildRequires: libboost_headers-devel
BuildRequires: libboost_thread-devel
BuildRequires: libnuma-devel BuildRequires: libnuma-devel
BuildRequires: libopenssl-devel BuildRequires: libopenssl-devel
BuildRequires: libtool BuildRequires: libtool

5
extras/rpm/vpp.spec
View File

@ -41,7 +41,7 @@ BuildRequires: mbedtls-devel mbedtls
%if 0%{?fedora} %if 0%{?fedora}
Requires: vpp-lib = %{_version}-%{_release}, vpp-selinux-policy = %{_version}-%{_release}, net-tools, pciutils Requires: vpp-lib = %{_version}-%{_release}, vpp-selinux-policy = %{_version}-%{_release}, net-tools, pciutils
Requires: compat-openssl10 Requires: compat-openssl10
Requires: boost-filesystem mbedtls libffi-devel Requires: mbedtls libffi-devel
BuildRequires: subunit, subunit-devel BuildRequires: subunit, subunit-devel
BuildRequires: compat-openssl10-devel BuildRequires: compat-openssl10-devel
BuildRequires: python, python-devel, python-virtualenv, python-ply BuildRequires: python, python-devel, python-virtualenv, python-ply
@ -50,7 +50,7 @@ BuildRequires: cmake
%else %else
%if 0%{rhel} >= 7 %if 0%{rhel} >= 7
Requires: vpp-lib = %{_version}-%{_release}, vpp-selinux-policy = %{_version}-%{_release}, net-tools, pciutils, python36 Requires: vpp-lib = %{_version}-%{_release}, vpp-selinux-policy = %{_version}-%{_release}, net-tools, pciutils, python36
Requires: boost-filesystem mbedtls libffi-devel Requires: mbedtls libffi-devel
BuildRequires: epel-release BuildRequires: epel-release
BuildRequires: mbedtls-devel mbedtls BuildRequires: mbedtls-devel mbedtls
BuildREquires: openssl-devel BuildREquires: openssl-devel
@ -70,7 +70,6 @@ BuildRequires: redhat-lsb
BuildRequires: apr-devel BuildRequires: apr-devel
BuildRequires: numactl-devel BuildRequires: numactl-devel
BuildRequires: autoconf automake libtool byacc bison flex BuildRequires: autoconf automake libtool byacc bison flex
BuildRequires: boost boost-devel
BuildRequires: selinux-policy selinux-policy-devel BuildRequires: selinux-policy selinux-policy-devel
Source: %{name}-%{_version}-%{_release}.tar.xz Source: %{name}-%{_version}-%{_release}.tar.xz