From patchwork Thu Jun 5 15:42:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 43023 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 DDB8B27BC4B; Thu, 5 Jun 2025 16:49: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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,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 F3C9B27BC49 for ; Thu, 5 Jun 2025 16:49:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uNCq0-00059f-5g; Thu, 05 Jun 2025 11:49:04 -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 1uNCpy-000599-RW for guix-patches@gnu.org; Thu, 05 Jun 2025 11:49:02 -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 1uNCpy-0005mf-I8 for guix-patches@gnu.org; Thu, 05 Jun 2025 11:49:02 -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=b6dxvwZkA0EWn+yG8JrFtSy9r3hMnzyWeYztMKMhh+s=; b=R+XoLRtCmreeBzjpQg8Gon0naiaU3huIZolGXVErTMs7TTdPu4v6QzlmhHo/ANcNhDbhId6ua87XKrH/wGkTDgakknV+60/Vzn8vDc3/AOwHo24Wi3BQS+g4hoYd88JCuirnK8ul+AMgBS0e6hfsOy4kEmTmUR4ON9cVJuWuWhywz2p1/dLhXcBD23Dc0K2FFfm+AMCJFLZy3JIz6DCin3inQB2kH8eQ1nDqSlrbI1hAO7CnaqOcv56C4KBmaExxpyiSriRAgE/yh2XrIJQy1b9vjXgk7+klfuyHbXdikViKccrsVxIlOYJJ2esLQtC9b7bpbVCgTLhxTC32JUsc8g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uNCpy-0004yb-7u; Thu, 05 Jun 2025 11:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78700] [PATCH] gnu: tlp: Fix scripts. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: leo@famulari.name, guix-patches@gnu.org Resent-Date: Thu, 05 Jun 2025 15:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78700 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78700@debbugs.gnu.org Cc: Morgan Smith , Leo Famulari X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Leo Famulari Received: via spool by submit@debbugs.gnu.org id=B.174913850819006 (code B ref -1); Thu, 05 Jun 2025 15:49:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Jun 2025 15:48:28 +0000 Received: from localhost ([127.0.0.1]:35544 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uNCpQ-0004wT-2A for submit@debbugs.gnu.org; Thu, 05 Jun 2025 11:48:28 -0400 Received: from lists.gnu.org ([2001:470:142::17]:57248) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uNCpO-0004vt-0P for submit@debbugs.gnu.org; Thu, 05 Jun 2025 11:48:26 -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 1uNCpI-000559-8b for guix-patches@gnu.org; Thu, 05 Jun 2025 11:48:20 -0400 Received: from mail-mw2nam10olkn2076.outbound.protection.outlook.com ([40.92.42.76] helo=NAM10-MW2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uNCpF-0005eE-RK for guix-patches@gnu.org; Thu, 05 Jun 2025 11:48:20 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jYEnR3M7ga+//PsFQPHpmiwsT/9S1y+T3Y9dYCUaehbgIX5T6x+RaU/raQOBXj7ZcGO0T5XBDHCulSAqANW69o+pCIz5Vqb/vVpPVEUwUTrkn0Tk+C5Uoef7DRx4OgbMmeZJbAxD70I82B9ddGjDFTkhzI9QYDEpChpy0F6xnPqfi8sO74b5eyVyhU3jRyNxQ1iVCFAvpZ/dTaOeFYBGvInsweQ9XO+7OMxYgjpdPHr9IUQpRFxNV47UbFjCcAYW5wbV6CRD4Iya8s/fji4eNFCCoWYlm0BglIZa9bpyjU4ZSKTOsWJ8CA1/UgWV1oE3cK6T2KWuFLgQDK5xE9IdCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=b6dxvwZkA0EWn+yG8JrFtSy9r3hMnzyWeYztMKMhh+s=; b=bwUDFyNoEnd+5xfabVvja7kvvOIACUShRy0Q1vlNlxOWexfCHmD5PLanBy6vvqUIK4c6a3Sty3RNZb8nY/T6sBP19lNciODDDNnYkfvKyKxJ0Hmokfpnk6YiGVIpgyXYQ8GK7LiJHohisZtRlO1ffnpBXSCIPFxPcNmp8/nhoVtWc75G3vATR6b4agbxmTt3ERmxTArW/NY6zt+PceUpe+3GRgSHmtzn6wP2lTuw62m5RShaKzBXM5kOkXzTCB0xyWLWXfnUsbQ+ZgMoT9f9w0rlKfDBILkwSfEKbzvu8OD/EQjitZkdWvKcLt60TVsftpeBmuDuvotAxGdSbiv4Nw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=b6dxvwZkA0EWn+yG8JrFtSy9r3hMnzyWeYztMKMhh+s=; b=oDRSX++AnuUyqmdu/9M8qh5Pmqt73tiW9pmYi6tRaqQYgo9X7LoQoeLsAH0tL+QE11dDGzEIlVaPmZdyvRbZx537ZcY9uWDkTOHS8mmUviaem/anh1Z6HkZIH6EXNKSJecW3e7wBj20Zai1/CWFsP8EniaxfKBBf33FX+R8981w3qZ7TQvr5VIx+9K+ncBJaFHX46UkQN8wwk/xlyKq8uJsJ2Q8046pI/Z9eBN7TTKo86zUFymxbpkGwkuLR/7WmRXiQfvFMO+d5hyuvY8ScXSx4TCR4VMLRGiXYsRUtbJjNnD92SOMMQqKJf/nGvhSeRODrXmbRBYRdl0jbUMdogA== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by IA2PR84MB3882.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:208:4b4::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8813.20; Thu, 5 Jun 2025 15:43:12 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef%3]) with mapi id 15.20.8769.035; Thu, 5 Jun 2025 15:43:12 +0000 From: Morgan Smith Date: Thu, 5 Jun 2025 11:42:14 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 X-ClientProxiedBy: YT4PR01CA0259.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:10f::14) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: <5d67bbd37541865259623c9c4e66d4375c21281e.1749138133.git.Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|IA2PR84MB3882:EE_ X-MS-Office365-Filtering-Correlation-Id: 4a3e88ae-a386-4269-207c-08dda447ad97 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnrB/dW6NBi7o1dzofYv37pLSWHnQy5CwknRRvYE1qpc5E6L69EsNwL/9i11xPx0nJvufcmaJuKmx4ftmPcC0uPzJL8NNpIeRlxJza84BRVpaum0PTL+9xtGLJ9oGAVBFa36GhJvwdb8Of1l7+5aiAW4eEadnvbRwXZ9833KQ/4vsGY78H1lgxX+SjjorsG04pN05gEMe5VPfmkiGuDPeFpjSrrEQgwRtnI4Y1593I7//Sv+lkDV/16Bc5ak7TN+q5NYLovItyzuVu7OqhfqgmfjubYkMAT+0zackAlV9W2OAZta7WWXkJwWOTKdiEOAN3l0NAU48HOdNRHw1r8GlfVGA8H2mdg8GbsiI8eEKjqbgcOBEPs2Oxi2icZ53vqHW9OM31OMPUDIu5Af4fHSe5HnmJ0hDLThtIIhl5QpqbNkyJiZSAGrinFpUomcIwBAs7+Kyw+a20PiolD8xM2D8GScQhS9JwUS1qf96Jg4YLXOj0Q+6HJ1th1uOtnylwYAHyQ0DkAuGTb9Luqa54YJdyDcUvStR1P0PRyncxeI6zk2A6sYeZQW566UR9PVIS70xtVUC+w2iKmZKEVxo1fFKzXT7y7cUTXWp2bGppamR/PTaQAwP92vc7Kli7vNsuj6dIUkfwcwxg2BopKjelAqltAKbLEhnoPIRf6Lmf9CRuNJjINUNsyVuBYThWJVZPkPXuAs9PJI87HcZf0KCHDKLBQuoiogbm59Y4iq7jIxLvjeInJ2VARtdM09xzWlc3pr+Gw= X-Microsoft-Antispam: BCL:0; ARA:14566002|8060799009|5072599009|7092599006|15080799009|19110799006|461199028|3412199025|440099028|1710799026; X-Microsoft-Antispam-Message-Info: yq92EpHdEV1wGyDx84I1jwUENxm7hVSGrEwiddpj87HP0BR4RlxtXPi5yP10787GX/oAh26adRGhCtDD78REHA2/YBtIQv1v7XOFtqiwC74cZcxmzGf/b/gtYvVQw/8Lw0C7QMNhTkdTdaF4x7lvAyjfCB9BTquGgytaD5PkIBbx/SiAwmvH93RvYRXJobVgOj6YlsjzZ4YiylkslinrRqNnUFk6+utHVl8B0Km4WD7pA1UWH5imOUUrVOHA9all4osNMd6QAPxrdiVmU/FSrV8+g6pTpExIwUsCiLT42T2nRUQtguaHAl5kUWEBE0PeLx5HLez3B4HKCN4mRKFPnJk5nbLGk07UnMjdXoR06yXC6mlxGRjO2fAw0cliJiOkTAPfs0fL7EPin4Xh2AT4naNNGabSJa1xYU9HX0Lc95xmh5ISPAzddJ+Nd9805wjNqlwYHQl1Q6HB4Gv5k6k7tiMxDAJ/aCd8+Lx3ZJ2AYHsvZCOuX/3SUhh824C7ulq2UBU0jACQVb8LHbfJlMN51dWLa4deEJVMaXnPJ3+hbP6qcYqji7h3ApnK7XCR9fTj6Q4tHCnGSvVqpPEG1KKY8nRIJENofA7TXJtl0knUfQkv5+ShgYpkPxTOQx8RGDfAirlJnOwORpt4zFhneI01pBDuhNx5EPXaYHYjY+JjEoIBhaz4yBn5hUkGzHaH8GSsJyUw+/Uwemp/038oNO4wQW9E9vh6CiGVoVLECNUqSpP0Lb45nhwvjI6YXoRGFl+lhw2OI+t0q/zjGyFCanZ3Fvx2GIIz/jmjknbvuunrUJAp0qad/a00P/TkolHY5MHMM6mmPwdfyOhp+c0rImMjpriqmzOOnrG7oRSL6UUZe9Ur6VFXxnLfGUYMbLA871zDtiMLFZYmRQ8zZQF8ACkfg7iGSVl8sYzmPx7gXGeQZqMWQ8eEkSP2H+hTIC3zVUv8ViFTkLkm8QytVUvj+S1PMDmkqKRYUSIywqoEiVErtJyO/C2NoOaEIVBbJFzhhkBlWiSSgDHoL0yGiArnKnTLCcAc1gb1IUNMuBAHzSTaKsFB+9OtUj/npAHbPqQVA6vG1wymEhoCEG2mzjM26BgCjHBruMT6jALHfFiVoOY71doHuSGz5P7R8RvUKotJo+JR96vpe6RNHjHTtzaZwhNXOw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: k6OWkG46ve1TRdLh/FkaIVLSqi7CvnATfR486b9CPCYQYoig7uz/RB+H1W9m5H14uw48CgYlYLnj8XQVRakCI95VqqygxK4CCyqhPbbzChsVySJvPboFwMW0HN/ucHf2jZrv0/7vKgCvA6+ElTc/uB+oEl3zhfRQkfph5FLJ0Okd33xQeAuenTjE2TG2m2r8il3InpT+PVralwcUkjg993LwAImcg6nYIfCy2Aq6lOjGcOcokFI4I0z3BDCkSboHzVVpVOvlL/AXra8Fv9sbxINHTBGOqhhrxCEMNIeU3Xz8D5CTUf4tNixLtJylNG000T7iEjntUyR92z0tvdRrnU9lXJa9rXndp+x/pxMCGQsJqvq20CBhKBLjSjM5fXs1TXiL4XMWxOyDSOoQ2ZtecINST62wMpPZHjgMrKv+vhWdtOMESvn9UMIjmsLIWE9cWeEKqlcflkBzk7hKiIthfJNIhLzw0PgdY1kdxDwl3ticnvknBMOKWKFjwddCDZwJFm51QguclOzX2aSUsVm5gHgFO362e6jwKG6HtJRtVci7JeDmOeHOTYNYiFINm0A26ntSJfLijfMIBTi7HbTqZuCP5NjEn0aOkpRt5V4efZlwTs6JLFI6TP+8eSK9q2w2d2RR7k+3qKYcSSACLsidN2+9MLWU5Hnl/bIKNm76ZCFDlIeHOdkg8X5BaFCYyB94jc2kdzjeykNes3LgPdE+/P+fetXZLX+/w6+TloF9/ls7X9t29kNRsA8LnPAi58vSHsFJz9VnXz8nE3yRRqrSDPpZfX/pUgT9oOu1oX8hQYghI272ufZ2mHCQcDG3ruml0qWhQGLDUsqNxNRaRIzDD4ZBprC4HeShFEr11paXEuJxBf6WeZjODZ7QVp86feeLeSrQG/DN5J/CMfzRC3If3cFil1ChTPkMwHg5IQ3ZQJ1TuzcobZ1OqLy2kXGZo+gGyvp6DidilXr1PGlygw5Q44BWa1+z25eh3frC27DYNkIbSgnoaUL5GQIbF2EpcERmwiy9wTwfrUMNTNMfou43D1TokoHr28d189pvOdOjYDpYupZzKut1mHhXdnSzgnjNE9iGT09IAanvI4BxMV1FZB4PAtEZ25OM6cSQzWBKIMq41X4zTLwtSNJIhPhYiioPPRGNn8KDokephgdaOQ1JxlICe1suJF220vfgPlQWYZnNmxjp78HgZvjO1MMKfqxt9tYGFZHLxlmUHm65FT0sY3Sc32e+poKyL6KIfQHqpIpfGAHPGdvzTpQPKAoQh33GwNGDeBNhWzzi0QjxwNIz2A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a3e88ae-a386-4269-207c-08dda447ad97 X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2025 15:43:12.2867 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA2PR84MB3882 Received-SPF: pass client-ip=40.92.42.76; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM10-MW2-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham 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: , 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 tlp provides a number of executables. Before this change the "tlp" and "tlp-stat" executables worked fine but the "bluetooth", "nfc", "run-on-ac", "run-on-bat", "wifi", and "wwan" executables would give strange warnings. * gnu/packages/linux.scm (tlp): Fix scripts. [wrap]: Use wrap-script instead of wrap-program to preserve shell argument "$0". Don't wrap symlinks. : Add guile-3.0 for wrap-script. Remove bash used for now removed wrap-program. Change-Id: I916a4385cb69db142f834839aa9aaf0d81085714 --- gnu/packages/linux.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) base-commit: 027a47787f8dcf6651a1c20c5b475376defe6d6b diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ccf0567827..504b09b0a7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -145,6 +145,7 @@ (define-module (gnu packages linux) #:use-module (gnu packages graphviz) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) + #:use-module (gnu packages guile) #:use-module (gnu packages haskell-apps) #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages image) @@ -8512,11 +8513,11 @@ (define-public tlp (native-inputs (list shellcheck)) (inputs - `(("bash" ,bash) - ("dbus" ,dbus) + `(("dbus" ,dbus) ("ethtool" ,ethtool) ("eudev" ,eudev) ("grep" ,grep) + ("guile" ,guile-3.0) ;for wrap-script ("hdparm" ,hdparm) ("inetutils" ,inetutils) ("iw" ,iw) @@ -8574,15 +8575,20 @@ (define-public tlp (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((bin (string-append (assoc-ref outputs "out") "/bin")) (sbin (string-append (assoc-ref outputs "out") "/sbin")) - (bin-files (find-files bin ".*")) - (sbin-files (find-files sbin ".*"))) + ;; Used to ignore symlinks which don't need wrapping + (regular-file-predicate + (lambda (file stat) (eq? 'regular (stat:type stat)))) + (bin-files (find-files bin regular-file-predicate)) + (sbin-files (find-files sbin regular-file-predicate))) (define (bin-directory input-name) (let ((p (assoc-ref inputs input-name))) (and p (string-append p "/bin")))) (define (sbin-directory input-name) (string-append (assoc-ref inputs input-name) "/sbin")) (for-each (lambda (program) - (wrap-program program + ;; Programs rely on $0 so we use wrap-script + ;; instead of wrap-program + (wrap-script program `("PATH" ":" prefix ,(append (filter-map bin-directory