From patchwork Sun Dec 24 18:48:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "vasilii.smirnov--- via Guix-patches\" via" X-Patchwork-Id: 58035 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 E112427BBE9; Sun, 24 Dec 2023 19:25:03 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HTML_MESSAGE,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 962A727BBE2 for ; Sun, 24 Dec 2023 19:24:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rHU5U-0003Qe-12; Sun, 24 Dec 2023 14:24:36 -0500 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 1rHTWz-000590-Lt for guix-patches@gnu.org; Sun, 24 Dec 2023 13:48:57 -0500 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 1rHTWy-0006D8-Sc for guix-patches@gnu.org; Sun, 24 Dec 2023 13:48:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rHTX4-00009x-Mi for guix-patches@gnu.org; Sun, 24 Dec 2023 13:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68011] [PATCH] gnu: thinkfan: Don't fake SystemD or OpenRC presences. Resent-From: lgcoelho@disroot.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Dec 2023 18:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68011 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68011@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1703443703406 (code B ref -1); Sun, 24 Dec 2023 18:49:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Dec 2023 18:48:23 +0000 Received: from localhost ([127.0.0.1]:53511 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHTWQ-00006S-LX for submit@debbugs.gnu.org; Sun, 24 Dec 2023 13:48:23 -0500 Received: from lists.gnu.org ([2001:470:142::17]:49616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHTWO-00005U-6A for submit@debbugs.gnu.org; Sun, 24 Dec 2023 13:48:20 -0500 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 1rHTWB-0004G6-6q for guix-patches@gnu.org; Sun, 24 Dec 2023 13:48:07 -0500 Received: from layka.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rHTW7-0005xe-DI for guix-patches@gnu.org; Sun, 24 Dec 2023 13:48:05 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 6F9414157B for ; Sun, 24 Dec 2023 19:48:01 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nuInzLEy-pVF for ; Sun, 24 Dec 2023 19:48:00 +0100 (CET) MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1703443680; bh=vSZcb+5dSC/55ISvOAh3NnROOiywI9e+oXBENtvKYrs=; h=Date:From:To:Subject; b=eZFkc8UqfXN+k3aQ+mpyTabcyFq1kWR60zV3PybnYe1j1jZMZNJ2VTUS9YZEE7gzA JkYhl/fzX2gf+0Atp+ZMrCjgqaO+EZ1XIUwpUWhum876w6iqpG48paWuTnK6yqgvup cx10Wh/b8QBp6ImNPzC6IRFkV3nRxaM9YS+zspLDABa+hdUN9x6RAMM9HXJ1d+P9Nq sk3/BKD3WIZOlpib4mXZNY8RKons6L1LCtW3sGCrBsmyZNkifr11EpkQd28P3gL2YJ 6Q76cNAqbWncqaAJv7upSVoODHQhbwjnPjI8wuj8AsyGwxNPkielNqxQd49DsgwyHx 3a8t/T64g3OoQ== Date: Sun, 24 Dec 2023 18:48:00 +0000 Message-ID: X-Sender: lgcoelho@disroot.org Received-SPF: pass client-ip=178.21.23.139; envelope-from=lgcoelho@disroot.org; helo=layka.disroot.org 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, HTML_MESSAGE=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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-Mailman-Approved-At: Sun, 24 Dec 2023 14:24:33 -0500 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: lgcoelho@disroot.org X-ACL-Warn: , lgcoelho--- via Guix-patches X-Patchwork-Original-From: lgcoelho--- via Guix-patches via From: "vasilii.smirnov--- via Guix-patches\" via" 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 This patch removes the modification to CMakeLists.txt made to fake the presence of SystemD and OpenRC, since it doesn't provide any actual utility for Guix, and places thinkfan.pid in a non-default place: /run/thinkfan.pid. This patch corrects it, placing the pid file in /var/run/, like wpa_supplicant, dhclient, syslog, tor, thermald and other Guix Services. From 13132e9535fd390cf93556436537108b4cab3799 Mon Sep 17 00:00:00 2001 From: Luis Guilherme Coelho Date: Sun, 24 Dec 2023 15:42:02 -0300 Subject: [PATCH] gnu: thinkfan: Don't fake Systemd or OpenRC presences --- gnu/packages/linux.scm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2d9e4cebbe..887a02d79f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6478,17 +6478,8 @@ (define-public thinkfan #:phases #~(modify-phases %standard-phases (add-after 'unpack 'create-init-scripts - ;; CMakeLists.txt relies on build-time symptoms of OpenRC and - ;; systemd to patch and install their service files. Fake their - ;; presence rather than duplicating the build system below. Leave - ;; things like ‘/bin/kill’ because they're not worth a dependency. - ;; The sysvinit needs manual patching, but since upstream doesn't - ;; even provide the option to install it: don't. (lambda _ - (substitute* "CMakeLists.txt" - (("pkg_check_modules\\((OPENRC|SYSTEMD) .*" _ package) - (format #f "option(~a_FOUND \"Faked\" ON)\n" package)) - ;; That was easy! Now we just need to fix the destinations. + ;; Fix the destinations. (("/etc" directory) (string-append #$output directory)))))))) (native-inputs -- 2.41.0