diff options
| -rw-r--r-- | Makefile | 49 | ||||
| -rw-r--r-- | docs/gettingstarted/index.rst | 2 | ||||
| -rw-r--r-- | docs/gettingstarted/installing/index.rst | 13 | ||||
| -rw-r--r-- | docs/gettingstarted/installing/opensuse.rst | 57 | ||||
| -rw-r--r-- | docs/reference/vppvagrant/Vagrantfile | 3 | ||||
| -rw-r--r-- | docs/reference/vppvagrant/boxSetup.rst | 3 | ||||
| -rw-r--r-- | doxygen/Makefile | 3 | ||||
| -rw-r--r-- | extras/rpm/Makefile | 11 | ||||
| -rw-r--r-- | extras/rpm/vpp-suse.spec | 325 | ||||
| -rw-r--r-- | extras/vagrant/Vagrantfile | 3 | ||||
| -rwxr-xr-x | extras/vagrant/build.sh | 2 | ||||
| -rwxr-xr-x | extras/vagrant/run.sh | 6 | ||||
| -rw-r--r-- | test/ext/Makefile | 2 |
13 files changed, 9 insertions, 470 deletions
@@ -55,7 +55,7 @@ endif ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID)) PKG=deb -else ifeq ($(filter rhel centos fedora opensuse opensuse-leap opensuse-tumbleweed,$(OS_ID)),$(OS_ID)) +else ifeq ($(filter rhel centos fedora,$(OS_ID)),$(OS_ID)) PKG=rpm endif @@ -147,42 +147,6 @@ RPM_DEPENDS_DEBUG = glibc-debuginfo e2fsprogs-debuginfo RPM_DEPENDS_DEBUG += krb5-debuginfo openssl-debuginfo RPM_DEPENDS_DEBUG += zlib-debuginfo nss-softokn-debuginfo RPM_DEPENDS_DEBUG += yum-plugin-auto-update-debug-info -# lowercase- replace spaces with dashes. -SUSE_NAME= $(shell grep '^NAME=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g' | sed -e 's/ /-/' | awk '{print tolower($$0)}') -SUSE_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g' | cut -d' ' -f2) -RPM_SUSE_BUILDTOOLS_DEPS = autoconf automake ccache check-devel chrpath -RPM_SUSE_BUILDTOOLS_DEPS += clang cmake indent libtool make ninja python3-ply - -RPM_SUSE_DEVEL_DEPS = glibc-devel-static libnuma-devel -RPM_SUSE_DEVEL_DEPS += libopenssl-devel openssl-devel mbedtls-devel libuuid-devel - -RPM_SUSE_PYTHON_DEPS = python-devel python3-devel python-pip python3-pip -RPM_SUSE_PYTHON_DEPS += python-rpm-macros python3-rpm-macros - -RPM_SUSE_PLATFORM_DEPS = distribution-release shadow rpm-build - -ifeq ($(OS_ID),opensuse) -ifeq ($(SUSE_NAME),tumbleweed) - RPM_SUSE_DEVEL_DEPS = libboost_headers1_68_0-devel-1.68.0 libboost_thread1_68_0-devel-1.68.0 gcc - RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv -endif -ifeq ($(SUSE_ID),15.0) - RPM_SUSE_DEVEL_DEPS += libboost_headers-devel libboost_thread-devel gcc - RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv -else - RPM_SUSE_DEVEL_DEPS += libboost_headers1_68_0-devel-1.68.0 gcc6 - RPM_SUSE_PYTHON_DEPS += python-virtualenv -endif -endif - -ifeq ($(OS_ID),opensuse-leap) -ifeq ($(SUSE_ID),15.0) - RPM_SUSE_DEVEL_DEPS += libboost_headers-devel libboost_thread-devel gcc git curl - RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv -endif -endif - -RPM_SUSE_DEPENDS += $(RPM_SUSE_BUILDTOOLS_DEPS) $(RPM_SUSE_DEVEL_DEPS) $(RPM_SUSE_PYTHON_DEPS) $(RPM_SUSE_PLATFORM_DEPS) ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),) STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf @@ -343,17 +307,8 @@ else ifeq ($(OS_ID),fedora) @sudo -E dnf install $(CONFIRM) $(RPM_DEPENDS) @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib endif -else ifeq ($(filter opensuse-tumbleweed,$(OS_ID)),$(OS_ID)) - @sudo -E zypper refresh - @sudo -E zypper install -y $(RPM_SUSE_DEPENDS) -else ifeq ($(filter opensuse-leap,$(OS_ID)),$(OS_ID)) - @sudo -E zypper refresh - @sudo -E zypper install -y $(RPM_SUSE_DEPENDS) -else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID)) - @sudo -E zypper refresh - @sudo -E zypper install -y $(RPM_SUSE_DEPENDS) else - $(error "This option currently works only on Ubuntu, Debian, RHEL, CentOS or openSUSE systems") + $(error "This option currently works only on Ubuntu, Debian, RHEL, or CentOS systems") endif git config commit.template .git_commit_template.txt diff --git a/docs/gettingstarted/index.rst b/docs/gettingstarted/index.rst index 2efe372b4dc..08fc1cd329e 100644 --- a/docs/gettingstarted/index.rst +++ b/docs/gettingstarted/index.rst @@ -11,7 +11,7 @@ code that provides tools that are used in a development environment. This section covers the following: -* Describes how to manually install VPP Binaries on different OS platforms (Ubuntu, Centos, openSUSE) and then how to configure and use VPP. +* Describes how to manually install VPP Binaries on different OS platforms (Ubuntu, Centos) and then how to configure and use VPP. * Describes the different types of VPP packages, which are used in both basic and developer installs. * A VPP tutorial which is a great way to learn VPP basics. diff --git a/docs/gettingstarted/installing/index.rst b/docs/gettingstarted/installing/index.rst index 6326247e95a..b482ea65146 100644 --- a/docs/gettingstarted/installing/index.rst +++ b/docs/gettingstarted/installing/index.rst @@ -10,8 +10,8 @@ Downloading and Installing VPP If you want to use VPP it can be convenient to install the binaries from existing packages. This guide describes how to pull, install and run the VPP packages. -This section provides directions on how to Install VPP binaries on Ubuntu, Centos, -and openSUSE platforms. +This section provides directions on how to Install VPP binaries on +Ubuntu, and Centos platforms. FD.io VPP is installed using Package Cloud. For a complete set of instructions on how to install VPP with package cloud please refer @@ -36,15 +36,6 @@ The following are instructions on how to install VPP on Centos. centos -Installing on openSUSE --------------------------------------- - -The following are instructions on how to install VPP on openSUSE. - -.. toctree:: - - opensuse - Package Descriptions ---------------------------------- diff --git a/docs/gettingstarted/installing/opensuse.rst b/docs/gettingstarted/installing/opensuse.rst deleted file mode 100644 index 6d7873820dc..00000000000 --- a/docs/gettingstarted/installing/opensuse.rst +++ /dev/null @@ -1,57 +0,0 @@ -.. _opensuse: - -.. toctree:: - -Installing -========== - -To install VPP on openSUSE, first install the following release, and then execute -the associated commands. - -openSUSE Tumbleweed (rolling release) ------------------------------------------------------------- - -.. code-block:: console - - sudo zypper install vpp vpp-plugins - -openSUSE Leap 42.3 --------------------------------- - -.. code-block:: console - - sudo zypper addrepo --name network https://download.opensuse.org/repositories/network/openSUSE_Leap_42.3/network.repo - sudo zypper install vpp vpp-plugins - -Uninstall -========= - -To uninstall the vpp plugins, run the following command: - -.. code-block:: console - - sudo zypper remove -u vpp vpp-plugins - -openSUSE Tumbleweed (rolling release) -------------------------------------- - -To uninstall the openSUSE Tumbleweed, run the following command: - -.. code-block:: console - - sudo zypper remove -u vpp vpp-plugins - -openSUSE Leap 42.3 ------------------- - -.. code-block:: console - - sudo zypper remove -u vpp vpp-plugins - sudo zypper removerepo network - -For More Information -==================== -For more information on VPP with openSUSE, please look at the following post. - -* https://www.suse.com/communities/blog/vector-packet-processing-vpp-opensuse/ - diff --git a/docs/reference/vppvagrant/Vagrantfile b/docs/reference/vppvagrant/Vagrantfile index 457e37c8274..642969faa63 100644 --- a/docs/reference/vppvagrant/Vagrantfile +++ b/docs/reference/vppvagrant/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" else config.vm.box = "puppetlabs/ubuntu-16.04-64-nocm" end diff --git a/docs/reference/vppvagrant/boxSetup.rst b/docs/reference/vppvagrant/boxSetup.rst index a8aa1f3c132..ed20c9d37c1 100644 --- a/docs/reference/vppvagrant/boxSetup.rst +++ b/docs/reference/vppvagrant/boxSetup.rst @@ -34,9 +34,6 @@ Looking at the :ref:`vppVagrantfile`, we can see that the default OS is Ubuntu 1 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" else config.vm.box = "puppetlabs/ubuntu-16.04-64-nocm" diff --git a/doxygen/Makefile b/doxygen/Makefile index 40646148ec6..e399b404a26 100644 --- a/doxygen/Makefile +++ b/doxygen/Makefile @@ -35,7 +35,6 @@ OS_ID ?= $(shell grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g') # Package dependencies DOC_DEB_DEPENDS = doxygen graphviz python3-pyparsing python3-jinja2 DOC_RPM_DEPENDS = doxygen graphviz python3-pyparsing python3-jinja2 -DOC_SUSE_RPM_DEPENDS = doxygen graphviz python3-pyparsing python3-Jinja2 DOC_MAC_BIN_DEPENDS = doxygen dot git DOC_MAC_PY_DEPENDS = pyparsing jinja2 @@ -156,8 +155,6 @@ else ifeq ($(OS_ID),darwin) false; \ ); \ done -else ifeq ($(OS_ID),opensuse) - @sudo zypper install $(CONFIRM) $(DOC_SUSE_RPM_DEPENDS) else $(error "Building documentation currently works only on Ubuntu, CentOS, MacOS and OpenSUSE systems.") endif 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 diff --git a/test/ext/Makefile b/test/ext/Makefile index d7acb7bc2b2..a0dc3e7736c 100644 --- a/test/ext/Makefile +++ b/test/ext/Makefile @@ -8,7 +8,7 @@ VAPI_LIBS = \ -L$(VPP_INSTALL_PATH)/vpp/lib \ -lvppinfra -lvlibmemoryclient -lsvm -lpthread -lcheck -lrt -lm -lvapiclient -ifneq ($(filter centos opensuse opensuse-tumbleweed opensuse-leap,$(OS_ID)),$(OS_ID)) +ifneq ($(filter centos,$(OS_ID)),$(OS_ID)) VAPI_LIBS += -lsubunit endif |