aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOle Troan <ot@cisco.com>2019-03-13 18:08:42 +0100
committerPaul Vinciguerra <pvinci@vinciconsulting.com>2019-03-15 19:01:59 +0000
commite4a6d69faa6e72650bd2097414457b991bc5ef93 (patch)
treea62f2cb63f3f7fb24c64c06e89ff9541f8fcbf2d
parent3b0d7e42f65eaf8d84cfe26e2e9f5244c554b934 (diff)
PAPI: Build python3 package for vpp_papi
Change-Id: Iae53fe88a69b53b75a7439d159ae0f9d18545908 Signed-off-by: Ole Troan <ot@cisco.com>
-rw-r--r--Makefile3
-rw-r--r--src/pkg/debian/control17
-rwxr-xr-xsrc/pkg/debian/rules.in9
3 files changed, 23 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 432922d3273..17a69bab42d 100644
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,8 @@ DEB_DEPENDS = curl build-essential autoconf automake ccache
DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd
DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
DEB_DEPENDS += lcov chrpath autoconf indent clang-format libnuma-dev
-DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6 check
+DEB_DEPENDS += python-all python3-all python3-setuptools python-dev
+DEB_DEPENDS += python-virtualenv python-pip libffi6 check
DEB_DEPENDS += libboost-all-dev libffi-dev python3-ply libmbedtls-dev
DEB_DEPENDS += cmake ninja-build uuid-dev
ifeq ($(OS_VERSION_ID),14.04)
diff --git a/src/pkg/debian/control b/src/pkg/debian/control
index a89371f3b88..48de48ab115 100644
--- a/src/pkg/debian/control
+++ b/src/pkg/debian/control
@@ -5,7 +5,9 @@ Maintainer: fd.io VPP Packaging Team <vpp-dev@fd.io>
Build-Depends: debhelper (>= 9),
dh-systemd,
dh-python,
- python-all
+ python-all,
+ python3-all,
+ python3-setuptools
Standards-Version: 3.9.4
Package: vpp
@@ -70,5 +72,14 @@ Depends: vpp (= ${source:Version}),
${python:Depends},
${misc:Depends}
Description: VPP Python API bindings
- This package contains VPP python api bindings
- .
+ This package contains VPP python api bindings
+ .
+
+Package: python3-vpp-api
+Architecture: any
+Depends: vpp (= ${source:Version}),
+ ${python3:Depends},
+ ${misc:Depends}
+Description: VPP Python3 API bindings
+ This package contains VPP python api bindings
+ .
diff --git a/src/pkg/debian/rules.in b/src/pkg/debian/rules.in
index 0351ee503e6..ceef46a297a 100755
--- a/src/pkg/debian/rules.in
+++ b/src/pkg/debian/rules.in
@@ -7,15 +7,20 @@ DH_VERBOSE = 1
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/default.mk
-export PYBUILD_NAME = vpp-api-python
+export PYBUILD_NAME = vpp-api
export PYBUILD_DIR = @CMAKE_SOURCE_DIR@/vpp-api/python
export PYBUILD_DESTDIR_python2=debian/vpp-api-python/
export PYBUILD_DISABLE_python2=test
+export PYBUILD_DESTDIR_python3=debian/python3-vpp-api/
+export PYBUILD_DISABLE_python3=test
export PYBUILD_SYSTEM=distutils
+buildvers := $(shell pyversions -sv)
+build3vers := $(shell py3versions -sv)
+
# main packaging script based on dh7 syntax
%:
- dh $@ --with systemd,python2 --buildsystem=pybuild
+ dh $@ --with systemd,python2,python3 --buildsystem=pybuild
override_dh_strip:
dh_strip --dbg-package=vpp-dbg