diff options
| -rw-r--r-- | MAINTAINERS | 5 | ||||
| -rw-r--r-- | Makefile | 33 | ||||
| -rw-r--r-- | extras/rpm/Makefile | 9 | ||||
| -rw-r--r-- | extras/rpm/opensuse/Dockerfile | 15 | ||||
| -rw-r--r-- | extras/rpm/opensuse/README.md | 89 | ||||
| -rw-r--r-- | extras/rpm/opensuse/vpp.spec | 324 |
6 files changed, 472 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 17e4c078fe4..ddcacae84ca 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -795,6 +795,11 @@ M: Ole Troan <ot@cisco.com> M: Paul Atkins <patkins@graphiant.com> F: src/vnet/ipfix-export/ +RPM packaging on openSUSE +I: rpm-packaging +M: Laszlo Kiraly <laszlo.kiraly@est.tech> +F: src/extras/rpm/opensuse + THE REST I: misc M: vpp-dev Mailing List <vpp-dev@fd.io> @@ -56,7 +56,7 @@ endif ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID)) PKG=deb -else ifeq ($(filter rhel centos fedora,$(OS_ID)),$(OS_ID)) +else ifeq ($(filter rhel centos fedora opensuse-leap,$(OS_ID)),$(OS_ID)) PKG=rpm endif @@ -154,6 +154,32 @@ RPM_DEPENDS_DEBUG += krb5-debuginfo openssl-debuginfo RPM_DEPENDS_DEBUG += zlib-debuginfo nss-softokn-debuginfo RPM_DEPENDS_DEBUG += yum-plugin-auto-update-debug-info +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 libelf-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-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 += 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_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 endif @@ -307,8 +333,11 @@ 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-leap,$(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, or CentOS systems") + $(error "This option currently works only on Ubuntu, Debian, RHEL, CentOS or openSUSE-leap systems") endif git config commit.template .git_commit_template.txt diff --git a/extras/rpm/Makefile b/extras/rpm/Makefile index b06c9fb9675..0c422c7994c 100644 --- a/extras/rpm/Makefile +++ b/extras/rpm/Makefile @@ -26,6 +26,13 @@ PC=% all: RPM +# SUSE osleap15 +ifeq ($(filter opensuse-leap,$(OS_ID)),$(OS_ID)) +SRC_SPEC_DIR="opensuse" +else +SRC_SPEC_DIR="." +endif + SPEC_FILE='vpp.spec' spec: @@ -33,7 +40,7 @@ spec: mkdir -p $(RPMBUILD)/RPMS $(RPMBUILD)/SRPMS $(RPMBUILD)/BUILD \ $(RPMBUILD)/SOURCES $(RPMBUILD)/SPECS cp $(TARBALL) $(RPMBUILD)/SOURCES/vpp-$(VERSION)-$(RELEASE).tar.xz - cp $(SPEC_FILE) $(RPMBUILD)/SPECS + cp $(SRC_SPEC_DIR)/$(SPEC_FILE) $(RPMBUILD)/SPECS srpm: spec rpmbuild -bs \ diff --git a/extras/rpm/opensuse/Dockerfile b/extras/rpm/opensuse/Dockerfile new file mode 100644 index 00000000000..032c5d139ba --- /dev/null +++ b/extras/rpm/opensuse/Dockerfile @@ -0,0 +1,15 @@ +# Run from top of vpp repo with command: +# docker build -f extras/rpm/opensuse/Dockerfile . + +ARG SUSE_VERSION=15.3 + +FROM opensuse/leap:${SUSE_VERSION} as vppbuild +COPY . /vpp +WORKDIR /vpp +RUN zypper install -y make sudo +COPY . . +RUN UNATTENDED=y make install-dep +RUN ln -s /usr/bin/cmake /usr/bin/cmake3 +RUN UNATTENDED=y make install-ext-deps +RUN make pkg-rpm +CMD ["/bin/bash"]
\ No newline at end of file diff --git a/extras/rpm/opensuse/README.md b/extras/rpm/opensuse/README.md new file mode 100644 index 00000000000..6f3cadfc70e --- /dev/null +++ b/extras/rpm/opensuse/README.md @@ -0,0 +1,89 @@ +# Build RPM for openSUSE + +## Introduction + +This is to describe how to compile and create installable RPM packages for openSUSE leap. +In general you should visit [Pulling, Building, +Running, Hacking, Pushing](https://wiki.fd.io/view/VPP/Pulling,_Building,_Run +ning,_Hacking_and_Pushing_VPP_Code) which provides full description for other type of system (Ubuntu,Centos or Redhat). + +## Get the VPP Sources + +To get the VPP sources that are used to create the build, run the following commands: + +```bash +# git clone https://gerrit.fd.io/r/vpp +# cd vpp +``` + +There are two ways to continue: + +* Build by docker +* Build on your own openSUSE system + +## Build by Docker + +Run the following docker command: + +```bash +docker build -f extras/rpm/opensuse/Dockerfile . +``` + +The packages now can be copied from the docker image and can be installed on openSUSE. +An example how to extend the Dockerfile to install vpp: + +'''dockerfile +FROM opensuse/leap:${SUSE_VERSION} as vppinstall +COPY --from=vppbuild /vpp/build-root/*rpm /rpms/ +RUN VPP_INSTALL_SKIP_SYSCTL=false zypper install --allow-unsigned-rpm -y --no-recommends /rpms/*.rpm;\ +... +''' + +## Build on openSUSE + +### Build VPP Dependencies + +Before building a VPP image, make sure there are no FD.io VPP or DPDK packages installed, by entering the following commands: + +```bash +# rpm -ql vpp +package vpp is not installed +# rpm -ql dpdk +package dpdk is not installed + +``` + +Run the following make command to install the dependencies for FD.io VPP. + +```bash +make install-dep +``` + +Run the following make command to install the external dependencies for FD.io VPP. + +```bash +ln -s /usr/bin/cmake /usr/bin/cmake3 # some thirdparty checking for cmake3 binary +make install-ext-dep +``` + +### Build RPM Packages + +Create packages for openSUSE by running: + +```bash +make pkg-rpm +``` + +Once the packages are built they can be found in the build-root directory. + +```bash +# ls *.rpm +``` + +If the packages are built correctly, then this should be the corresponding output: + +```bash +build-root/libvpp0-21.10-rc0~200_gb89ae9670.x86_64.rpm build-root/vpp-api-python-21.10-rc0~200_gb89ae9670.x86_64.rpm +build-root/vpp-21.10-rc0~200_gb89ae9670.x86_64.rpm build-root/vpp-devel-21.10-rc0~200_gb89ae9670.x86_64.rpm +build-root/vpp-api-lua-21.10-rc0~200_gb89ae9670.x86_64.rpm build-root/vpp-plugins-21.10-rc0~200_gb89ae9670.x86_64.rpm +``` diff --git a/extras/rpm/opensuse/vpp.spec b/extras/rpm/opensuse/vpp.spec new file mode 100644 index 00000000000..2d348f248e1 --- /dev/null +++ b/extras/rpm/opensuse/vpp.spec @@ -0,0 +1,324 @@ +# +# 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/lib64 + +%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 && %{py3_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 +sed -i -e "s|^\(\s*\)api-trace {|plugin_path /usr/lib64/vpp_plugins\n\napi-trace {|" %{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 && %{py3_install} + +# +# devel +# +for dir in %{_vpp_install_dir}/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* +%{_bindir}/vat2* +%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 %{python3_sitelib}/vpp_* +%{python3_sitelib}/vpp_* + +%files devel +%dir %{_datadir}/doc/vpp +%dir %{_datadir}/doc/vpp/examples +/usr/bin/vppapigen +/usr/bin/vapi_c_gen.py +/usr/bin/vapi_cpp_gen.py +/usr/bin/vapi_json_parser.py +%{_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 |