summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorDave Wallace <dwallacelf@gmail.com>2020-09-18 15:35:01 +0000
committerAndrew Yourtchenko <ayourtch@gmail.com>2020-09-22 11:35:12 +0000
commitd88c9a13e82986b3e3d477beaa7f528e819868b6 (patch)
tree70d98336a5e3e1166d61ec902af0d6f696dc11af /extras
parentdd49451845c19f803858429b58b1b95298b93fff (diff)
build: remove opensuse build infra
- VPP on opensuse has not been supported for several releases. Type: fix Signed-off-by: Dave Wallace <dwallacelf@gmail.com> Change-Id: I2b5316ad5c20a843b8936f4ceb473f932a5338d9 (cherry picked from commit bc35f469c89daf0126937580b6972516b5007d3a)
Diffstat (limited to 'extras')
-rw-r--r--extras/rpm/Makefile11
-rw-r--r--extras/rpm/vpp-suse.spec325
-rw-r--r--extras/vagrant/Vagrantfile3
-rwxr-xr-xextras/vagrant/build.sh2
-rwxr-xr-xextras/vagrant/run.sh6
5 files changed, 3 insertions, 344 deletions
diff --git a/extras/rpm/Makefile b/extras/rpm/Makefile
index 423c4207b02..0736b7f6a4b 100644
--- a/extras/rpm/Makefile
+++ b/extras/rpm/Makefile
@@ -26,18 +26,7 @@ PC=%
all: RPM
-# SUSE rolling-release (a.k.a. Tumbleweed)
-ifeq ($(filter opensuse-tumbleweed,$(OS_ID)),$(OS_ID))
-SPEC_FILE='vpp-suse.spec'
-# SUSE osleap15
-else ifeq ($(filter opensuse-leap,$(OS_ID)),$(OS_ID))
-SPEC_FILE='vpp-suse.spec'
-# SUSE leap42.x
-else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID))
-SPEC_FILE='vpp-suse.spec'
-else
SPEC_FILE='vpp.spec'
-endif
spec:
@echo $(TARBALL)
diff --git a/extras/rpm/vpp-suse.spec b/extras/rpm/vpp-suse.spec
deleted file mode 100644
index 4bb354cda90..00000000000
--- a/extras/rpm/vpp-suse.spec
+++ /dev/null
@@ -1,325 +0,0 @@
-#
-# spec file for package vpp
-#
-# Copyright (c) 2018 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
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-
-%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
-
-%define lname libvpp0
-
-Name: vpp
-Version: %{_version}
-Release: %{_release}
-Summary: Set of libraries and drivers for fast packet processing
-License: Apache-2.0
-Group: Productivity/Networking/Routing
-Url: https://wiki.fd.io/view/VPP
-Source0: %{name}-%{version}-%{_release}.tar.xz
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: bison
-BuildRequires: ccache
-BuildRequires: check-devel
-BuildRequires: chrpath
-BuildRequires: distribution-release
-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
-BuildRequires: lsb-release
-BuildRequires: make
-BuildRequires: mbedtls-devel
-BuildRequires: openssl-devel
-BuildRequires: python-devel
-BuildRequires: python-pip
-BuildRequires: python-rpm-macros
-BuildRequires: python2-ply
-BuildRequires: python3-devel
-BuildRequires: python3-pip
-BuildRequires: shadow
-Conflicts: otherproviders(vpp-any)
-Provides: %{name}-any = %{version}
-ExclusiveArch: x86_64 aarch64
-%if 0%{?suse_version} >= 1210
-BuildRequires: systemd-rpm-macros
-%endif
-
-%description
-The Vector Packet Processing platform is a framework that provides
-switch/router functionality. It is based on Cisco's packet processing
-stack that can run on commodity CPUs.
-This package provides VPP executables: vpp, vpp_api_test, vpp_json_test
-vpp - the vector packet engine
-vpp_api_test - vector packet engine API test tool
-vpp_json_test - vector packet engine JSON test tool
-
-%package -n %{lname}
-Summary: VPP libraries
-Group: System/Libraries
-Provides: %{lname}-any = %{version}
-
-%description -n %{lname}
-This package contains the VPP shared libraries, including:
-vppinfra - foundation library supporting vectors, hashes, bitmaps, pools, and string formatting.
-svm - vm library
-vlib - vector processing library
-vlib-api - binary API library
-vnet - network stack library
-
-%package devel
-Summary: VPP header files, static libraries
-Group: Development/Libraries/C and C++
-Requires: %{lname} = %{version}
-Conflicts: otherproviders(%{name}-any-devel)
-Provides: %{name}-any-devel = %{version}
-
-%description devel
-This package contains the header files for VPP.
-Install this package if you want to write a
-program for compilation and linking with vpp lib.
-vlib
-vlibmemory
-vnet - devices, classify, dhcp, ethernet flow, gre, ip, etc.
-vpp-api
-vppinfra
-
-%package plugins
-Summary: Vector Packet Processing--runtime plugins
-Group: Productivity/Networking/Routing
-Conflicts: otherproviders(%{name}-any-plugins)
-Provides: %{name}-any-plugins = %{version}
-
-%description plugins
-This package contains the VPP plugins which are loaded by VPP at startup
-
-%package api-lua
-Summary: VPP api lua bindings
-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}
-
-%description api-lua
-This package contains the lua bindings for the vpp api
-
-%package api-python
-Summary: VPP api python bindings
-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}
-
-%description api-python
-This package contains the python bindings for the vpp api
-
-%prep
-%setup -q -n %{name}-%{version}
-
-%build
-export VPP_BUILD_USER=suse
-export VPP_BUILD_HOST=SUSE
-
-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}
-
-%pre
-# Add the vpp group
-getent group vpp >/dev/null || groupadd -r vpp
-%service_add_pre vpp.service
-
-%install
-#
-# binaries
-#
-mkdir -p -m755 %{buildroot}%{_bindir}
-mkdir -p -m755 %{buildroot}%{_unitdir}
-install -m 755 %{_vpp_install_dir}/*/bin/* %{buildroot}%{_bindir}
-
-# api
-mkdir -p -m755 %{buildroot}%{_datadir}/vpp/api
-
-#
-# core 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
-
-#
-# configs
-#
-mkdir -p -m755 %{buildroot}%{_sysconfdir}/vpp
-mkdir -p -m755 %{buildroot}%{_sysconfdir}/sysctl.d
-install -p -m 644 %{_vpp_build_dir}/../extras/rpm/vpp.service %{buildroot}%{_unitdir}
-install -p -m 644 %{_vpp_build_dir}/../src/vpp/conf/startup.conf %{buildroot}%{_sysconfdir}/vpp/startup.conf
-install -p -m 644 %{_vpp_build_dir}/../src/vpp/conf/80-vpp.conf %{buildroot}%{_sysconfdir}/sysctl.d
-#
-# libraries
-#
-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 )
-do
- install -p -m 755 $file %{buildroot}%{_libdir}
-done
-for file in $(cd %{buildroot}%{_libdir} && find . -type f -print | sed -e 's/^\.\///')
-do
- # make lib symlinks
- ( cd %{buildroot}%{_libdir} &&
- ln -fs $file $(echo $file | sed -e 's/\(\.so\.[0-9]\+\).*/\1/') )
- ( cd %{buildroot}%{_libdir} &&
- ln -fs $file $(echo $file | sed -e 's/\(\.so\)\.[0-9]\+.*/\1/') )
-done
-for file in $(find %{_vpp_install_dir}/vpp/share/vpp/api -type f -name '*.api.json' -print )
-do
- install -p -m 644 $file %{buildroot}%{_datadir}/vpp/api
-done
-
-# Lua bindings
-mkdir -p -m755 %{buildroot}%{_datadir}/doc/vpp/examples/lua/examples/cli
-mkdir -p -m755 %{buildroot}%{_datadir}/doc/vpp/examples/lua/examples/lute
-for file in $(cd %{_vpp_install_dir}/../../src/vpp-api/lua && git ls-files .)
-do
- install -p -m 644 %{_vpp_install_dir}/../../src/vpp-api/lua/$file \
- %{buildroot}%{_datadir}/doc/vpp/examples/lua/$file
-done
-
-# Python bindings
-cd %{_vpp_build_dir}/../src/vpp-api/python && %{py2_install}
-
-mkdir -p -m755 %{buildroot}%{python_sitelib}/vpp_papi
-for file in $(find %{_vpp_install_dir}/*/lib/python2.7/site-packages/ -type f -print | grep -v pyc | grep -v pyo)
-do
- install -p -m755 $file %{buildroot}%{python_sitelib}/vpp_papi/
-done
-chmod -x %{buildroot}%{python_sitelib}/vpp_papi/*.txt
-
-#
-# devel
-#
-for dir in %{_vpp_install_dir}/{vom,vpp}/include/
-do
- for subdir in $(cd ${dir} && find . -type d -print)
- do
- mkdir -p -m755 %{buildroot}%{_includedir}/${subdir}
- done
- for file in $(cd ${dir} && find . -type f -print)
- do
- install -p -m 644 $dir/$file %{buildroot}%{_includedir}/$file
- done
-done
-
-# sample plugin
-mkdir -p -m755 %{buildroot}%{_datadir}/doc/vpp/examples/sample-plugin/sample
-for file in $(cd %{_vpp_install_dir}/../../sample-plugin && find -type f -print)
-do
- install -p -m 644 %{_vpp_install_dir}/../../sample-plugin/$file \
- %{buildroot}%{_datadir}/doc/vpp/examples/sample-plugin/$file
-done
-
-#
-# vpp-plugins
-#
-mkdir -p -m755 %{buildroot}%{_libdir}/vpp_plugins
-mkdir -p -m755 %{buildroot}%{_libdir}/vpp_api_test_plugins
-for file in $(cd %{_vpp_plugins_lib_dir}/vpp_plugins && find -type f -print)
-do
- install -p -m 644 %{_vpp_plugins_lib_dir}/vpp_plugins/$file \
- %{buildroot}/%{_libdir}/vpp_plugins/$file
-done
-
-for file in $(cd %{_vpp_plugins_lib_dir}/vpp_api_test_plugins && find -type f -print)
-do
- install -p -m 644 %{_vpp_plugins_lib_dir}/vpp_api_test_plugins/$file \
- %{buildroot}/%{_libdir}/vpp_api_test_plugins/$file
-done
-
-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
-
-#
-# remove RPATH from ELF binaries
-#
-%{_vpp_build_dir}/scripts/remove-rpath %{buildroot}
-
-export NO_BRP_CHECK_RPATH=true
-
-%post
-%service_add_post vpp.service
-
-%post -n %{lname} -p /sbin/ldconfig
-
-%preun
-%service_del_preun vpp.service
-
-%postun
-%service_del_postun vpp.service
-
-%postun -n %{lname} -p /sbin/ldconfig
-
-%files
-%{_unitdir}/vpp.service
-%{_bindir}/vpp*
-%{_bindir}/svm*
-%dir %{_sysconfdir}/vpp
-%config %{_sysconfdir}/sysctl.d/80-vpp.conf
-%config %{_sysconfdir}/vpp/startup.conf
-%license LICENSE
-
-%files -n %{lname}
-%exclude %{_libdir}/vpp_plugins
-%exclude %{_libdir}/vpp_api_test_plugins
-%{_libdir}/*.so.*
-
-%files api-lua
-%{_datadir}/doc/vpp/examples/lua
-
-%files api-python
-%dir %{python_sitelib}/vpp_papi*
-%{python_sitelib}/vpp_papi*
-
-%files devel
-%dir %{_datadir}/doc/vpp
-%dir %{_datadir}/doc/vpp/examples
-%{_libdir}/*.so
-%{_includedir}/*
-%{_datadir}/doc/vpp/examples/sample-plugin
-%dir %{_datadir}/vpp
-%dir %{_datadir}/vpp/api
-%{_datadir}/vpp/api/*
-
-%files plugins
-%dir %{_libdir}/vpp_plugins
-%dir %{_libdir}/vpp_api_test_plugins
-%{_libdir}/vpp_plugins/*.so*
-%{_libdir}/vpp_api_test_plugins/*.so*
-
-%changelog
diff --git a/extras/vagrant/Vagrantfile b/extras/vagrant/Vagrantfile
index a97a3dc38fc..8a2454ae0af 100644
--- a/extras/vagrant/Vagrantfile
+++ b/extras/vagrant/Vagrantfile
@@ -9,9 +9,6 @@ Vagrant.configure(2) do |config|
config.vm.box = "centos/7"
config.vm.box_version = "1708.01"
config.ssh.insert_key = false
- elsif distro == 'opensuse'
- config.vm.box = "opensuse/openSUSE-42.3-x86_64"
- config.vm.box_version = "1.0.4.20170726"
elsif distro == 'ubuntu1804'
config.vm.box = "bento/ubuntu-18.04"
else
diff --git a/extras/vagrant/build.sh b/extras/vagrant/build.sh
index 3a10e707fb9..ea32ffe90c3 100755
--- a/extras/vagrant/build.sh
+++ b/extras/vagrant/build.sh
@@ -66,7 +66,5 @@ elif [ "$OS_ID" == "debian" ]; then
elif [ "$OS_ID" == "centos" ]; then
(cd $VPP_DIR/vnet ;$SUDOCMD aclocal;$SUDOCMD automake -a)
$SUDOCMD make pkg-rpm
-elif [ "$OS_ID" == "opensuse" ]; then
- $SUDOCMD make pkg-rpm
fi
diff --git a/extras/vagrant/run.sh b/extras/vagrant/run.sh
index 61c9261fe2f..3e87e259442 100755
--- a/extras/vagrant/run.sh
+++ b/extras/vagrant/run.sh
@@ -1,16 +1,16 @@
#!/bin/bash
# Figure out what system we are running on
-if [ "$(uname)" <> "Darwin" ]; then
+if [ "$(uname)" <> "Darwin" ] ; then
OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
OS_VERSION_ID=$(grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
fi
-if [ "$OS_ID" == "ubuntu" ]; then
+if [ "$OS_ID" == "ubuntu" ] ; then
$OS_CODENAME=$UBUNTU_CODENAME
fi
-if [ "$OS_ID" == "centos" ] || [ "$OS_ID" == "opensuse" ]; then
+if [ "$OS_ID" == "centos" ] ; then
# Install uio-pci-generic
sudo -E modprobe uio_pci_generic
fi