From 7480ba751799f2b4b4c03db3a97c8990512712f2 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Thu, 25 Oct 2018 18:17:23 +0200 Subject: [PATCH] debianpkg: change frr-pythontools dep to python3 The shebang can't be both at the same time; since python2 is going to be removed from Debian soon let's just stick with python3. Signed-off-by: David Lamparter --- debianpkg/control | 3 +-- debianpkg/frr-pythontools.install | 2 +- debianpkg/rules | 5 +++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debianpkg/control b/debianpkg/control index c7a531ed54..252132f0f0 100644 --- a/debianpkg/control +++ b/debianpkg/control @@ -113,8 +113,7 @@ Depends: ${misc:Depends}, frr (<< ${source:Upstream-Version}.0-~), frr (>= ${source:Version}~), - python (>= 2.7) | python3, - python-ipaddr | python-ipaddress + python3:any Description: BGP/OSPF/RIP/RIPng/ISIS/PIM/LDP routing daemon (Python Tools) This package includes info files for frr, a free software which manages TCP/IP based routing protocols. It supports BGP4, BGP4+, OSPFv2, OSPFv3, diff --git a/debianpkg/frr-pythontools.install b/debianpkg/frr-pythontools.install index aee093cf69..28140382f6 100644 --- a/debianpkg/frr-pythontools.install +++ b/debianpkg/frr-pythontools.install @@ -1 +1 @@ -tools/frr-reload.py usr/lib/frr/ +usr/lib/frr/frr-reload.py diff --git a/debianpkg/rules b/debianpkg/rules index 9ee866298a..5b9438109e 100755 --- a/debianpkg/rules +++ b/debianpkg/rules @@ -120,6 +120,8 @@ else USE_SYSTEMD=--enable-systemd=no endif +export PYTHON=python3 + %: dh $@ --with=$(DH_WITH_SYSTEMD)autoreconf --parallel --dbg-package=frr-dbg @@ -154,8 +156,7 @@ override_dh_auto_configure: override_dh_auto_install: dh_auto_install - # installed in frr-pythontools - rm debian/tmp/usr/lib/frr/frr-reload.py + sed -e '1c #!/usr/bin/python3' -i debian/tmp/usr/lib/frr/frr-reload.py # let dh_systemd_* and dh_installinit do their thing automatically ifeq ($(filter pkg.frr.nosystemd,$(DEB_BUILD_PROFILES)),) -- 2.39.5