[bug#63149] [PATCH] gnu: criu: Fix build

[bug#63149] [PATCH] gnu: criu: Fix build

[Brian Cully via Guix-patches via]

Use python-toolchain explicitly in order to pull in our patched ZipFile
creation which ignores timestamp.

* gnu/packages/virtualization.scm (criu) [native-inputs]: Add python-toolchain.
---
 gnu/packages/virtualization.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 4a0d6b0096..d9fc8108dc 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1748,7 +1748,6 @@ (define-public criu
                (for-each delete-file (find-files out "\\.a$"))))))))
     (inputs
      `(("protobuf" ,protobuf)
-       ("python" ,python)
        ("python-protobuf" ,python-protobuf)
        ("iproute" ,iproute)
        ("libaio" ,libaio)
@@ -1763,7 +1762,8 @@ (define-public criu
            asciidoc
            xmlto
            docbook-xml
-           docbook-xsl))
+           docbook-xsl
+           python-toolchain))
     (propagated-inputs
      ;; included by 'rpc.pb-c.h'
      (list protobuf-c))
-- 
2.39.2

[bug#63149] [PATCH] gnu: criu: Fix build

[Brian Cully via Guix-patches via]

Note that the complete fix for criu requires patch #63044, or 
something similar to fix the ZipFile issue.

-bjc

[bug#63149] [PATCH v2] gnu: criu: Fix build

[Brian Cully via Guix-patches via]

Ensure all files being built are dated no earlier than 1980 by copying in a
modified (@@ (guix build python-build-system) ensure-no-mtimes-pre-1980) which
is symlink-aware. This copy should be removed when the original procedure is
modified to avoid calling UTIME on symlinks.

* gnu/packages/virtualization.scm (criu) [ensure-no-mtimes-pre-1980]: new
phase.
* gnu/packages/virtualization.scm (criu) [inputs]: Remove python.
* gnu/packages/virtualization.scm (criu) [native-inputs]: Add
python-toolchain.
---
 gnu/packages/virtualization.scm | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 4a0d6b0096..c88fd31146 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1697,6 +1697,8 @@ (define-public criu
              (string-append "XMLTO="
                             (search-input-file %build-inputs
                                                "/bin/xmlto")))
+       #:modules ((ice-9 ftw)
+                  ,@%gnu-build-system-modules)
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)            ; no configure script
@@ -1719,6 +1721,17 @@ (define-public criu
              (substitute* "criu/include/plugin.h"
                (("/var") (string-append (assoc-ref outputs "out"))))
              ))
+         ;; TODO: use
+         ;; (@@ (guix build python-build-system) ensure-no-mtimes-pre-1980)
+         ;; when it no longer throws due to trying to call UTIME on symlinks.
+         (add-after 'unpack 'ensure-no-mtimes-pre-1980
+           (lambda _
+             (let ((early-1980 315619200))  ; 1980-01-02 UTC
+               (ftw "." (lambda (file stat flag)
+                          (unless (or (<= early-1980 (stat:mtime stat))
+                                      (eq? (stat:type stat) 'symlink))
+                            (utime file early-1980 early-1980))
+                          #t)))))
          (add-before 'build 'fix-symlink
            (lambda* (#:key inputs #:allow-other-keys)
              ;; The file 'images/google/protobuf/descriptor.proto' points to
@@ -1748,7 +1761,6 @@ (define-public criu
                (for-each delete-file (find-files out "\\.a$"))))))))
     (inputs
      `(("protobuf" ,protobuf)
-       ("python" ,python)
        ("python-protobuf" ,python-protobuf)
        ("iproute" ,iproute)
        ("libaio" ,libaio)
@@ -1763,7 +1775,8 @@ (define-public criu
            asciidoc
            xmlto
            docbook-xml
-           docbook-xsl))
+           docbook-xsl
+           python-toolchain))
     (propagated-inputs
      ;; included by 'rpc.pb-c.h'
      (list protobuf-c))

base-commit: b363fab46f5af42b3f653e2fee1834477bd5aacd
prerequisite-patch-id: 8a03c5e8bcd4c526b93c558d550725887f932e41
prerequisite-patch-id: 89400c29b4c30dfbe8492aff1751ca583397b4f0
prerequisite-patch-id: a1963f772e753239b80e6a7b0d9f55e0ab4d662b
-- 
2.40.1

[bug#63149] [PATCH] gnu: criu: Fix build

[Brian Cully via Guix-patches via]

I've decided to just patch the mtime conversion directly into criu,
rather than trying to factor it out. This is mainly because the original
version of ‘ensure-no-mtimes-pre-1980’ throws an error when it attempts
to change timestamps of symlinks. Ideally, that will be fixed someday,
but that will cause huge downstream changes.

In the mean-time, we can use this, and delete it after fixing
‘ensure-no-mtimes-pre-1980’.

-bjc

bug#63149: [PATCH] gnu: criu: Fix build

[Ludovic Courtès]

Hi,

Brian Cully <bjc@spork.org> skribis:

> Ensure all files being built are dated no earlier than 1980 by copying in a
> modified (@@ (guix build python-build-system) ensure-no-mtimes-pre-1980) which
> is symlink-aware. This copy should be removed when the original procedure is
> modified to avoid calling UTIME on symlinks.
>
> * gnu/packages/virtualization.scm (criu) [ensure-no-mtimes-pre-1980]: new
> phase.
> * gnu/packages/virtualization.scm (criu) [inputs]: Remove python.
> * gnu/packages/virtualization.scm (criu) [native-inputs]: Add
> python-toolchain.

Tweaked the commit log and applied.

Thank you, and apologies for the delay!

Ludo’.