From patchwork Mon Oct 7 20:12:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 68766 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 CAFF127BBEC; Mon, 7 Oct 2024 21:18:49 +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=-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 3B23D27BBE2 for ; Mon, 7 Oct 2024 21:18:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxuBO-0001OS-B3; Mon, 07 Oct 2024 16:18:18 -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 1sxuB4-0000vX-Q6 for guix-patches@gnu.org; Mon, 07 Oct 2024 16:18:03 -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 1sxuB3-0002WU-US for guix-patches@gnu.org; Mon, 07 Oct 2024 16:17:58 -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=PdTYNl66wpW3/Wi0GMUWBzvhLuli7zi8r6aOEDcekYQ=; b=MiK+mj7rEFbW1pvYd8E2GLr12AxMH6qvlxg27lCoU6RJsy3iqDUgasXA9xo4RanKmsMbRybPyTOJ7eyC7a9x5W7QCi2jEoo2SbhuojN15CNjF5/n9PUeGOtNuDmtRfR9ggaKA25AC9smpLGNjkoRWmTXtMqdqtVr2ksKlAfSUS8xzcIsLa1mduNNHpUPeKzT4moo67+0GfkCev8tTnQ2OG1gWjXOqgo6+83fPmdzzkO00Qfw5dhmviy8T+jBd8UMsDs3tzkEplfVOdj3XftyDUqJ+pgcIi/qdJxuWpRX+SwZ5993VuVeYe3iTuhqFl9MdBZV55eM/8cCZYmMKKIKBw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxuBB-0001kK-I1 for guix-patches@gnu.org; Mon, 07 Oct 2024 16:18:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71327] [PATCH v2 7/7] gnu: udisks: Remove obsolete wrap-udisksd phase. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Oct 2024 20:18:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71327 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71327@debbugs.gnu.org Cc: iskarian@mgsn.dev, maxim.cournoyer@gmail.com Received: via spool by 71327-submit@debbugs.gnu.org id=B71327.17283322566625 (code B ref 71327); Mon, 07 Oct 2024 20:18:05 +0000 Received: (at 71327) by debbugs.gnu.org; 7 Oct 2024 20:17:36 +0000 Received: from localhost ([127.0.0.1]:48390 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxuAi-0001in-2G for submit@debbugs.gnu.org; Mon, 07 Oct 2024 16:17:36 -0400 Received: from 3.mo582.mail-out.ovh.net ([178.33.253.26]:56517) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxuAe-0001iG-Ic for 71327@debbugs.gnu.org; Mon, 07 Oct 2024 16:17:33 -0400 Received: from director10.ghost.mail-out.ovh.net (unknown [10.108.17.95]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 4XMr6W3t99z16V2 for <71327@debbugs.gnu.org>; Mon, 7 Oct 2024 20:17:23 +0000 (UTC) Received: from ghost-submission-55b549bf7b-knkw8 (unknown [10.110.188.168]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 5067A1FD28; Mon, 7 Oct 2024 20:17:23 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-55b549bf7b-knkw8 with ESMTPSA id 3f0hDdNBBGeQHwIAGH7rUA (envelope-from ); Mon, 07 Oct 2024 20:17:23 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G0049ece0307-cb74-4cc4-a7c1-360bb7614f1d, A12302D5D8CF0E033BA678025A323BF4FAD59D46) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 Date: Mon, 7 Oct 2024 22:12:33 +0200 Message-ID: <20241007201652.15133-8-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241007201652.15133-1-ngraves@ngraves.fr> References: <20241007201652.15133-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4743134835310256849 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvddvledgudeglecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelgeevuefhudekgefhleehudfgfeekvdfgffejffekkefggeehveeluedtudelueenucffohhmrghinhepfhhrvggvuggvshhkthhophdrohhrghenucfkphepuddvjedrtddrtddruddpkeeirddvgeeirdduledrvddvuddpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedufedvjeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekvddpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=PdTYNl66wpW3/Wi0GMUWBzvhLuli7zi8r6aOEDcekYQ=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1728332243; v=1; b=189IIuCjyC/xwDXkDBw5T9D1a4muqeGFts3pZe5jjQ6OsypuYkINrk14ZxaY3/JuCOUiimNi L9DUDHn/of7DY8EKGmel2PYMmHPQ05HkTy1jpi2fh4qzQFag6CXiYhVq0Oe6r5LmW7AV5qiOz6C CJ9gzkyNQDrUf78aOF2Verf2kB+HtkqGyUsxL/3/OXdfM4R5726XfRDJj5OzBugr6mhi9N0stwr DKCYJ35buOHIJ081CZgv+m4dcswPxV8tdZklkQYZBbYbU1dTamcwNVAQ0D8enOQiVyX6mJRqbBM +21q18oNvi8XTnp+KDpF9w5849EDSJJ0cXVb3nNiLyYMg== 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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: Maxim Cournoyer The tools are now patched in the libblockdev plugin sources directly. * gnu/packages/freedesktop.scm (udisks) [phases]: Delete the wrap-udisksd phase. --- gnu/packages/freedesktop.scm | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 14c0482496..0ab0bb5104 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1804,21 +1804,7 @@ (define-public udisks (("girdir = .*") "girdir = $(datadir)/gir-1.0\n") (("typelibsdir = .*") - "typelibsdir = $(libdir)/girepository-1.0\n")))) - (add-after 'install 'wrap-udisksd - (lambda _ - ;; Tell 'udisksd' where to find the 'mount' command. - (let ((utils #$(this-package-input "util-linux")) - (cryptsetup #$(this-package-input "cryptsetup")) - (parted #$(this-package-input "parted"))) - (wrap-program (string-append #$output "/libexec/udisks2/udisksd") - `("PATH" ":" prefix - (,(string-append utils "/bin") ;for 'mount' - ;; cryptsetup is required for setting encrypted - ;; partitions, e.g. in gnome-disks - ,(string-append cryptsetup "/sbin") - "/run/current-system/profile/bin" - "/run/current-system/profile/sbin"))))))))) + "typelibsdir = $(libdir)/girepository-1.0\n"))))))) (home-page "https://www.freedesktop.org/wiki/Software/udisks/") (synopsis "Disk manager service") (description