On Sat, Aug 24, 2024 at 8:48 PM Salvatore Bonaccorso <car...@debian.org> wrote: > > Hi,
Hi Salvatore, > > On Sat, Aug 24, 2024 at 08:28:20PM +0200, Alexander Mikhalitsyn wrote: > > Dear friends, > > > > I'm trying to fix CRIU package in Ubuntu Noble: > > https://bugs.launchpad.net/ubuntu/+source/criu/+bug/2066148 > > > > We had a discussion with my colleague Simon Déziel about my > > debdiff [1] for CRIU package in Ubuntu and he pointed me out that > > there is a bug on Debian bugtracker about these build issues. > > > > Of course, I would like to help to fix all problems with CRIU > > package in Debian too. (And hopefully, these changes will > > be autoinherited by Ubuntu.) > > > > As far as I understand, I need to prepare a PR that includes > > patches from debdiff for master branch (based on CRIU 3.19). > > What I can't understand is why debian/sid still uses 3.17 release? > > Do I need to fix 3.17 branch too? > > > > JFYI. We are preparing a new CRIU release 4.0: > > https://github.com/checkpoint-restore/criu/pull/2467 > > The main issue right now I have with criu and blocking 3.19 is the > build part for the python code, I'm unable to make it ocrrectly build > with pyproject. Is this locally reproducible? Can I just take the debian/sid container, pull the master branch from https://salsa.debian.org/debian/criu and do debuild to see the problem? > > My current workdir on top of the packaging in the salsa repository > looks like: > > diff --git a/debian/control b/debian/control > index 20feb59c9a9c..bde1d5cfbe17 100644 > --- a/debian/control > +++ b/debian/control > @@ -17,6 +17,7 @@ Build-Depends: > pkg-config, > protobuf-c-compiler, > protobuf-compiler, > + pybuild-plugin-pyproject, > python3-all, > xmlto > Standards-Version: 4.6.2 > diff --git a/debian/rules b/debian/rules > index 59e3370137e6..bb1480f2106f 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -1,12 +1,16 @@ > #!/usr/bin/make -f > > export DEB_BUILD_MAINT_OPTIONS = hardening=+all > +export PYBUILD_SYSTEM=pyproject > +export PYBUILD_NAME=pycriu > +export PYBUILD_DIR=lib > +export PYBUILD_VERBOSE=1 > > PACKAGE = $(firstword $(shell dh_listpackages)) > TMP = $(CURDIR)/debian/$(PACKAGE) > > %: > - dh ${@} --with python3 > + dh ${@} --with python3 --buildsystem=pybuild > > override_dh_auto_install: > dh_auto_install -- DESTDIR="$(CURDIR)/debian/criu" PREFIX="/usr" > LIBEXECDIR="/usr/lib" PYTHON="python3" > > I would very much appreciate help with that so I can move forward with > uploading 3.19. > > I will have a look at what is done in Ubuntu. Kind regards, Alex > > Regards, > Salvatore
