From patchwork Sun Mar 23 01:20:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "vasilii.smirnov--- via Guix-patches\" via" X-Patchwork-Id: 40697 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 4681327BBEA; Sun, 23 Mar 2025 01:27:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 B0EAE27BBE2 for ; Sun, 23 Mar 2025 01:27:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twA7M-00068o-3k; Sat, 22 Mar 2025 21:27:12 -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 1twA7G-00066o-67 for guix-patches@gnu.org; Sat, 22 Mar 2025 21:27:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twA7F-0006Iz-SO for guix-patches@gnu.org; Sat, 22 Mar 2025 21:27:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=0lcJhYpiJKjSbMAmhZd7TRDPAtPh2sv48+h8p5baIUk=; b=G10gyAHYruiwwCawQiHm3dHXXaXAj/SaYO/QHmLfgqf+csTMwkrE/kV6MyXEOuawk1ejnmKjG1bc0Q4CNyzmtM70bVjRYWzWyZF6Cu/hV6O1K9B+GZOen5tRirbv1F5c9ETeBHgVqnitCwR/WPCrzlEPbw9xhjToqSIzRq/dqSJse/Ts1Wipd1dYGHgpkPyKggOpFPGU2vcgwBvfTdRx6MS7mNccw3h594UXCukOBok3TaWPHB+akuypY4P4Czd2l5Z/qTMEfTfFd1FijY5cGoMow7Fuq2DmrE+p7bWJW94iNf6QY8eB6FJd2Lrr57UR9Pk+4MbNVHQdWRL7ZATDqQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1twA7F-0001G3-Lz; Sat, 22 Mar 2025 21:27:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#75119] [PATCH v3 5/5] gnu: criu: Update to 4.0. Resent-From: ashish.is@lostca.se Original-Sender: "Debbugs-submit" Resent-CC: sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 23 Mar 2025 01:27:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75119 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: ludo@gnu.org Cc: 75119@debbugs.gnu.org, Ashish SHUKLA , Sharlatan Hellseher X-Debbugs-Original-Xcc: Sharlatan Hellseher Received: via spool by 75119-submit@debbugs.gnu.org id=B75119.17426932234809 (code B ref 75119); Sun, 23 Mar 2025 01:27:05 +0000 Received: (at 75119) by debbugs.gnu.org; 23 Mar 2025 01:27:03 +0000 Received: from localhost ([127.0.0.1]:46380 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1twA7C-0001FE-Qr for submit@debbugs.gnu.org; Sat, 22 Mar 2025 21:27:03 -0400 Received: from anamika.lostca.se ([65.21.75.227]:33896) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1twA5j-00013r-8Z for 75119@debbugs.gnu.org; Sat, 22 Mar 2025 21:25:35 -0400 Received: from borboleta.inet6.in (unknown [IPv6:2a01:4f9:3070:1aea::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: abbe) by anamika.lostca.se (Postfix) with ESMTPSA id A7A3213AB2; Sun, 23 Mar 2025 01:25:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1742693119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0lcJhYpiJKjSbMAmhZd7TRDPAtPh2sv48+h8p5baIUk=; b=MMrTccMt1BJqfvurmkAQmuEXn6dnHYIZqOt9jI4pXVU8Soaj3x9LO5glx+tKmHZfHnYKsM Z7cmS6DkHAOEyXcyAFlAsFCYZdU+OIVoNbVAOU37oNAAVtdqh3ZmWMN69sY2NFX05b5TI2 cwT92eg7TNi0jMnbxZSg3+Y6zEm1768= Date: Sun, 23 Mar 2025 01:20:36 +0000 Message-ID: <4393837905c168e910b4865ab9dbc982974f8a48.1742692836.git.ashish.is@lostca.se> X-Mailer: git-send-email 2.48.1 In-Reply-To: <871pv0y0us.fsf@gnu.org> References: <871pv0y0us.fsf@gnu.org> 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: ashish.is@lostca.se X-ACL-Warn: , "ashish.is--- via Guix-patches" X-Patchwork-Original-From: "ashish.is--- via Guix-patches" via From: "vasilii.smirnov--- via Guix-patches\" via" 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 From: Ashish SHUKLA * gnu/packages/virtualization.scm (criu): Update to 4.0. [#:phases]: Add a few more substitutions. : Manually install python components. [native-inputs]: Depend on python-setuptools. Change-Id: I9fc3a8e554499edd339a89597d0e1438997a24c8 --- gnu/packages/virtualization.scm | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 9c72e1793f..b5c0c464ac 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -2000,7 +2000,7 @@ (define-public vmware-open-vm-tools-gtk (define-public criu (package (name "criu") - (version "3.17.1") + (version "4.0") (source (origin (method git-fetch) @@ -2009,7 +2009,7 @@ (define-public criu (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ff3xfcf0wfz02fc0qbj56mci1a0xdl8jzaihaw6qyjvgrsiq7fh")))) + (base32 "0p46z5iclyvvg1arvqhl3bdg1g2mny0pxyz6pr5n87cnj7maqphg")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -2040,7 +2040,14 @@ (define-public criu (lambda* (#:key inputs outputs #:allow-other-keys) ;; Hardcode arm version detection (substitute* "Makefile" - (("ARMV.*:=.*") "ARMV := 7\n")) + (("ARMV.*:=.*") "ARMV := 7\n") + (("^head-name :=.*") + (string-append "head-name := " + ,(package-version this-package) + "\n"))) + ;; disable pip install + (substitute* "Makefile.install" + (("SKIP_PIP_INSTALL.*:=.*") "SKIP_PIP_INSTALL := 1\n")) ;; Hard-code the correct PLUGINDIR above. (substitute* "criu/include/plugin.h" (("/var") (string-append (assoc-ref outputs "out")))))) @@ -2066,6 +2073,16 @@ (define-public criu (package-version python)) "/site-packages")) (path (getenv "GUIX_PYTHONPATH"))) + ;; manually install stuff that was pip-installed + (for-each (lambda (dir) + (with-directory-excursion dir + (setenv "GUIX_PYTHONPATH" + (string-append site ":" path)) + (invoke "python3" "setup.py" "install" + (string-append "--prefix=" out) + "--no-compile" "--root=/" + "--single-version-externally-managed"))) + (list "lib" "crit")) (wrap-program (string-append out "/bin/crit") `("GUIX_PYTHONPATH" ":" prefix (,site ,path)))))) (add-after 'install 'delete-static-libraries @@ -2091,6 +2108,7 @@ (define-public criu xmlto docbook-xml docbook-xsl + python-setuptools python-toolchain)) (propagated-inputs ;; included by 'rpc.pb-c.h'