From patchwork Sun Oct 8 10:00:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 54598 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 2289C27BBEA; Sun, 8 Oct 2023 11:58: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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 0EFD527BBE2 for ; Sun, 8 Oct 2023 11:58:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpRTr-0007XD-H0; Sun, 08 Oct 2023 06:57:51 -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 1qpRTl-0007VX-7W for guix-patches@gnu.org; Sun, 08 Oct 2023 06:57:45 -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 1qpRTk-0001NJ-Jp for guix-patches@gnu.org; Sun, 08 Oct 2023 06:57:44 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qpRU4-000455-Ha for guix-patches@gnu.org; Sun, 08 Oct 2023 06:58:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66099] [PATCH gnome-team v9 7/7] services: udev: Install hardware files in /lib/udev/hardware. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Oct 2023 10:58:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66099 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler , Maxim Cournoyer , 66099@debbugs.gnu.org Cc: rg@raghavgururajan.name Received: via spool by 66099-submit@debbugs.gnu.org id=B66099.169676265815612 (code B ref 66099); Sun, 08 Oct 2023 10:58:04 +0000 Received: (at 66099) by debbugs.gnu.org; 8 Oct 2023 10:57:38 +0000 Received: from localhost ([127.0.0.1]:56390 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpRTd-00043i-Fc for submit@debbugs.gnu.org; Sun, 08 Oct 2023 06:57:38 -0400 Received: from planete-kraus.eu ([89.234.140.182]:58228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpRTY-00040x-CD for 66099@debbugs.gnu.org; Sun, 08 Oct 2023 06:57:36 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 83e26c07; Sun, 8 Oct 2023 10:57:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniB; bh=4bBiiI4r25vWNpQJQfRT+xMg9FM=; b=O xOuwXlNhop5afv74w9yR0wPEsQOD94HDOaCwUkS+Ug/Qq0CQn7AcVCC5NXVbwfAy E1Ifk0NISfcr0ovv/sFSY/c94ZAndboYs1Q6t1v57lUZjLmTo981ph/ukWWO6Lr9 wwtZjzi5c2I/rsuHwKI0rDsHCmwp0/MCuXgin5S2rRDeRD3dU2w+LPOnjIH4fkQs m4ENqmgBkCJykSGzPIdnsbdjYD1xYN3jamEXc8UnQc92QysRuF2bcWR6PlKt0jJg UwrffVIM05ynR6hPRByngFeJ5kE1FRK06jwcoiMzr28QDJjB2aiRD9iVWovNjCQS lO6Igr59AoGiETN7njPHg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id a21cd9dc (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 8 Oct 2023 10:57:10 +0000 (UTC) Message-ID: In-Reply-To: References: , <10e334a07e0d45ff7bce0a18b56fd68f13ad2ce8.camel@gmail.com>, <9dcb22311514913d7b0fe41fd957e24423b8fa9b.camel@gmail.com>, <34cc0e2a780cca469d65222421e17f85414df8b2.camel@gmail.com>, <87ttr2ij9i.fsf@gmail.com> Date: Sun, 8 Oct 2023 12:00:39 +0200 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 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: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus 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/libusb.scm (libmtp) [#:phases] : New phase. * gnu/packages/xdisorg.scm (libwacom) [#:phases] : New phase. * gnu/packages/freedesktop.scm (libfprint) [#:configure-flags]: Change the hardware directory. * gnu/packages/linux.scm (eudev): [#:phases] : Change the installation directory. [native-search-paths]: change the search directory. * gnu/services/base.scm (file->udev-hardware): Change the directory name. (file->udev-hardware): Same. (udev-etc): Same. --- gnu/packages/freedesktop.scm | 2 +- gnu/packages/gnome.scm | 2 +- gnu/packages/libusb.scm | 8 +++++++- gnu/packages/linux.scm | 16 ++++++++-------- gnu/packages/xdisorg.scm | 9 ++++++++- gnu/services/base.scm | 6 +++--- 6 files changed, 28 insertions(+), 15 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 85ba5ba147..cae9fadae8 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2209,7 +2209,7 @@ (define-public libfprint (arguments (list #:configure-flags #~(list (string-append "-Dudev_hwdb_dir=" #$output - "/lib/udev/hwdb.d") + "/lib/udev/hardware") (string-append "-Dc_link_args=-Wl,-rpath=" (search-input-directory %build-inputs "lib/nss")) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3f773aae8a..164e822f6c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5760,7 +5760,7 @@ (define-public upower ;; in /gnu/store. "-Dhistorydir=/var/lib/upower" (string-append "-Dudevrulesdir=" #$output "/bin/udev/rules.d") - (string-append "-Dudevhwdbdir=" #$output "/lib/udev/hwdb.d")) + (string-append "-Dudevhwdbdir=" #$output "/lib/udev/hardware")) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'adjust-test-suite diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index e615b81ea3..23342dedcb 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -584,7 +584,13 @@ (define-public libmtp (arguments (list #:configure-flags #~(list "--disable-static" - (string-append "--with-udev=" #$output "/lib/udev")))) + (string-append "--with-udev=" #$output "/lib/udev")) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'move-hardware-files + (lambda _ + (rename-file (string-append #$output "/lib/udev/hwdb.d") + (string-append #$output "/lib/udev/hardware"))))))) (home-page "https://libmtp.sourceforge.net/") (synopsis "Library implementing the Media Transfer Protocol") (description "Libmtp implements an MTP (Media Transfer Protocol) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f552ccccae..be6500539c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4288,16 +4288,16 @@ (define-public eudev (add-before 'bootstrap 'install-in-lib (lambda _ ;; When the udev-service-type instantiates /etc, it collects - ;; hardware files from the /lib/udev/hwdb.d directories - ;; of different packages. Since we set sysconfdir to /etc, the - ;; only package-dependent location we can install hwdb files is - ;; in /lib/udev/hwdb.d. Eudev is configured to install - ;; these files in sysconfdir, but they should be placed into - ;; udevlibexecdir. + ;; hardware files from the /lib/udev/hardware + ;; directories of different packages. Since we set sysconfdir + ;; to /etc, the only package-dependent location we can install + ;; hwdb files is in /lib/udev/hardware. Eudev is + ;; configured to install these files in sysconfdir, but they + ;; should be placed into udevlibexecdir. (copy-file "hwdb/Makefile.am" "hwdb/files.am") (call-with-output-file "hwdb/Makefile.am" (lambda (port) - (format port "hardwarelibdir = $(udevlibexecdir)/hwdb.d\n") + (format port "hardwarelibdir = $(udevlibexecdir)/hardware\n") (format port "include ./files.am"))) (substitute* "hwdb/files.am" (("dist_udevhwdb_DATA =") @@ -4331,7 +4331,7 @@ (define-public eudev (native-search-paths (list (search-path-specification (variable "UDEV_HWDB_PATH") - (files '("lib/udev/hwdb.d"))))) + (files '("lib/udev/hardware"))))) (native-inputs (list autoconf automake diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index f86608497d..573342e23b 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1432,7 +1432,14 @@ (define-public libwacom (build-system meson-build-system) (arguments (list - #:configure-flags #~(list "--default-library=shared"))) + #:configure-flags #~(list "--default-library=shared") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-hardware-installation-directory + (lambda _ + (substitute* "meson.build" + (("dir_udev / 'hwdb.d'") + "dir_udev / 'hardware'"))))))) (native-inputs (list pkg-config ;; For tests. diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 32a89fb190..07b8b3b1a0 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2233,7 +2233,7 @@ (define (udev-rule file-name contents) (define (udev-hardware file-name contents) "Return a directory with a udev hardware file FILE-NAME containing CONTENTS." - (udev-configuration-file "hwdb.d" file-name contents)) + (udev-configuration-file "hardware" file-name contents)) (define (file->udev-configuration-file subdirectory file-name file) "Return a directory with a udev configuration file FILE-NAME which is a copy @@ -2260,7 +2260,7 @@ (define (file->udev-rule file-name file) (define (file->udev-hardware file-name file) "Return a directory with a udev hardware file FILE-NAME which is a copy of FILE." - (file->udev-configuration-file "hwdb.d" file-name file)) + (file->udev-configuration-file "hardware" file-name file)) (define kvm-udev-rule ;; Return a directory with a udev rule that changes the group of /dev/kvm to @@ -2371,7 +2371,7 @@ (define (udev-etc config) (match-record config (udev rules hardware) (let* ((hardware - (udev-configurations-union "hwdb.d" (cons* udev hardware))) + (udev-configurations-union "hardware" (cons* udev hardware))) (hwdb.bin (computed-file "hwdb.bin"