Hi Scott,
On Sat, Aug 24, 2019 at 10:28:34PM -0400, Scott Kitterman wrote:
> On Saturday, August 24, 2019 5:22:11 AM EDT Salvatore Bonaccorso wrote:
> > Contorl: tags -1 + help
> >
> > Hi
> >
> > At the moment I'm somehow a bit time limited to work on src:criu, but
> > not completely lost track. But if someone wants to help here and on
> > the FTBFS bug then be my guest, will happily merge proposed changes.
> >
> > In any case criu should not block the python2.7 removal, so feel free
> > to request removal from unstable at any point it is needed for you.
> >
> > I plan at the moment to keep it anyway updated in experimental, as it
> > is still before uploading a new version to unstable at all.
>
> I took a brief look at this. I did not make progress on the FTBFS, so I'm
> unable to test anything, but I can make some suggestions on the Python bits.
>
> At the very least, you'll need the following:
>
> In debian/rules chang with python2 to python3
>
> Add PYTHON="python3" to the install override
>
> In debian control:
>
> Build-depend on python3-all instead of python-all
>
> Drop the depends on python-future and python-ipaddr
> Change python-protobuf to python3-protobuf
>
> More generally, there's a missing build-dep on pkg-config.
>
> It looks like upstream supports python3, so that's at least a start.
I have currently the attached on top of the changes in the Debian
packaging repository. Though I neeed to check new failures to work
with crit on dumped data, which I have not with the previous version.
Regards,
Salvatore
>From 6b80290a07c85524c05b7c7b070c77290da4913d Mon Sep 17 00:00:00 2001
From: Salvatore Bonaccorso <car...@debian.org>
Date: Sun, 29 Sep 2019 16:56:47 +0200
Subject: [PATCH] Update to use python3
Build-Depends on python3-all instead of python-all.
Drop Depends on python-future, python-ipaddr and change Depends on
python-protobuf to python3-protobuf.
Replace ${python:Depends} substitution with ${python3:Depends}.
Pass --with python3 to dh in debian/rules and pass PYTHON="python3" in
the dh_auto_install override.
Closes: #927104
Thanks: Scott Kitterman
---
debian/control | 8 +++-----
debian/rules | 4 ++--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/debian/control b/debian/control
index c07659a9bdc4..0c85ee527fd0 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
pkg-config,
protobuf-c-compiler,
protobuf-compiler,
- python-all (>= 2.6.6-3~),
+ python3-all,
xmlto
Standards-Version: 4.3.0
Homepage: https://www.criu.org/
@@ -25,11 +25,9 @@ Rules-Requires-Root: no
Package: criu
Architecture: amd64 arm64 armhf ppc64el s390x
Depends:
- python-future,
- python-ipaddr,
- python-protobuf,
+ python3-protobuf,
${misc:Depends},
- ${python:Depends},
+ ${python3:Depends},
${shlibs:Depends}
Recommends: iproute2 | iproute
Description: checkpoint and restore in userspace
diff --git a/debian/rules b/debian/rules
index d5a74b47adbe..a5eb30cdfb5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,10 +6,10 @@ PACKAGE = $(firstword $(shell dh_listpackages))
TMP = $(CURDIR)/debian/$(PACKAGE)
%:
- dh ${@} --with python2
+ dh ${@} --with python3
override_dh_auto_install:
- dh_auto_install -- DESTDIR="$(CURDIR)/debian/criu" PREFIX="/usr" LIBEXECDIR="/usr/lib"
+ dh_auto_install -- DESTDIR="$(CURDIR)/debian/criu" PREFIX="/usr" LIBEXECDIR="/usr/lib" PYTHON="python3"
override_dh_auto_test:
# disabled: doesn't work yet
--
2.23.0
