PAPI: Build python3 package for vpp_papi

Change-Id: Iae53fe88a69b53b75a7439d159ae0f9d18545908
Signed-off-by: Ole Troan <ot@cisco.com>

diff --git a/Makefile b/Makefile
index 432922d..17a69ba 100644 (file)
--- 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 a89371f..48de48a 100644 (file)
--- 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 0351ee5..ceef46a 100755 (executable)
--- 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