summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOle Troan <ot@cisco.com>2017-03-20 21:38:37 +0100
committerOle Trøan <otroan@employees.org>2017-03-28 23:37:43 +0000
commit0679760dc54798a47731943b97b1dc5b2a455e3d (patch)
tree3e8e6ceb592ab9a73dd96ea1ede417f5fb622b28
parent58f061dca4cb049410a72bb21a9643f7acffa738 (diff)
Python API: Fixup of debian package after cFFI changes.
Change-Id: I4c2a1a818f28d4c6cf52af45f3b7dbfa41d77ccb Signed-off-by: Ole Troan <ot@cisco.com> (cherry picked from commit afaa85f873a7bff1cf1e32c22f909af3018ccfee)
-rw-r--r--build-data/platforms.mk4
-rw-r--r--build-root/deb/debian/control2
-rwxr-xr-xbuild-root/deb/debian/rules8
-rw-r--r--build-root/deb/debian/vpp-api-python.postinst5
-rw-r--r--build-root/deb/debian/vpp-api-python.prerm8
5 files changed, 8 insertions, 19 deletions
diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index 2351898e3eb..f491ee59571 100644
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -59,10 +59,6 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
./scripts/find-vpp-api-java-contents $(INSTALL_PREFIX)$(ARCH) \
deb/debian/vpp-api-java.install ; \
\
- : vpp-api-python package ; \
- ./scripts/find-vpp-api-python-contents $(INSTALL_PREFIX)$(ARCH) \
- deb/debian/vpp-api-python.install ; \
- \
: bin package needs startup config ; \
echo ../../src/vpp/conf/startup.conf /etc/vpp \
>> deb/debian/vpp.install ; \
diff --git a/build-root/deb/debian/control b/build-root/deb/debian/control
index e90cfca86e5..4ed42b36e7d 100644
--- a/build-root/deb/debian/control
+++ b/build-root/deb/debian/control
@@ -2,7 +2,7 @@ Source: vpp
Section: net
Priority: extra
Maintainer: Cisco OpenVPP Packaging Team <bogus.address@cisco.com>
-Build-Depends: debhelper (>= 9), dh-systemd, dh-python, chrpath
+Build-Depends: debhelper (>= 9), dh-systemd, dh-python, chrpath, python-all
Standards-Version: 3.9.4
Package: vpp
diff --git a/build-root/deb/debian/rules b/build-root/deb/debian/rules
index 7046105c10b..3a1dd2905c9 100755
--- a/build-root/deb/debian/rules
+++ b/build-root/deb/debian/rules
@@ -16,9 +16,15 @@ include /usr/share/dpkg/default.mk
# package maintainers to append LDFLAGS
#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export PYBUILD_NAME = vpp-api-python
+export PYBUILD_DIR = ../../src/vpp-api/python
+export PYBUILD_DESTDIR_python2=debian/vpp-api-python/
+export PYBUILD_DISABLE_python2=test
+export PYBUILD_SYSTEM=distutils
+
# main packaging script based on dh7 syntax
%:
- dh $@ --with systemd,python2
+ dh $@ --with systemd,python2 --buildsystem=pybuild
override_dh_install:
dh_install --exclude .git
diff --git a/build-root/deb/debian/vpp-api-python.postinst b/build-root/deb/debian/vpp-api-python.postinst
deleted file mode 100644
index ca1c856f9cc..00000000000
--- a/build-root/deb/debian/vpp-api-python.postinst
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh -e
-
-# after installing python-api files
-python2_sitedir=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
-easy_install --install-dir=$python2_sitedir -z $python2_sitedir/vpp_papi/vpp_papi-*.egg
diff --git a/build-root/deb/debian/vpp-api-python.prerm b/build-root/deb/debian/vpp-api-python.prerm
deleted file mode 100644
index e6d92df9b13..00000000000
--- a/build-root/deb/debian/vpp-api-python.prerm
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-# before removing python-api files
-python2_sitedir=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
-easy_install --install-dir=$python2_sitedir -mxNq vpp_papi
-
-# the egg has been copied during install
-rm $python2_sitedir/vpp_papi-*.egg