X-Loop: help-debbugs@HIDDEN Subject: [bug#78700] [PATCH] gnu: tlp: Fix scripts. Resent-From: Morgan Smith <Morgan.J.Smith@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: leo@HIDDEN, guix-patches@HIDDEN Resent-Date: Thu, 05 Jun 2025 15:49:01 +0000 Resent-Message-ID: <handler.78700.B.174913850819006 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: report 78700 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78700 <at> debbugs.gnu.org Cc: Morgan Smith <Morgan.J.Smith@HIDDEN>, Leo Famulari <leo@HIDDEN> X-Debbugs-Original-To: guix-patches@HIDDEN X-Debbugs-Original-Xcc: Leo Famulari <leo@HIDDEN> Received: via spool by submit <at> 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 <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uNCpQ-0004wT-2A for submit <at> 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 <Morgan.J.Smith@HIDDEN>) id 1uNCpO-0004vt-0P for submit <at> 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 <Morgan.J.Smith@HIDDEN>) id 1uNCpI-000559-8b for guix-patches@HIDDEN; 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 <Morgan.J.Smith@HIDDEN>) id 1uNCpF-0005eE-RK for guix-patches@HIDDEN; 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 <Morgan.J.Smith@HIDDEN> Date: Thu, 5 Jun 2025 11:42:14 -0400 Message-ID: <CH3PR84MB3424ADBE0AF04CBCAFF8A040C56FA@HIDDEN> X-Mailer: git-send-email 2.49.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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@HIDDEN> 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@HIDDEN; 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-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.0 (/) 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. <phases> [wrap]: Use wrap-script instead of wrap-program to preserve shell argument "$0". Don't wrap symlinks. <inputs>: 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(-) 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 base-commit: 027a47787f8dcf6651a1c20c5b475376defe6d6b -- 2.49.0
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Morgan Smith <Morgan.J.Smith@HIDDEN> Subject: bug#78700: Acknowledgement ([PATCH] gnu: tlp: Fix scripts.) Message-ID: <handler.78700.B.174913850819006.ack <at> debbugs.gnu.org> References: <CH3PR84MB3424ADBE0AF04CBCAFF8A040C56FA@HIDDEN> X-Gnu-PR-Message: ack 78700 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 78700 <at> debbugs.gnu.org Date: Thu, 05 Jun 2025 15:49:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. As you requested using X-Debbugs-CC, your message was also forwarded to Leo Famulari <leo@HIDDEN> (after having been given a bug report number, if it did not have one). Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 78700 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 78700: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D78700 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN> Subject: bug#78700: closed ([PATCH] gnu: tlp: Fix scripts.) CC: tracker <at> debbugs.gnu.org Message-ID: <handler.78700.D78700.174949969930054.ackdone <at> debbugs.gnu.org> References: <87o6uw7kcj.fsf@HIDDEN> <CH3PR84MB3424ADBE0AF04CBCAFF8A040C56FA@HIDDEN> X-Gnu-PR-Message: closed 78700 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Date: Mon, 09 Jun 2025 20:08:30 +0000 Content-Type: multipart/mixed; boundary="----------=_1749499710-30175-0" This is a multi-part message in MIME format... ------------=_1749499710-30175-0 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 Your message dated Mon, 09 Jun 2025 22:04:12 +0200 with message-id <87o6uw7kcj.fsf@HIDDEN> and subject line Re: [bug#78700] [PATCH] gnu: tlp: Fix scripts. has caused the debbugs.gnu.org bug report #78700, regarding [PATCH] gnu: tlp: Fix scripts. to be marked as done. (If you believe you have received this mail in error, please contact help-debbugs@HIDDEN) --=20 78700: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D78700 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems ------------=_1749499710-30175-0 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uNCpQ-0004wT-2A for submit <at> 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 <Morgan.J.Smith@HIDDEN>) id 1uNCpO-0004vt-0P for submit <at> 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 <Morgan.J.Smith@HIDDEN>) id 1uNCpI-000559-8b for guix-patches@HIDDEN; 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 <Morgan.J.Smith@HIDDEN>) id 1uNCpF-0005eE-RK for guix-patches@HIDDEN; 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 <Morgan.J.Smith@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH] gnu: tlp: Fix scripts. Date: Thu, 5 Jun 2025 11:42:14 -0400 Message-ID: <CH3PR84MB3424ADBE0AF04CBCAFF8A040C56FA@HIDDEN> X-Mailer: git-send-email 2.49.0 X-Debbugs-Cc: Leo Famulari <leo@HIDDEN> Content-Transfer-Encoding: 8bit Content-Type: text/plain 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@HIDDEN> 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: =?us-ascii?Q?yq92EpHdEV1wGyDx84I1jwUENxm7hVSGrEwiddpj87HP0BR4RlxtXPi5yP10?= =?us-ascii?Q?787GX/oAh26adRGhCtDD78REHA2/YBtIQv1v7XOFtqiwC74cZcxmzGf/b/gt?= =?us-ascii?Q?YvVQw/8Lw0C7QMNhTkdTdaF4x7lvAyjfCB9BTquGgytaD5PkIBbx/SiAwmvH?= =?us-ascii?Q?93RvYRXJobVgOj6YlsjzZ4YiylkslinrRqNnUFk6+utHVl8B0Km4WD7pA1UW?= =?us-ascii?Q?H5imOUUrVOHA9all4osNMd6QAPxrdiVmU/FSrV8+g6pTpExIwUsCiLT42T2n?= =?us-ascii?Q?RUQtguaHAl5kUWEBE0PeLx5HLez3B4HKCN4mRKFPnJk5nbLGk07UnMjdXoR0?= =?us-ascii?Q?6yXC6mlxGRjO2fAw0cliJiOkTAPfs0fL7EPin4Xh2AT4naNNGabSJa1xYU9H?= =?us-ascii?Q?X0Lc95xmh5ISPAzddJ+Nd9805wjNqlwYHQl1Q6HB4Gv5k6k7tiMxDAJ/aCd8?= =?us-ascii?Q?+Lx3ZJ2AYHsvZCOuX/3SUhh824C7ulq2UBU0jACQVb8LHbfJlMN51dWLa4de?= =?us-ascii?Q?EJVMaXnPJ3+hbP6qcYqji7h3ApnK7XCR9fTj6Q4tHCnGSvVqpPEG1KKY8nRI?= =?us-ascii?Q?JENofA7TXJtl0knUfQkv5+ShgYpkPxTOQx8RGDfAirlJnOwORpt4zFhneI01?= =?us-ascii?Q?pBDuhNx5EPXaYHYjY+JjEoIBhaz4yBn5hUkGzHaH8GSsJyUw+/Uwemp/038o?= =?us-ascii?Q?NO4wQW9E9vh6CiGVoVLECNUqSpP0Lb45nhwvjI6YXoRGFl+lhw2OI+t0q/zj?= =?us-ascii?Q?GyFCanZ3Fvx2GIIz/jmjknbvuunrUJAp0qad/a00P/TkolHY5MHMM6mmPwdf?= =?us-ascii?Q?yOhp+c0rImMjpriqmzOOnrG7oRSL6UUZe9Ur6VFXxnLfGUYMbLA871zDtiML?= =?us-ascii?Q?FZYmRQ8zZQF8ACkfg7iGSVl8sYzmPx7gXGeQZqMWQ8eEkSP2H+hTIC3zVUv8?= =?us-ascii?Q?ViFTkLkm8QytVUvj+S1PMDmkqKRYUSIywqoEiVErtJyO/C2NoOaEIVBbJFzh?= =?us-ascii?Q?hkBlWiSSgDHoL0yGiArnKnTLCcAc1gb1IUNMuBAHzSTaKsFB+9OtUj/npAHb?= =?us-ascii?Q?PqQVA6vG1wymEhoCEG2mzjM26BgCjHBruMT6jALHfFiVoOY71doHuSGz5P7R?= =?us-ascii?Q?8RvUKotJo+JR96vpe6RNHjHTtzaZwhNXOw=3D=3D?= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?k6OWkG46ve1TRdLh/FkaIVLSqi7CvnATfR486b9CPCYQYoig7uz/RB+H1W9m?= =?us-ascii?Q?5H14uw48CgYlYLnj8XQVRakCI95VqqygxK4CCyqhPbbzChsVySJvPboFwMW0?= =?us-ascii?Q?HN/ucHf2jZrv0/7vKgCvA6+ElTc/uB+oEl3zhfRQkfph5FLJ0Okd33xQeAue?= =?us-ascii?Q?nTjE2TG2m2r8il3InpT+PVralwcUkjg993LwAImcg6nYIfCy2Aq6lOjGcOco?= =?us-ascii?Q?kFI4I0z3BDCkSboHzVVpVOvlL/AXra8Fv9sbxINHTBGOqhhrxCEMNIeU3Xz8?= =?us-ascii?Q?D5CTUf4tNixLtJylNG000T7iEjntUyR92z0tvdRrnU9lXJa9rXndp+x/pxMC?= =?us-ascii?Q?GQsJqvq20CBhKBLjSjM5fXs1TXiL4XMWxOyDSOoQ2ZtecINST62wMpPZHjgM?= =?us-ascii?Q?rKv+vhWdtOMESvn9UMIjmsLIWE9cWeEKqlcflkBzk7hKiIthfJNIhLzw0Pgd?= =?us-ascii?Q?Y1kdxDwl3ticnvknBMOKWKFjwddCDZwJFm51QguclOzX2aSUsVm5gHgFO362?= =?us-ascii?Q?e6jwKG6HtJRtVci7JeDmOeHOTYNYiFINm0A26ntSJfLijfMIBTi7HbTqZuCP?= =?us-ascii?Q?5NjEn0aOkpRt5V4efZlwTs6JLFI6TP+8eSK9q2w2d2RR7k+3qKYcSSACLsid?= =?us-ascii?Q?N2+9MLWU5Hnl/bIKNm76ZCFDlIeHOdkg8X5BaFCYyB94jc2kdzjeykNes3Lg?= =?us-ascii?Q?PdE+/P+fetXZLX+/w6+TloF9/ls7X9t29kNRsA8LnPAi58vSHsFJz9VnXz8n?= =?us-ascii?Q?E3yRRqrSDPpZfX/pUgT9oOu1oX8hQYghI272ufZ2mHCQcDG3ruml0qWhQGLD?= =?us-ascii?Q?UsqNxNRaRIzDD4ZBprC4HeShFEr11paXEuJxBf6WeZjODZ7QVp86feeLeSrQ?= =?us-ascii?Q?G/DN5J/CMfzRC3If3cFil1ChTPkMwHg5IQ3ZQJ1TuzcobZ1OqLy2kXGZo+gG?= =?us-ascii?Q?yvp6DidilXr1PGlygw5Q44BWa1+z25eh3frC27DYNkIbSgnoaUL5GQIbF2Ep?= =?us-ascii?Q?cERmwiy9wTwfrUMNTNMfou43D1TokoHr28d189pvOdOjYDpYupZzKut1mHhX?= =?us-ascii?Q?dnSzgnjNE9iGT09IAanvI4BxMV1FZB4PAtEZ25OM6cSQzWBKIMq41X4zTLwt?= =?us-ascii?Q?SNJIhPhYiioPPRGNn8KDokephgdaOQ1JxlICe1suJF220vfgPlQWYZnNmxjp?= =?us-ascii?Q?78HgZvjO1MMKfqxt9tYGFZHLxlmUHm65FT0sY3Sc32e+poKyL6KIfQHqpIpf?= =?us-ascii?Q?GAHPGdvzTpQPKAoQh33GwNGDeBNhWzzi0QjxwNIz2A=3D=3D?= 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@HIDDEN; 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-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Morgan Smith <Morgan.J.Smith@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.0 (/) 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. <phases> [wrap]: Use wrap-script instead of wrap-program to preserve shell argument "$0". Don't wrap symlinks. <inputs>: 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(-) 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 base-commit: 027a47787f8dcf6651a1c20c5b475376defe6d6b -- 2.49.0 ------------=_1749499710-30175-0 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 78700-done) by debbugs.gnu.org; 9 Jun 2025 20:08:19 +0000 Received: from localhost ([127.0.0.1]:57931 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uOin2-0007oA-EF for submit <at> debbugs.gnu.org; Mon, 09 Jun 2025 16:08:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38026) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1uOimu-0007kg-5X for 78700-done <at> debbugs.gnu.org; Mon, 09 Jun 2025 16:08:09 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1uOimo-0007e2-II; Mon, 09 Jun 2025 16:08:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=oa9AKKHIC2mOV3R+A7zPn0lRdxuY2ndmI8KwhGVSn1Q=; b=iVIFBOSgB6WN1i5yH+eK udVW4YcCjHLrcNZGvZzzOB2zDBh7IqRhulDj7WzwAKyKOAg99VskFvtptUP6MR895jGhVeS/zjMAX JYj3RkhHNEZWRXP0dFUR4meolRtn9NkVDMem00aEk/UFMb1AnfxYIL49ipJgY21kG0XkpwW6+blTD JjvY86Y5hyBnhynt45McmCkO9PeLlPmpR/TAynOowU8GgfIBg7RJ56BgHLCkehHZZBKMnqN7RQWt9 sGfq8eExzwSUlBtDZ3CiuSnZXWsBj+4sXRAhnMDbepOqPdk3lb2Gto0PR8RYyj/GCRW8S9w9Yp2Tf MpFcbAhtPExf4A==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Morgan Smith <Morgan.J.Smith@HIDDEN> Subject: Re: [bug#78700] [PATCH] gnu: tlp: Fix scripts. In-Reply-To: <CH3PR84MB3424ADBE0AF04CBCAFF8A040C56FA@HIDDEN> (Morgan Smith's message of "Thu, 5 Jun 2025 11:42:14 -0400") References: <CH3PR84MB3424ADBE0AF04CBCAFF8A040C56FA@HIDDEN> Date: Mon, 09 Jun 2025 22:04:12 +0200 Message-ID: <87o6uw7kcj.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 78700-done Cc: 78700-done <at> debbugs.gnu.org, Leo Famulari <leo@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Morgan Smith <Morgan.J.Smith@HIDDEN> writes: > 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. > <phases> [wrap]: Use wrap-script instead of wrap-program to preserve shell > argument "$0". Don't wrap symlinks. > <inputs>: Add guile-3.0 for wrap-script. Remove bash used for now removed > wrap-program. > > Change-Id: I916a4385cb69db142f834839aa9aaf0d81085714 Applied, thanks! ------------=_1749499710-30175-0--
MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Morgan Smith <Morgan.J.Smith@HIDDEN> Subject: bug#78700: closed (Re: [bug#78700] [PATCH] gnu: tlp: Fix scripts.) Message-ID: <handler.78700.D78700.174949969930054.notifdone <at> debbugs.gnu.org> References: <87o6uw7kcj.fsf@HIDDEN> <CH3PR84MB3424ADBE0AF04CBCAFF8A040C56FA@HIDDEN> X-Gnu-PR-Message: they-closed 78700 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 78700 <at> debbugs.gnu.org Date: Mon, 09 Jun 2025 20:08:30 +0000 Content-Type: multipart/mixed; boundary="----------=_1749499710-30175-1" This is a multi-part message in MIME format... ------------=_1749499710-30175-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #78700: [PATCH] gnu: tlp: Fix scripts. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 78700 <at> debbugs.gnu.org. --=20 78700: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D78700 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems ------------=_1749499710-30175-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 78700-done) by debbugs.gnu.org; 9 Jun 2025 20:08:19 +0000 Received: from localhost ([127.0.0.1]:57931 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uOin2-0007oA-EF for submit <at> debbugs.gnu.org; Mon, 09 Jun 2025 16:08:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38026) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1uOimu-0007kg-5X for 78700-done <at> debbugs.gnu.org; Mon, 09 Jun 2025 16:08:09 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1uOimo-0007e2-II; Mon, 09 Jun 2025 16:08:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=oa9AKKHIC2mOV3R+A7zPn0lRdxuY2ndmI8KwhGVSn1Q=; b=iVIFBOSgB6WN1i5yH+eK udVW4YcCjHLrcNZGvZzzOB2zDBh7IqRhulDj7WzwAKyKOAg99VskFvtptUP6MR895jGhVeS/zjMAX JYj3RkhHNEZWRXP0dFUR4meolRtn9NkVDMem00aEk/UFMb1AnfxYIL49ipJgY21kG0XkpwW6+blTD JjvY86Y5hyBnhynt45McmCkO9PeLlPmpR/TAynOowU8GgfIBg7RJ56BgHLCkehHZZBKMnqN7RQWt9 sGfq8eExzwSUlBtDZ3CiuSnZXWsBj+4sXRAhnMDbepOqPdk3lb2Gto0PR8RYyj/GCRW8S9w9Yp2Tf MpFcbAhtPExf4A==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Morgan Smith <Morgan.J.Smith@HIDDEN> Subject: Re: [bug#78700] [PATCH] gnu: tlp: Fix scripts. In-Reply-To: <CH3PR84MB3424ADBE0AF04CBCAFF8A040C56FA@HIDDEN> (Morgan Smith's message of "Thu, 5 Jun 2025 11:42:14 -0400") References: <CH3PR84MB3424ADBE0AF04CBCAFF8A040C56FA@HIDDEN> Date: Mon, 09 Jun 2025 22:04:12 +0200 Message-ID: <87o6uw7kcj.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 78700-done Cc: 78700-done <at> debbugs.gnu.org, Leo Famulari <leo@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Morgan Smith <Morgan.J.Smith@HIDDEN> writes: > 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. > <phases> [wrap]: Use wrap-script instead of wrap-program to preserve shell > argument "$0". Don't wrap symlinks. > <inputs>: Add guile-3.0 for wrap-script. Remove bash used for now removed > wrap-program. > > Change-Id: I916a4385cb69db142f834839aa9aaf0d81085714 Applied, thanks! ------------=_1749499710-30175-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uNCpQ-0004wT-2A for submit <at> 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 <Morgan.J.Smith@HIDDEN>) id 1uNCpO-0004vt-0P for submit <at> 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 <Morgan.J.Smith@HIDDEN>) id 1uNCpI-000559-8b for guix-patches@HIDDEN; 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 <Morgan.J.Smith@HIDDEN>) id 1uNCpF-0005eE-RK for guix-patches@HIDDEN; 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 <Morgan.J.Smith@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH] gnu: tlp: Fix scripts. Date: Thu, 5 Jun 2025 11:42:14 -0400 Message-ID: <CH3PR84MB3424ADBE0AF04CBCAFF8A040C56FA@HIDDEN> X-Mailer: git-send-email 2.49.0 X-Debbugs-Cc: Leo Famulari <leo@HIDDEN> Content-Transfer-Encoding: 8bit Content-Type: text/plain 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@HIDDEN> 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: =?us-ascii?Q?yq92EpHdEV1wGyDx84I1jwUENxm7hVSGrEwiddpj87HP0BR4RlxtXPi5yP10?= =?us-ascii?Q?787GX/oAh26adRGhCtDD78REHA2/YBtIQv1v7XOFtqiwC74cZcxmzGf/b/gt?= =?us-ascii?Q?YvVQw/8Lw0C7QMNhTkdTdaF4x7lvAyjfCB9BTquGgytaD5PkIBbx/SiAwmvH?= =?us-ascii?Q?93RvYRXJobVgOj6YlsjzZ4YiylkslinrRqNnUFk6+utHVl8B0Km4WD7pA1UW?= =?us-ascii?Q?H5imOUUrVOHA9all4osNMd6QAPxrdiVmU/FSrV8+g6pTpExIwUsCiLT42T2n?= =?us-ascii?Q?RUQtguaHAl5kUWEBE0PeLx5HLez3B4HKCN4mRKFPnJk5nbLGk07UnMjdXoR0?= =?us-ascii?Q?6yXC6mlxGRjO2fAw0cliJiOkTAPfs0fL7EPin4Xh2AT4naNNGabSJa1xYU9H?= =?us-ascii?Q?X0Lc95xmh5ISPAzddJ+Nd9805wjNqlwYHQl1Q6HB4Gv5k6k7tiMxDAJ/aCd8?= =?us-ascii?Q?+Lx3ZJ2AYHsvZCOuX/3SUhh824C7ulq2UBU0jACQVb8LHbfJlMN51dWLa4de?= =?us-ascii?Q?EJVMaXnPJ3+hbP6qcYqji7h3ApnK7XCR9fTj6Q4tHCnGSvVqpPEG1KKY8nRI?= =?us-ascii?Q?JENofA7TXJtl0knUfQkv5+ShgYpkPxTOQx8RGDfAirlJnOwORpt4zFhneI01?= =?us-ascii?Q?pBDuhNx5EPXaYHYjY+JjEoIBhaz4yBn5hUkGzHaH8GSsJyUw+/Uwemp/038o?= =?us-ascii?Q?NO4wQW9E9vh6CiGVoVLECNUqSpP0Lb45nhwvjI6YXoRGFl+lhw2OI+t0q/zj?= =?us-ascii?Q?GyFCanZ3Fvx2GIIz/jmjknbvuunrUJAp0qad/a00P/TkolHY5MHMM6mmPwdf?= =?us-ascii?Q?yOhp+c0rImMjpriqmzOOnrG7oRSL6UUZe9Ur6VFXxnLfGUYMbLA871zDtiML?= =?us-ascii?Q?FZYmRQ8zZQF8ACkfg7iGSVl8sYzmPx7gXGeQZqMWQ8eEkSP2H+hTIC3zVUv8?= =?us-ascii?Q?ViFTkLkm8QytVUvj+S1PMDmkqKRYUSIywqoEiVErtJyO/C2NoOaEIVBbJFzh?= =?us-ascii?Q?hkBlWiSSgDHoL0yGiArnKnTLCcAc1gb1IUNMuBAHzSTaKsFB+9OtUj/npAHb?= =?us-ascii?Q?PqQVA6vG1wymEhoCEG2mzjM26BgCjHBruMT6jALHfFiVoOY71doHuSGz5P7R?= =?us-ascii?Q?8RvUKotJo+JR96vpe6RNHjHTtzaZwhNXOw=3D=3D?= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?k6OWkG46ve1TRdLh/FkaIVLSqi7CvnATfR486b9CPCYQYoig7uz/RB+H1W9m?= =?us-ascii?Q?5H14uw48CgYlYLnj8XQVRakCI95VqqygxK4CCyqhPbbzChsVySJvPboFwMW0?= =?us-ascii?Q?HN/ucHf2jZrv0/7vKgCvA6+ElTc/uB+oEl3zhfRQkfph5FLJ0Okd33xQeAue?= =?us-ascii?Q?nTjE2TG2m2r8il3InpT+PVralwcUkjg993LwAImcg6nYIfCy2Aq6lOjGcOco?= =?us-ascii?Q?kFI4I0z3BDCkSboHzVVpVOvlL/AXra8Fv9sbxINHTBGOqhhrxCEMNIeU3Xz8?= =?us-ascii?Q?D5CTUf4tNixLtJylNG000T7iEjntUyR92z0tvdRrnU9lXJa9rXndp+x/pxMC?= =?us-ascii?Q?GQsJqvq20CBhKBLjSjM5fXs1TXiL4XMWxOyDSOoQ2ZtecINST62wMpPZHjgM?= =?us-ascii?Q?rKv+vhWdtOMESvn9UMIjmsLIWE9cWeEKqlcflkBzk7hKiIthfJNIhLzw0Pgd?= =?us-ascii?Q?Y1kdxDwl3ticnvknBMOKWKFjwddCDZwJFm51QguclOzX2aSUsVm5gHgFO362?= =?us-ascii?Q?e6jwKG6HtJRtVci7JeDmOeHOTYNYiFINm0A26ntSJfLijfMIBTi7HbTqZuCP?= =?us-ascii?Q?5NjEn0aOkpRt5V4efZlwTs6JLFI6TP+8eSK9q2w2d2RR7k+3qKYcSSACLsid?= =?us-ascii?Q?N2+9MLWU5Hnl/bIKNm76ZCFDlIeHOdkg8X5BaFCYyB94jc2kdzjeykNes3Lg?= =?us-ascii?Q?PdE+/P+fetXZLX+/w6+TloF9/ls7X9t29kNRsA8LnPAi58vSHsFJz9VnXz8n?= =?us-ascii?Q?E3yRRqrSDPpZfX/pUgT9oOu1oX8hQYghI272ufZ2mHCQcDG3ruml0qWhQGLD?= =?us-ascii?Q?UsqNxNRaRIzDD4ZBprC4HeShFEr11paXEuJxBf6WeZjODZ7QVp86feeLeSrQ?= =?us-ascii?Q?G/DN5J/CMfzRC3If3cFil1ChTPkMwHg5IQ3ZQJ1TuzcobZ1OqLy2kXGZo+gG?= =?us-ascii?Q?yvp6DidilXr1PGlygw5Q44BWa1+z25eh3frC27DYNkIbSgnoaUL5GQIbF2Ep?= =?us-ascii?Q?cERmwiy9wTwfrUMNTNMfou43D1TokoHr28d189pvOdOjYDpYupZzKut1mHhX?= =?us-ascii?Q?dnSzgnjNE9iGT09IAanvI4BxMV1FZB4PAtEZ25OM6cSQzWBKIMq41X4zTLwt?= =?us-ascii?Q?SNJIhPhYiioPPRGNn8KDokephgdaOQ1JxlICe1suJF220vfgPlQWYZnNmxjp?= =?us-ascii?Q?78HgZvjO1MMKfqxt9tYGFZHLxlmUHm65FT0sY3Sc32e+poKyL6KIfQHqpIpf?= =?us-ascii?Q?GAHPGdvzTpQPKAoQh33GwNGDeBNhWzzi0QjxwNIz2A=3D=3D?= 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@HIDDEN; 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-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Morgan Smith <Morgan.J.Smith@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.0 (/) 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. <phases> [wrap]: Use wrap-script instead of wrap-program to preserve shell argument "$0". Don't wrap symlinks. <inputs>: 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(-) 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 base-commit: 027a47787f8dcf6651a1c20c5b475376defe6d6b -- 2.49.0 ------------=_1749499710-30175-1--
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.