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

build: remove opensuse build infra

Browse Source 
- VPP on opensuse has not been supported
  for several releases.

Type: fix

Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: I2b5316ad5c20a843b8936f4ceb473f932a5338d9
This commit is contained in:
Dave Wallace
2020-09-18 15:35:01 +00:00
committed by Damjan Marion
parent 7360e3d78d
commit bc35f469c8
13 changed files with 9 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Makefile
View File

@ -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

2
docs/gettingstarted/index.rst
View File

@ -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.

13
docs/gettingstarted/installing/index.rst
View File

@ -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
----------------------------------

57
docs/gettingstarted/installing/opensuse.rst
View File

@ -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/

3
docs/reference/vppvagrant/Vagrantfile vendored
View File

@ -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

3
docs/reference/vppvagrant/boxSetup.rst
View File

@ -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"

3
doxygen/Makefile
View File

@ -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

11
extras/rpm/Makefile
View File

@ -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)

325
extras/rpm/vpp-suse.spec
View File

File diff suppressed because it is too large Load Diff

3
extras/vagrant/Vagrantfile vendored
View File

@ -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

2
extras/vagrant/build.sh
View File

@ -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

6
extras/vagrant/run.sh
View File

@ -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

2
test/ext/Makefile
View File

@ -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