diff options
| -rw-r--r-- | src/pkg/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/pkg/debian/control.in | 11 | ||||
| -rwxr-xr-x | src/pkg/debian/rules.in | 7 | ||||
| -rw-r--r-- | src/pkg/debian/vpp.postrm | 4 |
4 files changed, 4 insertions, 27 deletions
diff --git a/src/pkg/CMakeLists.txt b/src/pkg/CMakeLists.txt index d5cc2070224..e466fe8d345 100644 --- a/src/pkg/CMakeLists.txt +++ b/src/pkg/CMakeLists.txt @@ -35,13 +35,8 @@ foreach(l ${os_release}) set(OS_${_name} ${_value}) endforeach() -if (OS_ID STREQUAL "ubuntu" AND OS_VERSION_ID VERSION_LESS 20.04) - set(VPP_DEB_BUILD_DEPENDS "python-all, python3-all, python3-setuptools") - set(VPP_DEB_WITH_PYTHON2 "yes") -else() - set(VPP_DEB_BUILD_DEPENDS "python3-all, python3-setuptools") - set(VPP_DEB_WITH_PYTHON2 "no") -endif() +set(VPP_DEB_BUILD_DEPENDS "python3-all, python3-setuptools") +set(VPP_DEB_WITH_PYTHON2 "no") foreach(f rules changelog control) configure_file( diff --git a/src/pkg/debian/control.in b/src/pkg/debian/control.in index ef66682f8a7..006b01c00c2 100644 --- a/src/pkg/debian/control.in +++ b/src/pkg/debian/control.in @@ -67,21 +67,10 @@ Description: Vector Packet Processing--runtime dpdk plugin This package contains the VPP dpdk plugin . -Package: vpp-api-python -Architecture: any -Depends: vpp (= ${source:Version}), - ${python:Depends}, - ${misc:Depends} -Description: VPP Python API bindings - This package contains VPP python api bindings - . - Package: python3-vpp-api Architecture: any Depends: vpp (= ${source:Version}), python3-cffi, - python3-ply, - python3-pycparser, ${python3:Depends}, ${misc:Depends} Description: VPP Python3 API bindings diff --git a/src/pkg/debian/rules.in b/src/pkg/debian/rules.in index f09db38e2a1..3249220b4f5 100755 --- a/src/pkg/debian/rules.in +++ b/src/pkg/debian/rules.in @@ -12,14 +12,7 @@ export PYBUILD_DIR = @CMAKE_SOURCE_DIR@/vpp-api/python export PYBUILD_DESTDIR_python3=debian/python3-vpp-api/ export PYBUILD_DISABLE_python3=test export PYBUILD_SYSTEM=distutils -ifeq (@VPP_DEB_WITH_PYTHON2@,yes) -export PYBUILD_DESTDIR_python2=debian/vpp-api-python/ -export PYBUILD_DISABLE_python2=test -buildvers := $(shell pyversions -sv) -DH_WITH = systemd,python2,python3 -else DH_WITH = systemd,python3 -endif build3vers := $(shell py3versions -sv) diff --git a/src/pkg/debian/vpp.postrm b/src/pkg/debian/vpp.postrm index 24b4842fd0a..4ef1a59e070 100644 --- a/src/pkg/debian/vpp.postrm +++ b/src/pkg/debian/vpp.postrm @@ -13,9 +13,9 @@ for d in $pci_dirs; do done done if [ -n "${removed}" ]; then - echo "There are changes in PCI drivers, rescaning" + echo "There are changes in PCI drivers, rescanning" echo 1 > /sys/bus/pci/rescan else - echo "There weren't PCI devices binded" + echo "There weren't PCI devices bound" fi |