From patchwork Sat Mar 22 17:00:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rutherther X-Patchwork-Id: 40623 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 2A1C227BBEA; Sat, 22 Mar 2025 17:02:09 +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=-4.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, 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 24A7B27BBE2 for ; Sat, 22 Mar 2025 17:02:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tw2EY-0006JL-3T; Sat, 22 Mar 2025 13:02:06 -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 1tw2EV-0006Gx-Ja for guix-patches@gnu.org; Sat, 22 Mar 2025 13:02: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 1tw2EV-0005Cx-82 for guix-patches@gnu.org; Sat, 22 Mar 2025 13:02:03 -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:Date:From:To:Subject; bh=fUfKx95lyWCUIGuTD92NsTUvpWt4Ue3rMruuaNWsDp4=; b=baP8O2PQ2quJn1Zj3xB4+8HdgSdVMBsm9q60UvazDYInMAJ4NWR7dEHpDfTAmvt19j9xPqA51/K6Winp6zcUttkALTy5naQr8t3ENmqN+KFxIjqeNWSjkL88BLPqpZ6Z4F6CAMkak2LIQq3w+Xu2UEvaDyk5GGGw5bvHocNuKP+JCPRioO5OhVy+SZx7k8cMqP/5f/fV14tyKQds83peIIc/vxbvAH3MEAcn7taIvjJy8cqxzB3c45+2eO/3jN1tPisqDgH4bwn74RztY2aP8fTqFX3c2h8XfUUPmO9PkvXvC/SCzXKtllYwrSp4eR3OUkFGyREWTBsCtozAnktX0g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tw2EU-0006gl-GF; Sat, 22 Mar 2025 13:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77187] [PATCH] gnu: tlp: Wrap sbin folder Resent-From: Rutherther Original-Sender: "Debbugs-submit" Resent-CC: leo@famulari.name, w@wmeyer.eu, guix-patches@gnu.org Resent-Date: Sat, 22 Mar 2025 17:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77187 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77187@debbugs.gnu.org Cc: Rutherther , Leo Famulari , Wilko Meyer X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Leo Famulari , Wilko Meyer Received: via spool by submit@debbugs.gnu.org id=B.174266289325662 (code B ref -1); Sat, 22 Mar 2025 17:02:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 Mar 2025 17:01:33 +0000 Received: from localhost ([127.0.0.1]:45116 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2E1-0006fp-7c for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:01:33 -0400 Received: from lists.gnu.org ([2001:470:142::17]:59454) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tw2DE-0006aZ-CQ for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:00:45 -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 1tw2D8-0005tb-Es for guix-patches@gnu.org; Sat, 22 Mar 2025 13:00:38 -0400 Received: from ditigal.xyz ([2a01:4f8:1c1b:6a1c::] helo=mail.ditigal.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1tw2D6-00056I-Kl for guix-patches@gnu.org; Sat, 22 Mar 2025 13:00:38 -0400 Received: by cerebrum (OpenSMTPD) with ESMTPSA id 24109682 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 22 Mar 2025 17:00:31 +0000 (UTC) Date: Sat, 22 Mar 2025 18:00:22 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ditigal.xyz; i=@ditigal.xyz; q=dns/txt; s=20240917; t=1742662831; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : from; bh=YG49U0tf/Mb7ycyW1jrFi2Jv3TnFiagViSeHWUZOop8=; b=N0LqLSWVLD941RvCTNRGe73CKuTlj4BvUV0G+Xdj1DfgQD4IevQhHWBg1griXrrwQiN+G E6/olNxXpbKWHXNhzXxavFZZV9q+kGb4S/BZe1RjCTfJzmWVewH0oYNssFRSNTj72TN8fkK g9geTrSPliDXvbRfiw+shDHAcof6wlA= Received-SPF: pass client-ip=2a01:4f8:1c1b:6a1c::; envelope-from=rutherther@ditigal.xyz; helo=mail.ditigal.xyz X-Spam_score_int: 19 X-Spam_score: 1.9 X-Spam_bar: + X-Spam_report: (1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_SUSPICIOUS_NTLD=0.499, FROM_SUSPICIOUS_NTLD_FP=2, PDS_OTHER_BAD_TLD=1.474, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Rutherther X-ACL-Warn: , Rutherther via Guix-patches X-Patchwork-Original-From: Rutherther via Guix-patches via From: Rutherther 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 Seems that tlp recently introduced sbin folder, this has broken the wrapping for tlp script. The tlp script can fail in finding runtime dependencies. * gnu/packages/linux.scm (tlp): Wrap sbin folder Change-Id: Id006f21fb42e385dade732b9d237b045f3a863e7 --- gnu/packages/linux.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) base-commit: fbfd2b93831978aadbb96f32cafdab997b04c6c6 prerequisite-patch-id: cf473eb15513404ca1d287f5b7eca109c848203c prerequisite-patch-id: a46e75bdd193acb5e276e0aa31c77197a3254699 diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b0dc6cbcfd..9bbed7c1df 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8230,7 +8230,9 @@ (define-public tlp (add-after 'install 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((bin (string-append (assoc-ref outputs "out") "/bin")) - (bin-files (find-files bin ".*"))) + (sbin (string-append (assoc-ref outputs "out") "/sbin")) + (bin-files (find-files bin ".*")) + (sbin-files (find-files sbin ".*"))) (define (bin-directory input-name) (let ((p (assoc-ref inputs input-name))) (and p (string-append p "/bin")))) @@ -8260,7 +8262,7 @@ (define-public tlp "pciutils" "rfkill" "wireless-tools")))))) - bin-files))))))) + (append bin-files sbin-files)))))))) (home-page "https://linrunner.de/en/tlp/tlp.html") (synopsis "Power management tool for Linux") (description "TLP is a power management tool for Linux. It comes with