From: Vivien Kraus via Guix-patches via <guix-patches@gnu.org>
To: Liliana Marie Prikler <liliana.prikler@gmail.com>,
Maxim Cournoyer <maxim.cournoyer@gmail.com>,
66099@debbugs.gnu.org
Cc: rg@raghavgururajan.name
Subject: [bug#66099] [PATCH gnome-team v9 7/7] services: udev: Install hardware files in /lib/udev/hardware.
Date: Sun, 8 Oct 2023 12:00:39 +0200 [thread overview]
Message-ID: <a752e535912270fb5cc650d7fa4a153432431043.1696762169.git.vivien@planete-kraus.eu> (raw)
In-Reply-To: <cover.1696762169.git.vivien@planete-kraus.eu>
* gnu/packages/libusb.scm (libmtp) [#:phases] <move-hardware-files>: New phase.
* gnu/packages/xdisorg.scm (libwacom) [#:phases]
<set-hardware-installation-directory>: New phase.
* gnu/packages/freedesktop.scm (libfprint) [#:configure-flags]: Change the
hardware directory.
* gnu/packages/linux.scm (eudev): [#:phases] <install-in-lib>: 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 <package>/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 <package>/lib/udev/hwdb.d. Eudev is configured to install
- ;; these files in sysconfdir, but they should be placed into
- ;; udevlibexecdir.
+ ;; hardware files from the <package>/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 <package>/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-configuration>
(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"
--
2.41.0
next prev parent reply other threads:[~2023-10-08 10:58 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-19 11:35 [bug#66099] [PATCH gnome-team 0/3] Update upower Vivien Kraus via Guix-patches via
2023-09-19 11:23 ` [bug#66099] [PATCH gnome-team 1/3] gnu: eudev: Update libudev version to 251 Vivien Kraus via Guix-patches via
2023-09-19 11:32 ` [bug#66099] [PATCH gnome-team 2/3] gnu: libgudev: Update to 238 Vivien Kraus via Guix-patches via
2023-09-19 11:32 ` [bug#66099] [PATCH gnome-team 3/3] gnu: upower: Update to 1.90.2 Vivien Kraus via Guix-patches via
2023-09-19 15:51 ` Vivien Kraus via Guix-patches via
2023-09-21 17:06 ` [bug#66099] [PATCH gnome-team 0/3] Update upower Liliana Marie Prikler
2023-09-21 21:05 ` Vivien Kraus via Guix-patches via
2023-09-21 22:03 ` Vivien Kraus via Guix-patches via
2023-09-22 4:22 ` Liliana Marie Prikler
2023-09-30 10:43 ` [bug#66099] [WIP PATCH gnome-team v2 0/3] Nicer eudev, upower still fails Vivien Kraus via Guix-patches via
2023-09-19 11:23 ` [bug#66099] [WIP PATCH gnome-team v2 1/3] gnu: eudev: Update libudev version to 251 Vivien Kraus via Guix-patches via
2023-09-19 11:32 ` [bug#66099] [WIP PATCH gnome-team v2 2/3] gnu: libgudev: Update to 238 Vivien Kraus via Guix-patches via
2023-09-19 11:32 ` [bug#66099] [WIP PATCH gnome-team v2 3/3] gnu: upower: Update to 1.90.2 Vivien Kraus via Guix-patches via
2023-09-30 14:20 ` [bug#66099] [PATCH gnome-team v3 0/3] Update eudev and upower Vivien Kraus via Guix-patches via
2023-09-19 11:23 ` [bug#66099] [PATCH gnome-team v3 1/3] gnu: eudev: Update libudev version to 251 Vivien Kraus via Guix-patches via
2023-09-30 17:59 ` Liliana Marie Prikler
2023-10-01 22:02 ` Maxim Cournoyer
2023-10-02 17:02 ` Liliana Marie Prikler
2023-09-19 11:32 ` [bug#66099] [PATCH gnome-team v3 2/3] gnu: libgudev: Update to 238 Vivien Kraus via Guix-patches via
2023-10-01 20:32 ` Maxim Cournoyer
2023-09-19 11:32 ` [bug#66099] [PATCH gnome-team v3 3/3] gnu: upower: Update to 1.90.2 Vivien Kraus via Guix-patches via
2023-10-01 20:20 ` [bug#66099] [PATCH gnome-team v4 0/4] Update eudev and upower Vivien Kraus via Guix-patches via
2023-09-19 11:23 ` [bug#66099] [PATCH gnome-team v4 1/4] gnu: eudev: Update libudev version to 251 Vivien Kraus via Guix-patches via
2023-10-02 17:12 ` Liliana Marie Prikler
2023-10-02 19:33 ` Vivien Kraus via Guix-patches via
2023-10-04 1:00 ` Maxim Cournoyer
2023-09-19 11:32 ` [bug#66099] [PATCH gnome-team v4 3/4] gnu: libgudev: Update to 238 Vivien Kraus via Guix-patches via
2023-09-19 11:32 ` [bug#66099] [PATCH gnome-team v4 4/4] gnu: upower: Update to 1.90.2 Vivien Kraus via Guix-patches via
2023-10-02 17:17 ` Liliana Marie Prikler
2023-10-04 10:00 ` [bug#66099] [PATCH gnome-team v5 0/4] Update eudev and udev-service-type Vivien Kraus via Guix-patches via
2023-09-19 11:23 ` [bug#66099] [PATCH gnome-team v5 1/4] gnu: eudev: Update libudev version to 251 Vivien Kraus via Guix-patches via
2023-09-19 11:32 ` [bug#66099] [PATCH gnome-team v5 3/4] gnu: libgudev: Update to 238 Vivien Kraus via Guix-patches via
2023-09-19 11:32 ` [bug#66099] [PATCH gnome-team v5 4/4] gnu: upower: Update to 1.90.2 Vivien Kraus via Guix-patches via
2023-10-02 19:08 ` [bug#66099] [PATCH gnome-team v5 2/4] gnu: udev-service-type: accept hwdb file extensions Vivien Kraus via Guix-patches via
2023-10-04 16:52 ` Liliana Marie Prikler
2023-10-04 21:37 ` [bug#66099] [PATCH gnome-team v6 0/5] Update eudev, udev-service-type, upower Vivien Kraus via Guix-patches via
2023-09-19 11:23 ` [bug#66099] [PATCH gnome-team v6 1/5] gnu: eudev: Update libudev version to 251 Vivien Kraus via Guix-patches via
2023-10-05 4:50 ` Liliana Marie Prikler
2023-10-05 5:04 ` [bug#66099] [PATCH gnome-team v7 0/5] Update eudev with a snippet, udev-service-type, upower Vivien Kraus via Guix-patches via
2023-09-19 11:23 ` [bug#66099] [PATCH gnome-team v7 1/5] gnu: eudev: Update libudev version to 251 Vivien Kraus via Guix-patches via
2023-10-05 13:28 ` Maxim Cournoyer
2023-09-19 11:32 ` [bug#66099] [PATCH gnome-team v7 4/5] gnu: libgudev: Update to 238 Vivien Kraus via Guix-patches via
2023-10-05 14:32 ` Maxim Cournoyer
2023-09-19 11:32 ` [bug#66099] [PATCH gnome-team v7 5/5] gnu: upower: Update to 1.90.2 Vivien Kraus via Guix-patches via
2023-10-05 14:35 ` Maxim Cournoyer
2023-10-02 19:08 ` [bug#66099] [PATCH gnome-team v7 3/5] gnu: udev-service-type: accept hwdb file extensions Vivien Kraus via Guix-patches via
2023-10-05 14:31 ` Maxim Cournoyer
2023-10-06 16:45 ` [bug#66099] [PATCH gnome-team v8 0/6] Update eudev, udev-service-type, upower Vivien Kraus via Guix-patches via
2023-09-19 11:23 ` [bug#66099] [PATCH gnome-team v8 1/6] gnu: eudev: Update to 3.2.14 Vivien Kraus via Guix-patches via
2023-10-06 18:35 ` Liliana Marie Prikler
2023-09-19 11:32 ` [bug#66099] [PATCH gnome-team v8 5/6] gnu: libgudev: Update to 238 Vivien Kraus via Guix-patches via
2023-09-19 11:32 ` [bug#66099] [PATCH gnome-team v8 6/6] gnu: upower: Update to 1.90.2 Vivien Kraus via Guix-patches via
2023-10-06 18:48 ` Liliana Marie Prikler
2023-10-02 19:08 ` [bug#66099] [PATCH gnome-team v8 4/6] gnu: udev-service-type: accept hardware description file extensions Vivien Kraus via Guix-patches via
2023-10-06 18:42 ` Liliana Marie Prikler
2023-10-05 17:24 ` [bug#66099] [PATCH gnome-team v8 3/6] services: udev: Make udev-rule helper functions generic Vivien Kraus via Guix-patches via
2023-10-07 14:45 ` Maxim Cournoyer
2023-10-08 10:49 ` [bug#66099] [PATCH gnome-team v9 0/7] Update eudev, upower, udev-service-type, with /lib/udev/hardware Vivien Kraus via Guix-patches via
2023-09-19 11:23 ` [bug#66099] [PATCH gnome-team v9 1/7] gnu: eudev: Update to 3.2.14 Vivien Kraus via Guix-patches via
2023-09-19 11:32 ` [bug#66099] [PATCH gnome-team v9 5/7] gnu: libgudev: Update to 238 Vivien Kraus via Guix-patches via
2023-09-19 11:32 ` [bug#66099] [PATCH gnome-team v9 6/7] gnu: upower: Update to 1.90.2 Vivien Kraus via Guix-patches via
2023-10-02 19:08 ` [bug#66099] [PATCH gnome-team v9 4/7] gnu: udev-service-type: accept hardware description file extensions Vivien Kraus via Guix-patches via
2023-10-05 17:24 ` [bug#66099] [PATCH gnome-team v9 3/7] services: udev: Make udev-rule helper functions generic Vivien Kraus via Guix-patches via
2023-10-05 17:33 ` [bug#66099] [PATCH gnome-team v9 2/7] services: udev: Rewrite udev-rule to use file->udev-rule Vivien Kraus via Guix-patches via
2023-10-08 10:00 ` Vivien Kraus via Guix-patches via [this message]
2023-10-08 12:28 ` [bug#66099] [PATCH gnome-team v9 7/7] services: udev: Install hardware files in /lib/udev/hardware Maxim Cournoyer
2023-10-10 19:28 ` [bug#66099] [PATCH gnome-team v10 0/6] Exact same, without the last patch Vivien Kraus via Guix-patches via
2023-09-19 11:23 ` [bug#66099] [PATCH gnome-team v10 1/6] gnu: eudev: Update to 3.2.14 Vivien Kraus via Guix-patches via
2023-10-05 17:33 ` [bug#66099] [PATCH gnome-team v10 2/6] services: udev: Rewrite udev-rule to use file->udev-rule Vivien Kraus via Guix-patches via
2023-10-05 17:24 ` [bug#66099] [PATCH gnome-team v10 3/6] services: udev: Make udev-rule helper functions generic Vivien Kraus via Guix-patches via
2023-10-02 19:08 ` [bug#66099] [PATCH gnome-team v10 4/6] gnu: udev-service-type: accept hardware description file extensions Vivien Kraus via Guix-patches via
2023-09-19 11:32 ` [bug#66099] [PATCH gnome-team v10 5/6] gnu: libgudev: Update to 238 Vivien Kraus via Guix-patches via
2023-09-19 11:32 ` [bug#66099] [PATCH gnome-team v10 6/6] gnu: upower: Update to 1.90.2 Vivien Kraus via Guix-patches via
2023-10-10 23:44 ` [bug#66099] [PATCH gnome-team v10 0/6] Exact same, without the last patch Maxim Cournoyer
2023-10-11 4:18 ` bug#66099: " Liliana Marie Prikler
2023-10-08 12:27 ` [bug#66099] [PATCH gnome-team v9 0/7] Update eudev, upower, udev-service-type, with /lib/udev/hardware Maxim Cournoyer
2023-10-08 12:33 ` Vivien Kraus via Guix-patches via
2023-10-05 17:33 ` [bug#66099] [PATCH gnome-team v8 2/6] services: udev: Rewrite udev-rule to use file->udev-rule Vivien Kraus via Guix-patches via
2023-10-06 18:23 ` [bug#66099] [PATCH gnome-team v8 0/6] Update eudev, udev-service-type, upower Liliana Marie Prikler
2023-10-04 21:05 ` [bug#66099] [PATCH gnome-team v7 2/5] services: udev: unify udev-rule and file->udev-rule Vivien Kraus via Guix-patches via
2023-10-05 13:30 ` Maxim Cournoyer
2023-10-05 13:33 ` Maxim Cournoyer
2023-10-05 5:54 ` [bug#66099] [PATCH gnome-team v7 0/5] Update eudev with a snippet, udev-service-type, upower Liliana Marie Prikler
2023-09-19 11:32 ` [bug#66099] [PATCH gnome-team v6 4/5] gnu: libgudev: Update to 238 Vivien Kraus via Guix-patches via
2023-09-19 11:32 ` [bug#66099] [PATCH gnome-team v6 5/5] gnu: upower: Update to 1.90.2 Vivien Kraus via Guix-patches via
2023-10-02 19:08 ` [bug#66099] [PATCH gnome-team v6 3/5] gnu: udev-service-type: accept hwdb file extensions Vivien Kraus via Guix-patches via
2023-10-05 5:42 ` Liliana Marie Prikler
2023-10-05 5:55 ` Vivien Kraus via Guix-patches via
2023-10-05 6:53 ` Liliana Marie Prikler
2023-10-04 21:05 ` [bug#66099] [PATCH gnome-team v6 2/5] services: udev: unify udev-rule and file->udev-rule Vivien Kraus via Guix-patches via
2023-09-30 19:32 ` [bug#66099] [PATCH gnome-team v4 2/4] guix: Add udev-hwdb-bin profile hook Vivien Kraus via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a752e535912270fb5cc650d7fa4a153432431043.1696762169.git.vivien@planete-kraus.eu \
--to=guix-patches@gnu.org \
--cc=66099@debbugs.gnu.org \
--cc=liliana.prikler@gmail.com \
--cc=maxim.cournoyer@gmail.com \
--cc=rg@raghavgururajan.name \
--cc=vivien@planete-kraus.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.