From patchwork Fri Mar 3 15:54:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47576 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 A49F416D05; Fri, 3 Mar 2023 15:56:20 +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.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 D4C7016878 for ; Fri, 3 Mar 2023 15:56:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pY7lS-0004VA-V9; Fri, 03 Mar 2023 10:56:11 -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 1pY7lK-000469-Mr for guix-patches@gnu.org; Fri, 03 Mar 2023 10:56:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pY7lK-0001Y1-Eh for guix-patches@gnu.org; Fri, 03 Mar 2023 10:56:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pY7lK-0004GA-Ao for guix-patches@gnu.org; Fri, 03 Mar 2023 10:56:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61939] [PATCH 1/3] gnu: rasdaemon: Refactor package. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Mar 2023 15:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61939 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61939@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61939-submit@debbugs.gnu.org id=B61939.167785891116298 (code B ref 61939); Fri, 03 Mar 2023 15:56:02 +0000 Received: (at 61939) by debbugs.gnu.org; 3 Mar 2023 15:55:11 +0000 Received: from localhost ([127.0.0.1]:33760 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pY7kS-0004Eh-IO for submit@debbugs.gnu.org; Fri, 03 Mar 2023 10:55:11 -0500 Received: from smtpmciv1.myservices.hosting ([185.26.107.237]:43748) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pY7kQ-0004EG-E1 for 61939@debbugs.gnu.org; Fri, 03 Mar 2023 10:55:07 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv1.myservices.hosting (Postfix) with ESMTP id B71DF208D8 for <61939@debbugs.gnu.org>; Fri, 3 Mar 2023 16:55:05 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 6737380097; Fri, 3 Mar 2023 16:55:05 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id GOfzbU2hBdTc; Fri, 3 Mar 2023 16:55:03 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 09FA480079; Fri, 3 Mar 2023 16:55:02 +0100 (CET) From: Bruno Victal Date: Fri, 3 Mar 2023 15:54:20 +0000 Message-Id: <5d6e38e37c79bc8b6af3f78a4f7ef0a3eea01157.1677858305.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: 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 With commit 9367354a4e57506a7090143e423fa620f86eeed1, rasdaemon no longer creates /var/lib/rasdaemon at install time. * gnu/packages/linux.scm (rasdaemon)[arguments]: Remove obsolete patch. Prefer wrap-program to brittle 'fix-dmidecode-and-modprobe phase. --- gnu/packages/linux.scm | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3601744c51..545d53fe91 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -69,6 +69,7 @@ ;;; Copyright © 2022 Hilton Chain ;;; Copyright © 2022 Stefan ;;; Copyright © 2022 Demis Balbach +;;; Copyright © 2023 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -9580,21 +9581,15 @@ (define-public rasdaemon ;; in EPERM during the install phase. Removing the offending ;; line lets sysconfdir correctly pick up DESTDIR. (substitute* "configure.ac" - (("^test .* sysconfdir=/etc\n$") "")) - ;; Upstream tries to create /var/lib/rasdaemon at install time. - ;; This results in EPERM on guix. Instead, the service should - ;; create this at activation time. - (substitute* "Makefile.am" - (("^\\s*\\$\\(install_sh\\) -d .*@RASSTATEDIR@.*$") "")))) - (add-after 'install 'fix-dmidecode-and-modprobe - (lambda _ - (substitute* (string-append #$output "/sbin/ras-mc-ctl") - (("find_prog \\(\"dmidecode\"\\).*$") (format #f "~s;~%" (string-append #$dmidecode "/sbin/dmidecode"))) - (("find_prog \\(\"modprobe\"\\).*$") (format #f "~s;~%" (string-append #$kmod "/bin/modprobe")))))) + (("^test .* sysconfdir=/etc\n$") "")))) (add-after 'wrap 'wrap-rasdaemon - (lambda _ - (wrap-program (string-append #$output "/sbin/ras-mc-ctl") - `("PERL5LIB" ":" prefix ,(string-split (getenv "PERL5LIB") #\:)))))))) + (lambda* (#:key inputs #:allow-other-keys) + (let ((path (map dirname + (list (search-input-file inputs "/sbin/dmidecode") + (search-input-file inputs "/bin/modprobe"))))) + (wrap-program (string-append #$output "/sbin/ras-mc-ctl") + `("PATH" ":" prefix ,path) + `("PERL5LIB" ":" prefix ,(string-split (getenv "PERL5LIB") #\:))))))))) (build-system gnu-build-system) (home-page "https://github.com/mchehab/rasdaemon") (synopsis "Platform Reliability, Availability, and Serviceability tools") From patchwork Fri Mar 3 15:54:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47575 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 D593A16D07; Fri, 3 Mar 2023 15:56:15 +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.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 A594316878 for ; Fri, 3 Mar 2023 15:56:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pY7lN-000475-9b; Fri, 03 Mar 2023 10:56:05 -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 1pY7lK-00045q-9K for guix-patches@gnu.org; Fri, 03 Mar 2023 10:56:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pY7lK-0001Xu-0o for guix-patches@gnu.org; Fri, 03 Mar 2023 10:56:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pY7lJ-0004G3-Tk for guix-patches@gnu.org; Fri, 03 Mar 2023 10:56:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61939] [PATCH 2/3] gnu: Add libtraceevent. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Mar 2023 15:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61939 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61939@debbugs.gnu.org Cc: Bruno Victal , Petr Hodina Received: via spool by 61939-submit@debbugs.gnu.org id=B61939.167785890716272 (code B ref 61939); Fri, 03 Mar 2023 15:56:01 +0000 Received: (at 61939) by debbugs.gnu.org; 3 Mar 2023 15:55:07 +0000 Received: from localhost ([127.0.0.1]:33757 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pY7kR-0004EO-2X for submit@debbugs.gnu.org; Fri, 03 Mar 2023 10:55:07 -0500 Received: from smtpm4.myservices.hosting ([185.26.105.235]:48232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pY7kP-0004EE-GQ for 61939@debbugs.gnu.org; Fri, 03 Mar 2023 10:55:05 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm4.myservices.hosting (Postfix) with ESMTP id 810C920CCA; Fri, 3 Mar 2023 16:55:04 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 36F1D8009A; Fri, 3 Mar 2023 16:55:04 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id FM0sIA6Ul1IP; Fri, 3 Mar 2023 16:55:03 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 5C17F80097; Fri, 3 Mar 2023 16:55:03 +0100 (CET) From: Bruno Victal Date: Fri, 3 Mar 2023 15:54:21 +0000 Message-Id: X-Mailer: git-send-email 2.39.1 In-Reply-To: References: 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 From: Petr Hodina * gnu/packages/linux.scm (libtraceevent): New variable. Co-authored-by: Bruno Victal --- gnu/packages/linux.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 545d53fe91..16a9d9aa90 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -9636,6 +9636,45 @@ (define-public libgpiod license:gpl2+ ;; gpio-tools license:lgpl3+)))) ;; C++ bindings +(define-public libtraceevent + (package + (name "libtraceevent") + (version "1.7.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1kbl11lqh8cadi6r3qqxx68idr7597l6i50pr5p5mdgsf6k2i83c")) + (modules '((guix build utils))) + (snippet + #~(begin + (substitute* "Makefile" + (("/bin/pwd") "pwd")) + (substitute* "scripts/utils.mk" + (("/bin/pwd") "pwd")))))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ;no test suite + #:make-flags + #~(list + (string-append "pkgconfig_dir=" #$output "/lib/pkgconfig") + (string-append "prefix=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure)))) + (home-page "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/") + (synopsis "Linux kernel trace event library") + (description "This package provides library to parse raw trace event +formats.") + (license (list license:gpl2 + license:lgpl2.1)))) + (define-public libtree (package (name "libtree") From patchwork Fri Mar 3 15:54:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47577 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 191F516D05; Fri, 3 Mar 2023 15:56:35 +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.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 A6B1316878 for ; Fri, 3 Mar 2023 15:56:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pY7lQ-0004EB-FY; Fri, 03 Mar 2023 10:56:08 -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 1pY7lL-00046A-5r for guix-patches@gnu.org; Fri, 03 Mar 2023 10:56:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pY7lK-0001Y9-TJ for guix-patches@gnu.org; Fri, 03 Mar 2023 10:56:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pY7lK-0004GI-Pg for guix-patches@gnu.org; Fri, 03 Mar 2023 10:56:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61939] [PATCH 3/3] gnu: rasdaemon: Update to 0.8.0. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Mar 2023 15:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61939 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61939@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61939-submit@debbugs.gnu.org id=B61939.167785891116305 (code B ref 61939); Fri, 03 Mar 2023 15:56:02 +0000 Received: (at 61939) by debbugs.gnu.org; 3 Mar 2023 15:55:11 +0000 Received: from localhost ([127.0.0.1]:33762 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pY7kV-0004Ep-Ar for submit@debbugs.gnu.org; Fri, 03 Mar 2023 10:55:11 -0500 Received: from smtpm1.myservices.hosting ([185.26.105.232]:34130) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pY7kR-0004EM-1v for 61939@debbugs.gnu.org; Fri, 03 Mar 2023 10:55:08 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id 6FD3620479 for <61939@debbugs.gnu.org>; Fri, 3 Mar 2023 16:55:06 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 2907A80079; Fri, 3 Mar 2023 16:55:06 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Yu2Za06t0k0G; Fri, 3 Mar 2023 16:55:04 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id BD8D280098; Fri, 3 Mar 2023 16:55:03 +0100 (CET) From: Bruno Victal Date: Fri, 3 Mar 2023 15:54:22 +0000 Message-Id: X-Mailer: git-send-email 2.39.1 In-Reply-To: References: 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 * gnu/packages/linux.scm (rasdaemon): Update to 0.8.0. [inputs]: Add pkg-config, libtraceevent. [arguments]: Rename README.md to README. --- gnu/packages/linux.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 16a9d9aa90..25d0c2cefa 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -9554,7 +9554,7 @@ (define-public erofs-utils (define-public rasdaemon (package (name "rasdaemon") - (version "0.7.0") + (version "0.8.0") (source (origin (method git-fetch) @@ -9563,9 +9563,9 @@ (define-public rasdaemon (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1a3ycx1g2zyshlna9fg8c9329m8wia42vkmlh2awfab0ngwi3g50")))) - (native-inputs (list autoconf automake libtool)) - (inputs (list perl perl-dbd-sqlite sqlite dmidecode kmod)) + (base32 "0m3j1hz9rqcvwmrimpakd239s0ppzaplkykhf9wyh55xmmry8z85")))) + (native-inputs (list autoconf automake libtool pkg-config)) + (inputs (list libtraceevent perl perl-dbd-sqlite sqlite dmidecode kmod)) (arguments (list #:configure-flags @@ -9575,6 +9575,10 @@ (define-public rasdaemon "--localstatedir=/var") #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'rename-README + (lambda _ + ;; Required by autoreconf + (rename-file "README.md" "README"))) (add-before 'configure 'munge-autotools (lambda _ ;; For some reason upstream forces sysconfdir=/etc. This results