From patchwork Mon Apr 24 01:18:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Cully X-Patchwork-Id: 49463 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0F8E227BBEA; Mon, 24 Apr 2023 02:20:48 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C4EEA27BBE2 for ; Mon, 24 Apr 2023 02:20:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pqksB-0000Ae-IG; Sun, 23 Apr 2023 21:20:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pqks7-00009Y-Mb for guix-patches@gnu.org; Sun, 23 Apr 2023 21:20:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pqks7-00073m-E8 for guix-patches@gnu.org; Sun, 23 Apr 2023 21:20:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pqks7-0000Ia-9s for guix-patches@gnu.org; Sun, 23 Apr 2023 21:20:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63044] [PATCH 4/4] gnu: criu: Change timestamps to 1-Jan-1980 before compressing Resent-From: Brian Cully Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Apr 2023 01:20:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63044 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63044@debbugs.gnu.org Cc: Brian Cully Received: via spool by 63044-submit@debbugs.gnu.org id=B63044.16822991631050 (code B ref 63044); Mon, 24 Apr 2023 01:20:03 +0000 Received: (at 63044) by debbugs.gnu.org; 24 Apr 2023 01:19:23 +0000 Received: from localhost ([127.0.0.1]:47187 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqkrT-0000Gm-65 for submit@debbugs.gnu.org; Sun, 23 Apr 2023 21:19:23 -0400 Received: from coleridge.kublai.com ([166.84.7.167]:60416 helo=mail.spork.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqkrL-0000Fz-6q for 63044@debbugs.gnu.org; Sun, 23 Apr 2023 21:19:16 -0400 Received: from psyduck.jhoto.kublai.com (ool-18b8e9e7.dyn.optonline.net [24.184.233.231]) by mail.spork.org (Postfix) with ESMTPSA id 0A62C8BB1; Sun, 23 Apr 2023 21:19:15 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim; t=1682299155; bh=SOZ1eDPRx4UsmBsI1RF/TvT1tPTBggdPbq3By9QOitI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=V/Ixe8PYdjaj1wqaCh69RgI7PauLcFvsl0aZPYo98QcKgzLiPuJaAFF6qASZkpUgl 2ekn2t0g90SWC45HRYLw9vZ/pvJiDePIFQG3PppWsU+yghaEkC19C+okjTykRMRDh6 r5l4LrNndohFwHvyc9+SDwUZlm4mOa+OwbKmpLzc= Date: Sun, 23 Apr 2023 21:18:59 -0400 Message-Id: <7ae6c1c4c32a5ce24695f7604a9dcba3f6c5974d.1682299133.git.bjc@spork.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Brian Cully X-ACL-Warn: , Brian Cully via Guix-patches X-Patchwork-Original-From: Brian Cully via Guix-patches via From: Brian Cully Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The zip library used by bdist in python-setuptools throws an error unless files are from at least 1980. * gnu/packages/virtualization.scm (sssd) [change-file-datetimes]: new phase --- gnu/packages/virtualization.scm | 99 ++++++++++++++++++--------------- 1 file changed, 53 insertions(+), 46 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 20cbfcfcfe..910f8b321d 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -141,6 +141,7 @@ (define-module (gnu packages virtualization) #:use-module (guix git-download) #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix modules) #:use-module (guix packages) #:use-module (guix utils) #:use-module (srfi srfi-1) @@ -1699,52 +1700,58 @@ (define-public criu (search-input-file %build-inputs "/bin/xmlto"))) #:phases - #~(modify-phases %standard-phases - (delete 'configure) ; no configure script - (add-after 'unpack 'fix-documentation - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "Documentation/Makefile" - (("-m custom.xsl") - (string-append - "-m custom.xsl --skip-validation -x " - (assoc-ref inputs "docbook-xsl") "/xml/xsl/" - #$(package-name docbook-xsl) "-" - #$(package-version docbook-xsl) - "/manpages/docbook.xsl"))))) - (add-after 'unpack 'hardcode-variables - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Hardcode arm version detection - (substitute* "Makefile" - (("ARMV.*:=.*") "ARMV := 7\n")) - ;; Hard-code the correct PLUGINDIR above. - (substitute* "criu/include/plugin.h" - (("/var") (string-append (assoc-ref outputs "out")))) - )) - (add-before 'build 'fix-symlink - (lambda* (#:key inputs #:allow-other-keys) - ;; The file 'images/google/protobuf/descriptor.proto' points to - ;; /usr/include/..., which obviously does not exist. - (let* ((file "google/protobuf/descriptor.proto") - (target (string-append "images/" file)) - (source (search-input-file - inputs - (string-append "include/" file)))) - (delete-file target) - (symlink source target)))) - (add-after 'install 'wrap - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Make sure 'crit' runs with the correct PYTHONPATH. - (let* ((site (string-append #$output "/lib/python" - #$(version-major+minor - (package-version python)) - "/site-packages")) - (path (getenv "GUIX_PYTHONPATH"))) - (wrap-program (string-append #$output "/bin/crit") - `("GUIX_PYTHONPATH" ":" prefix (,site ,path)))))) - (add-after 'install 'delete-static-libraries - ;; Not building/installing these at all doesn't seem to be supported. - (lambda _ - (for-each delete-file (find-files #$output "\\.a$"))))))) + (with-imported-modules (source-module-closure '((guix utils))) + #~(modify-phases %standard-phases + (delete 'configure) ; no configure script + (add-after 'unpack 'fix-documentation + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "Documentation/Makefile" + (("-m custom.xsl") + (string-append + "-m custom.xsl --skip-validation -x " + (assoc-ref inputs "docbook-xsl") "/xml/xsl/" + #$(package-name docbook-xsl) "-" + #$(package-version docbook-xsl) + "/manpages/docbook.xsl"))))) + (add-after 'unpack 'hardcode-variables + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Hardcode arm version detection + (substitute* "Makefile" + (("ARMV.*:=.*") "ARMV := 7\n")) + ;; Hard-code the correct PLUGINDIR above. + (substitute* "criu/include/plugin.h" + (("/var") (string-append (assoc-ref outputs "out")))) + )) + (add-before 'build 'fix-symlink + (lambda* (#:key inputs #:allow-other-keys) + ;; The file 'images/google/protobuf/descriptor.proto' points to + ;; /usr/include/..., which obviously does not exist. + (let* ((file "google/protobuf/descriptor.proto") + (target (string-append "images/" file)) + (source (search-input-file + inputs + (string-append "include/" file)))) + (delete-file target) + (symlink source target)))) + (add-before 'install 'change-file-datetimes + (lambda _ + (use-modules (guix utils)) + (change-file-timestamps-recursively "./" + "1980-01-01 00:00:00"))) + (add-after 'install 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Make sure 'crit' runs with the correct PYTHONPATH. + (let* ((site (string-append #$output "/lib/python" + #$(version-major+minor + (package-version python)) + "/site-packages")) + (path (getenv "GUIX_PYTHONPATH"))) + (wrap-program (string-append #$output "/bin/crit") + `("GUIX_PYTHONPATH" ":" prefix (,site ,path)))))) + (add-after 'install 'delete-static-libraries + ;; Not building/installing these at all doesn't seem to be supported. + (lambda _ + (for-each delete-file (find-files #$output "\\.a$")))))))) (inputs (list protobuf python