From bfcd23968246086b5b884f7df1e78adb1a059724 Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Tue, 30 Nov 2021 11:00:23 -0500 Subject: [PATCH] build rpm-packaging: Remove boost dependencies from VOM - VOM was deprecated in VPP 21.06, but the boost library dependencies did not get cleaned up. Type: make Signed-off-by: Dave Wallace Change-Id: I0fb860a7a37676c1a1a0981c91f383882d9a820a --- Makefile | 4 ++-- extras/rpm/opensuse/vpp.spec | 2 -- extras/rpm/vpp.spec | 5 ++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 52f4a2655cb..50f33bc8922 100644 --- a/Makefile +++ b/Makefile @@ -168,12 +168,12 @@ RPM_SUSE_PLATFORM_DEPS = distribution-release shadow rpm-build ifeq ($(OS_ID),opensuse-leap) ifeq ($(OS_VERSION_ID),15.3) 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_PYTHON_DEPS += python3 python2-ply endif 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 endif endif diff --git a/extras/rpm/opensuse/vpp.spec b/extras/rpm/opensuse/vpp.spec index 2d348f248e1..b725702c687 100644 --- a/extras/rpm/opensuse/vpp.spec +++ b/extras/rpm/opensuse/vpp.spec @@ -41,8 +41,6 @@ BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: glibc-devel BuildRequires: glibc-devel-static -BuildRequires: libboost_headers-devel -BuildRequires: libboost_thread-devel BuildRequires: libnuma-devel BuildRequires: libopenssl-devel BuildRequires: libtool diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec index ac5c93295c4..b5d5fd362b5 100644 --- a/extras/rpm/vpp.spec +++ b/extras/rpm/vpp.spec @@ -41,7 +41,7 @@ BuildRequires: mbedtls-devel mbedtls %if 0%{?fedora} Requires: vpp-lib = %{_version}-%{_release}, vpp-selinux-policy = %{_version}-%{_release}, net-tools, pciutils Requires: compat-openssl10 -Requires: boost-filesystem mbedtls libffi-devel +Requires: mbedtls libffi-devel BuildRequires: subunit, subunit-devel BuildRequires: compat-openssl10-devel BuildRequires: python, python-devel, python-virtualenv, python-ply @@ -50,7 +50,7 @@ BuildRequires: cmake %else %if 0%{rhel} >= 7 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: mbedtls-devel mbedtls BuildREquires: openssl-devel @@ -70,7 +70,6 @@ BuildRequires: redhat-lsb BuildRequires: apr-devel BuildRequires: numactl-devel BuildRequires: autoconf automake libtool byacc bison flex -BuildRequires: boost boost-devel BuildRequires: selinux-policy selinux-policy-devel Source: %{name}-%{_version}-%{_release}.tar.xz -- 2.16.6