diff options
| -rw-r--r-- | nsh-plugin/Makefile.am | 4 | ||||
| -rwxr-xr-x | nsh-plugin/build.sh | 25 | ||||
| -rw-r--r-- | nsh-plugin/packaging/rpm/.gitignore | 6 | ||||
| -rw-r--r-- | nsh-plugin/packaging/rpm/vpp-nsh-plugin.spec | 47 | ||||
| -rwxr-xr-x | nsh-plugin/packaging/scripts/version | 27 | ||||
| -rwxr-xr-x | scripts/ci/verify.sh | 5 |
6 files changed, 113 insertions, 1 deletions
diff --git a/nsh-plugin/Makefile.am b/nsh-plugin/Makefile.am index 4ecc63e..096eb90 100644 --- a/nsh-plugin/Makefile.am +++ b/nsh-plugin/Makefile.am @@ -53,3 +53,7 @@ install-data-hook: rm -f $(prefix)/lib/nsh_plugin.* rm -f $(prefix)/lib/nsh_test_plugin.* +pkg-rpm: all install + cd $(srcdir)/packaging/rpm; \ + rpmbuild -bb --define "_topdir $$PWD" \ + --define "_plugin_prefix ${prefix}" vpp-nsh-plugin.spec diff --git a/nsh-plugin/build.sh b/nsh-plugin/build.sh index 86d592b..2acc331 100755 --- a/nsh-plugin/build.sh +++ b/nsh-plugin/build.sh @@ -1,4 +1,29 @@ #!/usr/bin/env bash + +# Figure out what system we are running on +if [ -f /etc/lsb-release ];then + . /etc/lsb-release +elif [ -f /etc/redhat-release ];then + sudo yum install -y redhat-lsb + DISTRIB_ID=`lsb_release -si` + DISTRIB_RELEASE=`lsb_release -sr` + DISTRIB_CODENAME=`lsb_release -sc` + DISTRIB_DESCRIPTION=`lsb_release -sd` +fi +KERNEL_OS=`uname -o` +KERNEL_MACHINE=`uname -m` +KERNEL_RELEASE=`uname -r` +KERNEL_VERSION=`uname -v` + +echo KERNEL_OS: $KERNEL_OS +echo KERNEL_MACHINE: $KERNEL_MACHINE +echo KERNEL_RELEASE: $KERNEL_RELEASE +echo KERNEL_VERSION: $KERNEL_VERSION +echo DISTRIB_ID: $DISTRIB_ID +echo DISTRIB_RELEASE: $DISTRIB_RELEASE +echo DISTRIB_CODENAME: $DISTRIB_CODENAME +echo DISTRIB_DESCRIPTION: $DISTRIB_DESCRIPTION + NSH_PLUGIN_DIR=$(dirname $0) NSH_INSTALL_PREFIX=${NSH_INSTALL_PREFIX:-/usr} cd ${NSH_PLUGIN_DIR} diff --git a/nsh-plugin/packaging/rpm/.gitignore b/nsh-plugin/packaging/rpm/.gitignore new file mode 100644 index 0000000..2410124 --- /dev/null +++ b/nsh-plugin/packaging/rpm/.gitignore @@ -0,0 +1,6 @@ +BUILD +BUILDROOT +RPMS +SOURCES +SPECS +SRPMS diff --git a/nsh-plugin/packaging/rpm/vpp-nsh-plugin.spec b/nsh-plugin/packaging/rpm/vpp-nsh-plugin.spec new file mode 100644 index 0000000..c114200 --- /dev/null +++ b/nsh-plugin/packaging/rpm/vpp-nsh-plugin.spec @@ -0,0 +1,47 @@ +%define _topdir %(pwd) +%define _builddir %{_topdir} +%define _version %(../scripts/version rpm-version) +%define _release %(../scripts/version rpm-release) + +Name: vpp-nsh-plugin +Summary: Vector Packet Processing +License: Apache +Version: %{_version} +Release: %{_release} +Requires: vpp +%description +This package provides an nsh plugin for vpp + +%package devel +Summary: VPP header files, static libraries +Group: Development/Libraries +Requires: vpp-nsh-plugin = %{_version}-%{_release}, vpp-devel +%description devel +This package contains the headers for C bindings for the vpp-nsh-plugin + +%install +# +# vpp-nsh-plugin +# +mkdir -p -m755 %{buildroot}%{_libdir}/vpp_plugins +install -m 644 %{_plugin_prefix}/lib/vpp_plugins/nsh_plugin.so %{buildroot}%{_libdir}/vpp_plugins/nsh_plugin.so +mkdir -p -m755 %{buildroot}%{_libdir}/vpp_api_test_plugins +install -m 644 %{_plugin_prefix}/lib/vpp_api_test_plugins/nsh_test_plugin.so %{buildroot}%{_libdir}/vpp_api_test_plugins/nsh_test_plugin.so + +# +# vpp-nsh-plugin-devel +# +mkdir -p -m755 %{buildroot}%{_includedir}/vpp-api/ +install -m 644 %{_plugin_prefix}/include/vpp-api/nsh_all_api_h.h %{buildroot}%{_includedir}/vpp-api/nsh_all_api_h.h +install -m 644 %{_plugin_prefix}/include/vpp-api/nsh_msg_enum.h %{buildroot}%{_includedir}/vpp-api/nsh_msg_enum.h +install -m 644 %{_plugin_prefix}/include/vpp-api/nsh.api.h %{buildroot}%{_includedir}/vpp-api/nsh.api.h + + +%files +%defattr(-,bin,bin) +%{_libdir}/vpp_plugins/nsh_plugin.so +%{_libdir}/vpp_api_test_plugins/nsh_test_plugin.so + +%files devel +%defattr(-,bin,bin) +%{_includedir}/* diff --git a/nsh-plugin/packaging/scripts/version b/nsh-plugin/packaging/scripts/version new file mode 100755 index 0000000..84ee5db --- /dev/null +++ b/nsh-plugin/packaging/scripts/version @@ -0,0 +1,27 @@ +#!/bin/bash + +TAG=$(git describe | cut -d- -f1 | sed -e 's/^v//') +ADD=$(git describe | cut -s -d- -f2) +CMT=$(git describe --dirty --match 'v*'| cut -s -d- -f3,4) + +if [ -n "${BUILD_NUMBER}" ]; then + BLD="~b${BUILD_NUMBER}" +fi + +if [ "$1" = "rpm-version" ]; then + echo ${TAG} + exit +fi + +if [ "$1" = "rpm-release" ]; then + [ -z "${ADD}" ] && echo release && exit + CMT=$(git describe --dirty --match 'v*'| cut -s -d- -f3,4 | sed 's/-/_/') + echo ${ADD}${CMT:+~${CMT}}${BLD} + exit +fi + +if [ -n "${ADD}" ]; then + echo ${TAG}-${ADD}${CMT:+~${CMT}}${BLD} +else + echo ${TAG} +fi diff --git a/scripts/ci/verify.sh b/scripts/ci/verify.sh index e00e005..7728415 100755 --- a/scripts/ci/verify.sh +++ b/scripts/ci/verify.sh @@ -27,5 +27,8 @@ if test -f /usr/bin/lsb_release && test `lsb_release -si` == "Ubuntu" && test break fi ${NSH_PLUGIN_DIR}/build.sh - +cd ${NSH_PLUGIN_DIR}/build/ +if [ "${OS}" == "centos7" ]; then + make pkg-rpm +fi |