X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fpkg%2Fdebian%2Frules.in;h=15f8eb6f8107a1c320b2246c6bfbf4e845887898;hb=041372b79;hp=f1917e6ea0a6b8cb557beb7b56d1df12e6196afd;hpb=4686d39c33f2930106c1d857fc0acec7746506ff;p=vpp.git diff --git a/src/pkg/debian/rules.in b/src/pkg/debian/rules.in index f1917e6ea0a..15f8eb6f810 100755 --- a/src/pkg/debian/rules.in +++ b/src/pkg/debian/rules.in @@ -7,15 +7,18 @@ 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 +DH_WITH = systemd,python3 + +build3vers := $(shell py3versions -sv) # main packaging script based on dh7 syntax %: - dh $@ --with systemd,python2 --buildsystem=pybuild + dh $@ --with $(DH_WITH) --buildsystem=pybuild override_dh_strip: dh_strip --dbg-package=vpp-dbg @@ -27,8 +30,9 @@ override_dh_install: @CMAKE_COMMAND@ \ -D CMAKE_INSTALL_CONFIG_NAME=@CMAKE_BUILD_TYPE@ \ -D CMAKE_INSTALL_COMPONENT=$$c \ - -D CMAKE_INSTALL_PREFIX=@CMAKE_BINARY_DIR@/debian/$$c \ - -P @CMAKE_BINARY_DIR@/cmake_install.cmake ; \ + -D CMAKE_INSTALL_PREFIX=@VPP_BINARY_DIR@/debian/$$c \ + -P @CMAKE_BINARY_DIR@/cmake_install.cmake 2>&1 \ + | grep -v 'Set runtime path of' ; \ if [ -d debian/$$c/lib ] ; then \ mv debian/$$c/lib debian/$$c/$(DEB_HOST_MULTIARCH) ; \ mkdir -p debian/$$c/usr/lib ; \