From patchwork Mon Jun 3 12:02:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28190 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 9ADBA27BBEA; Mon, 3 Jun 2024 13:06:26 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 2988C27BBE2 for ; Mon, 3 Jun 2024 13:06:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sE6Rl-0001Kn-N7; Mon, 03 Jun 2024 08:05:53 -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 1sE6Rj-0001Iw-Fu for guix-patches@gnu.org; Mon, 03 Jun 2024 08:05:51 -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 1sE6Ri-0000cu-AI for guix-patches@gnu.org; Mon, 03 Jun 2024 08:05:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sE6Rv-0002eP-2y; Mon, 03 Jun 2024 08:06:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71327] [PATCH 8/8] gnu: udisks: Remove obsolete wrap-udisksd phase. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 03 Jun 2024 12:06:03 +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: Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 71327-submit@debbugs.gnu.org id=B71327.171741633410099 (code B ref 71327); Mon, 03 Jun 2024 12:06:03 +0000 Received: (at 71327) by debbugs.gnu.org; 3 Jun 2024 12:05:34 +0000 Received: from localhost ([127.0.0.1]:34263 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sE6RS-0002co-9M for submit@debbugs.gnu.org; Mon, 03 Jun 2024 08:05:34 -0400 Received: from mail-qt1-f172.google.com ([209.85.160.172]:54381) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sE6RQ-0002c8-NF for 71327@debbugs.gnu.org; Mon, 03 Jun 2024 08:05:33 -0400 Received: by mail-qt1-f172.google.com with SMTP id d75a77b69052e-43fe0f361b5so21938801cf.0 for <71327@debbugs.gnu.org>; Mon, 03 Jun 2024 05:05:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717416253; x=1718021053; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=++4uOUKyTSvnEJ/HirtnuUkQmd5AuIo+VrwuCZo4gWI=; b=ic39NdWgtBVe6oVu8scSjH6Y5vRgkqc+IenjSdXDmV+y8KP77KEy2eqfBUai+CVC96 F+xtv3J/bFLb9NrtSa4tlP7i12VOJ4luItQyeUq7Msnz+utGz3T8X/sym3f8bRj+/o6G hqoGhwcKXfISgxwRkBfhiQIaBNbUlhOAbdB5Tuw6PWcrF4zsEb0vsfA4h23ljGQpoLsD mwaDnxjhoqWRicOi3RyvP0SE5GHNVmTAZXmerXVk29NxSI95Ryp3kKCQIZzuBCunM7la IUkDyuZNseFraIxgXRdOoSGCjXwvXgiZkLsKiFqoGx3a+gteBvehicYq1O2ROheIb+yW Pa7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717416253; x=1718021053; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=++4uOUKyTSvnEJ/HirtnuUkQmd5AuIo+VrwuCZo4gWI=; b=clV7GEn88IF0Og7kXRpmCX0rS3JUROni3A9niIMXdB1K7FPyRxPqDqHR2T+YiIRjqT 0+r+fQhvazRLkREogSMtl7wMEU4YFwjJ2MpW+meevjQigP8SdE5qoba3cMTgcvdpRD5X HrcWRC4Iamgl6AffhRUTSkaY9BTa2gpKgdzE6iKbEgBoPaZRRno+u3nN5rLecUgDm5g4 nY7dxmoR6tEs9hiRiGOotSjVNrZ2Dr/FdR+1kKOmrxoRmTGXdJuvuq6Yi/6Ouzdt9isB Ahp+fElPmKO/Z3/+C9nELunpY7NSLGmC0MP0o/yT2tPW7qUZBDme0DAEuKPWlg2EAQQF khRA== X-Gm-Message-State: AOJu0YwV5ok3CPAkL1DgOYAITTPK1VLYHpSV6S4SsgAS8kWMAhLcFMpA JRP8tA3CwDogXX4QmGiTMeI1D/qbjM+z1tmsKhZiLa7hgdhC5UAQV9Lf7g== X-Google-Smtp-Source: AGHT+IGvQMwGWvChMCKt12+LWukKVChKDO42lV2GoBbzMKtw/l1DUN+7oE7eHud/Bcg+KZ1eQUcaXg== X-Received: by 2002:ac8:5d12:0:b0:43e:e6e:21d7 with SMTP id d75a77b69052e-43ff52851e2mr89481471cf.26.1717416252996; Mon, 03 Jun 2024 05:04:12 -0700 (PDT) Received: from localhost.localdomain (dsl-154-1.b2b2c.ca. [66.158.154.1]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-43ff258039fsm38876151cf.79.2024.06.03.05.04.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 05:04:12 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 3 Jun 2024 08:02:56 -0400 Message-ID: <1e1fb7edb9a0338ef9247bdd143b452814a1b736.1717382584.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <1b493965d8ba0a4dc3c06fa813314c4ffa551b3c.1717382583.git.maxim.cournoyer@gmail.com> References: <1b493965d8ba0a4dc3c06fa813314c4ffa551b3c.1717382583.git.maxim.cournoyer@gmail.com> 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: , 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 tools are now patched in the libblockdev plugin sources directly. * gnu/packages/freedesktop.scm (udisks) [phases]: Delete the wrap-udisksd phase. Change-Id: I0de4016adb0cb8af2dca4ef9ebec82e5951b689c --- gnu/packages/freedesktop.scm | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 063816282b..39ca00296e 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1789,22 +1789,7 @@ (define-public udisks (("girdir = .*") "girdir = $(datadir)/gir-1.0\n") (("typelibsdir = .*") - "typelibsdir = $(libdir)/girepository-1.0\n")))) - (add-after 'install 'wrap-udisksd - (lambda* (#:key outputs inputs #:allow-other-keys) - ;; Tell 'udisksd' where to find the 'mount' command. - (let ((out (assoc-ref outputs "out")) - (utils (assoc-ref inputs "util-linux")) - (cryptsetup (assoc-ref inputs "cryptsetup")) - (parted (assoc-ref inputs "parted"))) - (wrap-program (string-append out "/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