From unknown Fri Jun 20 07:09:54 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#66099 <66099@debbugs.gnu.org> To: bug#66099 <66099@debbugs.gnu.org> Subject: Status: [PATCH gnome-team 0/3] Update upower Reply-To: bug#66099 <66099@debbugs.gnu.org> Date: Fri, 20 Jun 2025 14:09:54 +0000 retitle 66099 [PATCH gnome-team 0/3] Update upower reassign 66099 guix-patches submitter 66099 Vivien Kraus severity 66099 normal tag 66099 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 19 07:39:07 2023 Received: (at submit) by debbugs.gnu.org; 19 Sep 2023 11:39:07 +0000 Received: from localhost ([127.0.0.1]:55504 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiZ4M-0003dz-ML for submit@debbugs.gnu.org; Tue, 19 Sep 2023 07:39:07 -0400 Received: from lists.gnu.org ([2001:470:142::17]:60030) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiZ4G-0003dL-2t for submit@debbugs.gnu.org; Tue, 19 Sep 2023 07:39:05 -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 1qiZ3w-00057e-Hz for guix-patches@gnu.org; Tue, 19 Sep 2023 07:38:41 -0400 Received: from planete-kraus.eu ([89.234.140.182]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1qiZ3s-0003bO-5T for guix-patches@gnu.org; Tue, 19 Sep 2023 07:38:38 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id a008724f for ; Tue, 19 Sep 2023 11:38:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:from:date:subject:mime-version:content-type :content-transfer-encoding:to; s=albinoniA; bh=Gdlxq9YERLQiqb0CX 15RaGHoXek=; b=M66SUG+8pvQ+XO5n3bFgf7RgUalBfXglAXYVimY+JkVMCw98O fKa3zZlZEY755D3OxHXdBPc3Wk9meiVC3fGfeSNH//47zGt7zRUvPHBsQrHS+SZN uCU0YXohxSZnbEXjJLqKqgabZKmEA7g6YH/DGEJvBK0kgHxz2n/07PsxrBiT/nlR xUB3rbvNYYvhzXoUxLTn2c2pCgY5Z+oUCpDOQh3TGaatOy6CylPEz5I1T1qoY4GI g64EbedkiNpJAO+HCOcX/5IYGdekekUvx7uDO1i7jd9d43uYPoR+69FYIAay4kC0 b2jyi93Ad133viFsbnHcnKvzFG9VT8yfpaJkQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 1540fe11 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Tue, 19 Sep 2023 11:38:30 +0000 (UTC) Message-ID: From: Vivien Kraus Date: Tue, 19 Sep 2023 13:35:29 +0200 Subject: [PATCH gnome-team 0/3] Update upower MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: guix-patches@gnu.org X-Debbugs-Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name User-Agent: Evolution 3.46.4 Received-SPF: pass client-ip=89.234.140.182; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) Dear guix, Here is how I would update eudev, so as to be able to build a newer libgudev and then a newer upower. What do you think? Best regards, Vivien Vivien Kraus (3): gnu: eudev: Update libudev version to 251. gnu: libgudev: Update to 238. gnu: upower: Update to 1.90.2. gnu/local.mk | 1 + gnu/packages/gnome.scm | 8 +- gnu/packages/linux.scm | 22 ++- gnu/packages/patches/eudev-bump-to-251.patch | 134 +++++++++++++++++++ 4 files changed, 155 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/eudev-bump-to-251.patch base-commit: e9ff5d51e3297089e66c124195e1f1b42dbded65 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 19 07:41:04 2023 Received: (at 66099) by debbugs.gnu.org; 19 Sep 2023 11:41:04 +0000 Received: from localhost ([127.0.0.1]:55511 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiZ6F-0003hX-E1 for submit@debbugs.gnu.org; Tue, 19 Sep 2023 07:41:04 -0400 Received: from planete-kraus.eu ([89.234.140.182]:40840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiZ6C-0003gz-3b for 66099@debbugs.gnu.org; Tue, 19 Sep 2023 07:41:01 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id ad5ea143 for <66099@debbugs.gnu.org>; Tue, 19 Sep 2023 11:40:50 +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:mime-version :content-type:content-transfer-encoding:to; s=albinoniA; bh=NeJD 8t1KN5wJnTgyB9jSnl6vSzE=; b=MQwhL+fB03QjRDpLZ7jh6MSVyyY1vzA4YqA/ Lg/4MEddRhPoK1gmJnSH/lgX+QMBqGfDOEoC6GYKOKS78Vx9aH4e3xdwt2OpfPGB oc/eCLTn7fTCIPk1uei+zVmtsuu7fLh4VceYuODxF850lsG4CI5nwk6D8trr51e6 ueiDQXyY5JZGqMokcbX5pjZe8dYEBtAxtlVOrxgAVjXUJrivIX1HTLw1fVHE8bg6 MO3jaefs06nwuc1JqvNXxkJ1xmg4Iu0CW7rXH9eP0iCzD3gVxqx2TDicu8Z44raN tQZKRc7B8JYnBaf2q8Gt5sCW847eOlJUrVksYkIRz0GnqnMx2A== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 2387034a (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <66099@debbugs.gnu.org>; Tue, 19 Sep 2023 11:40:50 +0000 (UTC) Message-ID: In-Reply-To: References: From: Vivien Kraus Date: Tue, 19 Sep 2023 13:23:22 +0200 Subject: [PATCH gnome-team 1/3] gnu: eudev: Update libudev version to 251. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: 66099@debbugs.gnu.org X-Debbugs-Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name User-Agent: Evolution 3.46.4 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66099 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Support for version 251 is only provided as a merge request for now: https://github.com/eudev-project/eudev/pull/253 This merge request bumps the eudev version to 3.2.14, but it has not been released yet. The udevadm command to generate the hwdb.bin file now looks at file under /lib/udev/hwdb.d, and generates /lib/udev/hwdb.bin. The intention is not to touch /etc so that users can supply their own files. The steps to generate the file are: 1. Copy /etc/udev/hwdb.d to /lib/udev/hwdb.d to accept all files from eudev; 2. Generate /lib/udev/hwdb.bin from /lib/udev/hwdb.d (by passing --usr to the udevadm command-line) − if not cross-compiling; 3. Copy /lib/udev/hwdb.bin to /etc/udev − if not cross-compiling. Point 1. is dealt with in a new phase, and points 2. and 3. are dealt with in the 'build-hwdb phase. * gnu/packages/linux.scm (eudev): Update to v3.2.12, but bump version to 3.2.14.beta. [#:phases] : New phase. : Update accordingly. * gnu/packages/patches/eudev-bump-to-251.patch: New file. * gnu/packages/linux.scm (eudev): Use it here. * gnu/local.mk (dist_patch_DATA): Register it here. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 22 ++- gnu/packages/patches/eudev-bump-to-251.patch | 134 +++++++++++++++++++ 3 files changed, 151 insertions(+), 6 deletions(-) create mode 100644 gnu/packages/patches/eudev-bump-to-251.patch diff --git a/gnu/local.mk b/gnu/local.mk index db21feb507..8b9365055d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1122,6 +1122,7 @@ dist_patch_DATA = \ %D%/packages/patches/esmini-use-pkgconfig.patch \ %D%/packages/patches/esmtp-add-lesmtp.patch \ %D%/packages/patches/eudev-rules-directory.patch \ + %D%/packages/patches/eudev-bump-to-251.patch \ %D%/packages/patches/evdi-fix-build-with-linux-6.2.patch \ %D%/packages/patches/exercism-disable-self-update.patch \ %D%/packages/patches/extempore-unbundle-external-dependencies.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 91109c41d9..2cad9cbbe9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4225,16 +4225,17 @@ (define-public eudev ;; The post-systemd fork, maintained by Gentoo. (package (name "eudev") - (version "3.2.11") + (version "3.2.14.beta") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/gentoo/eudev") - (commit (string-append "v" version)))) + (commit "v3.2.12"))) (file-name (git-file-name name version)) (sha256 (base32 - "0dzaqwjnl55f69ird57wb6skahc6l7zs1slsrzqqfhww33icp6av")) - (patches (search-patches "eudev-rules-directory.patch")))) + "0wpckjxzsb4wkj3pwnw14zmp3z8ivf03hjbgs838q5gfridpxnf7")) + (patches (search-patches "eudev-rules-directory.patch" + "eudev-bump-to-251.patch")))) (build-system gnu-build-system) (arguments (list @@ -4257,7 +4258,14 @@ (define-public eudev (substitute* (string-append #$output "/lib/libudev.la") (("old_library=.*") "old_library=''\n"))))) - (add-after 'install 'build-hwdb + (add-after 'install 'allow-eudev-hwdb + (lambda _ + ;; eudev distributes the hwdb, but each file has to be enabled + ;; by being copied under /lib/udev/hwdb.d. We accept all of + ;; them. + (symlink (string-append #$output "/etc/udev/hwdb.d") + (string-append #$output "/lib/udev/hwdb.d")))) + (add-after 'allow-eudev-hwdb 'build-hwdb (lambda _ ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and ;; similar tools to display product names. @@ -4267,7 +4275,9 @@ (define-public eudev #$@(if (%current-target-system) #~(#t) #~((invoke (string-append #$output "/bin/udevadm") - "hwdb" "--update")))))) + "hwdb" "--update" "--usr") + (symlink (string-append #$output "/lib/udev/hwdb.bin") + (string-append #$output "/etc/udev/hwdb.bin"))))))) #:configure-flags #~(list "--enable-manpages"))) (native-inputs (list autoconf diff --git a/gnu/packages/patches/eudev-bump-to-251.patch b/gnu/packages/patches/eudev-bump-to-251.patch new file mode 100644 index 0000000000..96a73f4ede --- /dev/null +++ b/gnu/packages/patches/eudev-bump-to-251.patch @@ -0,0 +1,134 @@ +From 4d29151078c351569767dfef490a29e379afd430 Mon Sep 17 00:00:00 2001 +Message-ID: <4d29151078c351569767dfef490a29e379afd430.1695104483.git.vivien@planete-kraus.eu> +In-Reply-To: +References: +From: Boian Bonev +Date: Tue, 30 May 2023 16:16:33 +0000 +Subject: [PATCH 1/1] Update as per IRC discussion + +Bump udev version to 251 + +Export dummies for + + - udev_device_has_current_tag + - udev_device_get_current_tags_list_entry + +since the current eudev device database does not support the concept of +current tags + +bump version to 3.2.14 +--- + README.md | 18 ++++++++++++------ + configure.ac | 4 ++-- + src/libudev/libudev-device.c | 11 +++++++++++ + src/libudev/libudev.h | 2 ++ + src/libudev/libudev.sym | 6 ++++++ + 5 files changed, 33 insertions(+), 8 deletions(-) + +diff --git a/README.md b/README.md +index 848ef3348..6016380ba 100644 +--- a/README.md ++++ b/README.md +@@ -1,11 +1,17 @@ +-This git repo is a fork of git://anongit.freedesktop.org/systemd/systemd +-with the aim of isolating udev from any particular flavor of system +-initialization. In this case, the isolation is from systemd. ++**eudev** is a standalone dynamic and persistent device naming support (aka ++userspace devfs) daemon that runs independently from the init system. ++**eudev** strives to remain init system and linux distribution neutral. It is ++currently used as the devfs manager for more than a dozen different linux ++distributions. ++ ++This git repo is a fork of git://anongit.freedesktop.org/systemd/systemd with ++the aim of isolating udev from any particular flavor of system initialization. ++In this case, the isolation is from systemd. + + This is a project started by Gentoo developers and testing was initially being +-done mostly on OpenRC. We welcome contribution from others using a variety of +-system initializations to ensure eudev remains system initialization and +-distribution neutral. On 2021-08-20 Gentoo decided to abandon eudev and a new ++done mostly on OpenRC. We welcome contribution from others using a variety of ++system initializations to ensure **eudev** remains system initialization and ++distribution neutral. On 2021-08-20 Gentoo decided to abandon eudev and a new + project was established on 2021-09-14 by Alpine, Devuan and Gentoo + contributors (alphabetical order). + +diff --git a/configure.ac b/configure.ac +index 3e31b0ebc..0d9a135bc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,6 +1,6 @@ + AC_PREREQ([2.68]) +-AC_INIT([eudev],[3.2.12],[https://github.com/gentoo/eudev/issues]) +-AC_SUBST(UDEV_VERSION, 243) ++AC_INIT([eudev],[3.2.14],[https://github.com/gentoo/eudev/issues]) ++AC_SUBST(UDEV_VERSION, 251) + AC_CONFIG_SRCDIR([src/udev/udevd.c]) + + AC_USE_SYSTEM_EXTENSIONS +diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c +index ac67ce846..7d7a6622e 100644 +--- a/src/libudev/libudev-device.c ++++ b/src/libudev/libudev-device.c +@@ -1819,6 +1819,12 @@ _public_ struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_dev + return udev_list_get_entry(&udev_device->tags_list); + } + ++_public_ struct udev_list_entry *udev_device_get_current_tags_list_entry(struct udev_device *udev_device) ++{ ++ // TODO: eudev database does not support current tags ++ return udev_device_get_tags_list_entry(udev_device); ++} ++ + /** + * udev_device_has_tag: + * @udev_device: udev device +@@ -1842,6 +1848,11 @@ _public_ int udev_device_has_tag(struct udev_device *udev_device, const char *ta + return false; + } + ++_public_ int udev_device_has_current_tag(struct udev_device *udev_device, const char *tag) { ++ // TODO: eudev database does not support current tags ++ return udev_device_has_tag(udev_device, tag); ++} ++ + #define ENVP_SIZE 128 + #define MONITOR_BUF_SIZE 4096 + static int update_envp_monitor_buf(struct udev_device *udev_device) +diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h +index 8491d2b81..0202964d6 100644 +--- a/src/libudev/libudev.h ++++ b/src/libudev/libudev.h +@@ -100,6 +100,7 @@ int udev_device_get_is_initialized(struct udev_device *udev_device); + struct udev_list_entry *udev_device_get_devlinks_list_entry(struct udev_device *udev_device); + struct udev_list_entry *udev_device_get_properties_list_entry(struct udev_device *udev_device); + struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_device *udev_device); ++struct udev_list_entry *udev_device_get_current_tags_list_entry(struct udev_device *udev_device); + struct udev_list_entry *udev_device_get_sysattr_list_entry(struct udev_device *udev_device); + const char *udev_device_get_property_value(struct udev_device *udev_device, const char *key); + const char *udev_device_get_driver(struct udev_device *udev_device); +@@ -110,6 +111,7 @@ unsigned long long int udev_device_get_usec_since_initialized(struct udev_device + const char *udev_device_get_sysattr_value(struct udev_device *udev_device, const char *sysattr); + int udev_device_set_sysattr_value(struct udev_device *udev_device, const char *sysattr, char *value); + int udev_device_has_tag(struct udev_device *udev_device, const char *tag); ++int udev_device_has_current_tag(struct udev_device *udev_device, const char *tag); + + /* + * udev_monitor +diff --git a/src/libudev/libudev.sym b/src/libudev/libudev.sym +index 76726fca7..d56c2aeab 100644 +--- a/src/libudev/libudev.sym ++++ b/src/libudev/libudev.sym +@@ -118,3 +118,9 @@ global: + udev_queue_flush; + udev_queue_get_fd; + } LIBUDEV_199; ++ ++LIBUDEV_247 { ++global: ++ udev_device_has_current_tag; ++ udev_device_get_current_tags_list_entry; ++} LIBUDEV_215; +-- +2.41.0 + -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 19 07:41:09 2023 Received: (at 66099) by debbugs.gnu.org; 19 Sep 2023 11:41:09 +0000 Received: from localhost ([127.0.0.1]:55515 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiZ6K-0003hs-Bg for submit@debbugs.gnu.org; Tue, 19 Sep 2023 07:41:09 -0400 Received: from planete-kraus.eu ([89.234.140.182]:40840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiZ6F-0003gz-GY for 66099@debbugs.gnu.org; Tue, 19 Sep 2023 07:41:04 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 601612be for <66099@debbugs.gnu.org>; Tue, 19 Sep 2023 11:40:53 +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 :mime-version; s=albinoniA; bh=/5f+Zuymz2HIx0erGKl+7E7lGW8=; b=C QHqH9lK8mKY0SGV7VGHuxCksy5EjJOjsMacm0Z667hagl9jdjjyr4Cc6IHCYFCuE o0AwAx29cxwy2GLehWa+ttHYOxyNmakEpHGrbuN+VK/pWwtE0jDYOLhkp3QdwdYY 62Wd7StMrqhPR+iXd7dLmfE0S7IPr3PDKtuurdfd5rZ725GWMvIpP+HYLoyYYL5i On1M7HbUmzKvMFOjp57rXsGTkcWuTI7Rq0Avv13ezU8GtcFlD0o2T3t8b+501XDm Ef81NSPc6zOqj4hNTa1bhgFg854RZAE6aS0SAA1zMhBJwTqOoF/D0+CcAY42Nyz4 ektC3SJVZAKJnE3pfJPBw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id a802a242 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <66099@debbugs.gnu.org>; Tue, 19 Sep 2023 11:40:52 +0000 (UTC) Message-ID: In-Reply-To: References: From: Vivien Kraus Date: Tue, 19 Sep 2023 13:32:26 +0200 Subject: [PATCH gnome-team 2/3] gnu: libgudev: Update to 238. To: 66099@debbugs.gnu.org X-Debbugs-Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66099 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2077478ff2..f87ad4b063 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6883,14 +6883,14 @@ (define-public eog-plugins (define-public libgudev (package (name "libgudev") - (version "236") + (version "238") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "094mgjmwgsgqrr1i0vd20ynvlkihvs3vgbmpbrhswjsrdp86j0z5")))) + "1laxgdkgmr30aw44sm4rgpsdybwxx5rszcm8c2y3vmy9myqnl9k1")))) (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 19 07:41:10 2023 Received: (at 66099) by debbugs.gnu.org; 19 Sep 2023 11:41:10 +0000 Received: from localhost ([127.0.0.1]:55517 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiZ6M-0003hw-2n for submit@debbugs.gnu.org; Tue, 19 Sep 2023 07:41:10 -0400 Received: from planete-kraus.eu ([89.234.140.182]:40840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiZ6H-0003gz-Ga for 66099@debbugs.gnu.org; Tue, 19 Sep 2023 07:41:06 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 13bb6d3d for <66099@debbugs.gnu.org>; Tue, 19 Sep 2023 11:40:55 +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 :mime-version; s=albinoniA; bh=vkCM3hMCgO+za9xxG8lbClU/4ks=; b=e ePX1aqRa+kD6BLQfGblXcSvvMJc6eV08EkeZXOY6Rxa2VKoDPqguq88DMpA7I0k6 ycBUTmicHJ/67MBMh4ubSGX5U0QWyyXoE1sf+qwZjIq+rqJ+FOdYHMpLZ4fNyEMo Wdx2bYqOA0s2pGwoevKas+zRpaKcaJAhEo2alfgyossptoHoYRVNdAiGnL/H7/xI 4l0Tv+SHF+Vbc5ar7mSd19lXfNRqyNHGZ3yKjofH+bE8Atr0G6IPiH5HZoiChFw+ y+qsbkLb6wgGisrufhqZuBDzVFiaUE0FiXpqIjosdUQ87pzoSw+pXHKTgu5ycJgE f2H2btgqJ4cU8VcN4digg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 7daa01b6 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <66099@debbugs.gnu.org>; Tue, 19 Sep 2023 11:40:54 +0000 (UTC) Message-ID: <1d492eda5693dd0f56f4cec53b2115d1c598139c.1695123329.git.vivien@planete-kraus.eu> In-Reply-To: References: From: Vivien Kraus Date: Tue, 19 Sep 2023 13:32:46 +0200 Subject: [PATCH gnome-team 3/3] gnu: upower: Update to 1.90.2. To: 66099@debbugs.gnu.org X-Debbugs-Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66099 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnome.scm (upower): Update to 1.90.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f87ad4b063..6a544099ab 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5712,7 +5712,7 @@ (define-public geocode-glib-with-libsoup2 (define-public upower (package (name "upower") - (version "1.90.0") + (version "1.90.2") (source (origin (method git-fetch) @@ -5721,7 +5721,7 @@ (define-public upower (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1g17rm91p8vfpjyb0k2shylrs55nccn3fa890vlk4n9s71sghbzq")) + (base32 "13xp423ycv8imf2cmgf6lii9f01p7x2v19cny7acrmczkc0cqv7d")) (modules '((guix build utils))) (snippet ;; Upstream commit ) id 1qid0U-0002Ta-ET for submit@debbugs.gnu.org; Tue, 19 Sep 2023 11:51:24 -0400 Received: from planete-kraus.eu ([89.234.140.182]:50370) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qid0O-0002TN-I8 for 66099@debbugs.gnu.org; Tue, 19 Sep 2023 11:51:21 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 8e769e2b for <66099@debbugs.gnu.org>; Tue, 19 Sep 2023 15:51:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:date:in-reply-to:references :content-type:content-transfer-encoding:mime-version; s= albinoniA; bh=oBlb7UOpNz+L93MCwXRLE8Uxrz0=; b=IMZGYf/CXFr5BzXFrU 1CaysI5pf2UmR3xQXxfFceRXspc91R5f1lMrPq1eHn1mr9JjSh9Gtq4cvnaRYaYx H+qQu8UeNSIGcb1M5xP0t03K18Ktc1BwpFHyOVKI9OQ7r4MfRxj2PrFZv4twxnuT QjrcUIwKzJse9GliLF450vTviBXa5bO95rDov7NSwMINhNq/pQ0PyBFblxPi2N58 4SjRQhT6LaQAJ0SjzPv2F9eyAuW0/F6DoCkq9AZ0rATe8qbjOBhl7plmu85Mdq1H 6djhk22PxhxcXaAggypYrNxzJyccbM+6PqxtTx27MEg8X2iJOrMixHA7v9UJZqyd do0A== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id cfdfc932 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <66099@debbugs.gnu.org>; Tue, 19 Sep 2023 15:51:05 +0000 (UTC) Message-ID: <644845c4f2a32a8a6583f19309be2be336629bb4.camel@planete-kraus.eu> Subject: Re: [PATCH gnome-team 3/3] gnu: upower: Update to 1.90.2. From: Vivien Kraus To: 66099@debbugs.gnu.org Date: Tue, 19 Sep 2023 17:51:03 +0200 In-Reply-To: <1d492eda5693dd0f56f4cec53b2115d1c598139c.1695123329.git.vivien@planete-kraus.eu> References: <1d492eda5693dd0f56f4cec53b2115d1c598139c.1695123329.git.vivien@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66099 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le mardi 19 septembre 2023 =C3=A0 13:32 +0200, Vivien Kraus a =C3=A9crit=C2= =A0: > * gnu/packages/gnome.scm (upower): Update to 1.90.2. Sorry, I just realized that upower fails spectacularly. I will have to fix it. Vivien From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 21 13:07:22 2023 Received: (at 66099) by debbugs.gnu.org; 21 Sep 2023 17:07:22 +0000 Received: from localhost ([127.0.0.1]:34748 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjN98-0002po-8m for submit@debbugs.gnu.org; Thu, 21 Sep 2023 13:07:22 -0400 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:61549) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjN90-0002pP-AQ for 66099@debbugs.gnu.org; Thu, 21 Sep 2023 13:07:21 -0400 Received: by mail-ed1-x541.google.com with SMTP id 4fb4d7f45d1cf-523100882f2so1432901a12.2 for <66099@debbugs.gnu.org>; Thu, 21 Sep 2023 10:07:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695316017; x=1695920817; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=/hUnl9Xpa4xKUCbLMXSbJKAEQoyFrwY1mZy5VQR8pkM=; b=a0L2K/l52EVvBq4f/FrXfYmzHWAppPSyhCFATUmJkFn03ynG2cT3c3jx42iEh1LtNF GYsgr9wg0pAJQUeA1mLlIqt9HW0md87BhC9ARowzdPiYaQlCl87OUDslIpbt4+f6HZIO Qf6LhJ6HLMo+HP1DZcxKjnfX0Or2P1uVSzHXAiz+TE9R+3TL2Q8boNzTpoOBDun3hArR mBn3Qp6V/CIAuHKViSxQF/dPq2gg6nhUHaUOl+3iAm9+RgkKouEQO34FgQs9F/2EAgDB 9DFKBnVqhRBBhbTgrLIJsFUpTDAuVEct7P2A4FajIoI68XvGo/d+Pt6SMzyseXdxO9SO q0sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695316017; x=1695920817; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=/hUnl9Xpa4xKUCbLMXSbJKAEQoyFrwY1mZy5VQR8pkM=; b=Fc8NiRDomZXFh0ZxPOVPQU++Syi0AkCyto0b4KLMgJNJROwG28gz0KcEBsKQKRnGak uRQS0IdIhh4U4GCpfdrvntB2VyIFQ96ESNgdQe2N5CLQkQGw7I6GkwitqDgkbGR29+54 kMR6VSDBHYkKxpv5JZ3EoADekzx7NlHy6Ct5RwHhp/F61hBuxf1lCScNHoSmbbLSAtpQ RtKBig/tTG4DdD4pdZYlkuGc7wQcMFsz9Ej/0ONfHd1J+/X9LatAS26zYg7YeMAtzdqt FWz7Q/vuUrwUUKnsf3cv1FY08+GYyFWdztwtK7JQVJN3rsa/PFQVs+UHnoAxBbszbm5g w59A== X-Gm-Message-State: AOJu0Yy3ssBIxCSHwKcL64oeK/mOJ0U4wbSd5PsuY8RUE85BoLjgBJeK uYk+Ow+xzIqJBBzw5co9X0w= X-Google-Smtp-Source: AGHT+IGtmpQeAPDHewCuYivij6g3bgo0CFYKapf9kQ4smzbeyLI1mIIC1PR0NRMwTFrSAkc7+LlqOA== X-Received: by 2002:a17:906:118:b0:9ad:e098:1823 with SMTP id 24-20020a170906011800b009ade0981823mr4982219eje.27.1695316017365; Thu, 21 Sep 2023 10:06:57 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id h11-20020a170906854b00b0099b8234a9fesm1333404ejy.1.2023.09.21.10.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 10:06:56 -0700 (PDT) Message-ID: <4c52ffd0442ea8f35ff6f18cef7a21be4092bf27.camel@gmail.com> Subject: Re: [bug#66099] [PATCH gnome-team 0/3] Update upower From: Liliana Marie Prikler To: Vivien Kraus , 66099@debbugs.gnu.org Date: Thu, 21 Sep 2023 19:06:55 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Dienstag, dem 19.09.2023 um 13:35 +0200 schrieb Vivien Kraus: > Dear guix, >=20 > Here is how I would update eudev, so as to be able to build a newer > libgudev and then a newer upower. >=20 > What do you think? >=20 > Best regards, >=20 > Vivien >=20 > Vivien Kraus (3): > =C2=A0 gnu: eudev: Update libudev version to 251. > =C2=A0 gnu: libgudev: Update to 238. > =C2=A0 gnu: upower: Update to 1.90.2. Does upower use GNOME versioning or Semver? If so, 1.90 is potentially experimental. eudev and libgudev versions LGTM. Cheers From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 21 17:06:21 2023 Received: (at 66099) by debbugs.gnu.org; 21 Sep 2023 21:06:21 +0000 Received: from localhost ([127.0.0.1]:34888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjQsO-0000zX-OS for submit@debbugs.gnu.org; Thu, 21 Sep 2023 17:06:21 -0400 Received: from planete-kraus.eu ([89.234.140.182]:50804) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjQsJ-0000zE-Fv for 66099@debbugs.gnu.org; Thu, 21 Sep 2023 17:06:19 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 5b2f5323; Thu, 21 Sep 2023 21:06:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:cc:date:in-reply-to:references :content-type:content-transfer-encoding:mime-version; s= albinoniA; bh=OiBEOGyt9G1qJIDODT37rIKH4kE=; b=lktdIYaH+eTCFxG4SS afG09+FclS8fGmk8Y+CSCkmiYnf/LIqdcuExigNmQRG7R2CmgTWo45v3Sp/9nMpU M2YLypV15w3WjR9OQdG0GUvfKHHC7yDjapbYqaDcHy8ImVgi2BAP8iW/UnhTLlxI 0K745yh69twCpm52tHzc4ahWby9eYlmifyL+YWt9eiyGtJ3GlVkSI2WaArkNr0BK 0GsjzNVtbmv1QcWJCUiQUmQ2nH4501eFjHYoBHHZf2HCxC7QJtKAkW9FqGTcrzr7 Bny9c86PgarB73bv5N5qzC/mhL4hsSPWrtzhcKprBeSaFkOeJsvNQdFKAslPW4Rw Zotw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id bc1369ee (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 21 Sep 2023 21:06:02 +0000 (UTC) Message-ID: Subject: Re: [bug#66099] [PATCH gnome-team 0/3] Update upower From: Vivien Kraus To: Liliana Marie Prikler , 66099@debbugs.gnu.org Date: Thu, 21 Sep 2023 23:05:59 +0200 In-Reply-To: <4c52ffd0442ea8f35ff6f18cef7a21be4092bf27.camel@gmail.com> References: <4c52ffd0442ea8f35ff6f18cef7a21be4092bf27.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le jeudi 21 septembre 2023 =C3=A0 19:06 +0200, Liliana Marie Prikler a =C3=A9crit=C2=A0: > Does upower use GNOME versioning or Semver?=C2=A0 If so, 1.90 is > potentially > experimental.=C2=A0 eudev and libgudev versions LGTM. Unfortunately, neither upower 1.90.0 nor 1.90.2 build with updated eudev and libgudev. Vivien From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 21 18:03:24 2023 Received: (at 66099) by debbugs.gnu.org; 21 Sep 2023 22:03:24 +0000 Received: from localhost ([127.0.0.1]:34946 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjRlb-0002fS-Sv for submit@debbugs.gnu.org; Thu, 21 Sep 2023 18:03:24 -0400 Received: from planete-kraus.eu ([89.234.140.182]:60446) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjRlW-0002fF-NM for 66099@debbugs.gnu.org; Thu, 21 Sep 2023 18:03:22 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 74c092f2; Thu, 21 Sep 2023 22:03:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:cc:date:in-reply-to:references :content-type:content-transfer-encoding:mime-version; s= albinoniA; bh=iQPTuhZCehT+Y8lRFLhoxO5exA4=; b=LvYXt9fJQ1WTBb8Q/6 TJ4Lm2RSE0+rytPBhj2k7s8PsqQsgNha1wI/owGwnsIVNSShb2Dn6+mxCRKDZtay P87jyrMi3YDgK3Av3rJcfAic9Rx5cLdHr3y3pd1TRTMZmIV1BJvFsO8Xl1+jrhDM jAB2FjVTpWIFZW1iI2/EHabh4anT7Op2VA/QvB7cCj/U2k7FmMko7tBU78VraMSi 6sun9iCS1z9fcumBEwDJMqys75uSSb1iFwvhTALcpcKi2dEzAzCZKL/FO+LJ+yVR vPqF5efL/M7WEBfUjRsXVHqgKqXXZGLWu9K3SqHfAcCiUnpDoCtpiFdYGwItIPJl 0izQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id ae8b8a56 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 21 Sep 2023 22:03:06 +0000 (UTC) Message-ID: <4c33ab1d7c349f4215c5fdd7a1d42389d0e34bd3.camel@planete-kraus.eu> Subject: Re: [bug#66099] [PATCH gnome-team 0/3] Update upower From: Vivien Kraus To: Liliana Marie Prikler , 66099@debbugs.gnu.org Date: Fri, 22 Sep 2023 00:03:03 +0200 In-Reply-To: References: <4c52ffd0442ea8f35ff6f18cef7a21be4092bf27.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le jeudi 21 septembre 2023 =C3=A0 23:05 +0200, Vivien Kraus a =C3=A9crit=C2= =A0: > Le jeudi 21 septembre 2023 =C3=A0 19:06 +0200, Liliana Marie Prikler a > =C3=A9crit=C2=A0: > > eudev and libgudev versions LGTM. > Unfortunately, neither upower 1.90.0 nor 1.90.2 build with updated > eudev and libgudev. I think the problem is with hwdb. If I install upower before checking it, I get: phase `build' succeeded after 2.5 seconds starting phase `install' [0/1] Installing files. Traceback (most recent call last): File "/gnu/store/brxy70m8k3g8pxf5qj312amsnnj9njb8-meson- 1.1.0/lib/python3.10/site-packages/mesonbuild/mesonmain.py", line 194, in run return options.run_func(options) File "/gnu/store/brxy70m8k3g8pxf5qj312amsnnj9njb8-meson- 1.1.0/lib/python3.10/site-packages/mesonbuild/minstall.py", line 835, in run installer.do_install(datafilename) File "/gnu/store/brxy70m8k3g8pxf5qj312amsnnj9njb8-meson- 1.1.0/lib/python3.10/site-packages/mesonbuild/minstall.py", line 547, in do_install self.install_data(d, dm, destdir, fullprefix) File "/gnu/store/brxy70m8k3g8pxf5qj312amsnnj9njb8-meson- 1.1.0/lib/python3.10/site-packages/mesonbuild/minstall.py", line 620, in install_data if self.do_copyfile(fullfilename, outfilename, makedirs=3D(dm, outdir)): File "/gnu/store/brxy70m8k3g8pxf5qj312amsnnj9njb8-meson- 1.1.0/lib/python3.10/site-packages/mesonbuild/minstall.py", line 422, in do_copyfile self.copy2(from_file, to_file) File "/gnu/store/brxy70m8k3g8pxf5qj312amsnnj9njb8-meson- 1.1.0/lib/python3.10/site-packages/mesonbuild/minstall.py", line 322, in copy2 shutil.copy2(*args, **kwargs) File "/gnu/store/dy3xh053ahkhrp2jamggq8cpsyvp8mg0-python- 3.10.7/lib/python3.10/shutil.py", line 434, in copy2 copyfile(src, dst, follow_symlinks=3Dfollow_symlinks) File "/gnu/store/dy3xh053ahkhrp2jamggq8cpsyvp8mg0-python- 3.10.7/lib/python3.10/shutil.py", line 256, in copyfile with open(dst, 'wb') as fdst: PermissionError: [Errno 13] Permission denied: '/gnu/store/grx741bq3w2hq9dp61gbphghffzq5ywp-eudev- 3.2.14.beta/lib/udev/hwdb.d/95-upower-hid.hwdb' So, presumably, upower tries to install itself into eudev stuff, which fails. Now, it should install into upower=E2=80=99s prefix, but I=E2=80=99m= not sure how udevadm hwdb --update can be made to find hwdb files both from eudev and from upower. Maybe we need to introduce a search path, but I=E2=80=99m not sure udevadm understands any search path. I asked on #eudev in IRC, let=E2=80=99s see... Vivien From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 22 00:23:16 2023 Received: (at 66099) by debbugs.gnu.org; 22 Sep 2023 04:23:16 +0000 Received: from localhost ([127.0.0.1]:35110 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjXhE-00040J-52 for submit@debbugs.gnu.org; Fri, 22 Sep 2023 00:23:16 -0400 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:55643) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjXh8-0003zn-HV for 66099@debbugs.gnu.org; Fri, 22 Sep 2023 00:23:15 -0400 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-99de884ad25so205740866b.3 for <66099@debbugs.gnu.org>; Thu, 21 Sep 2023 21:23:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695356574; x=1695961374; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=SH0xgzs3QuUybFVVDW+KXZAhD1IovoV8Yv87HePRHyA=; b=KXO5x9iAyWbeJrJvS50oilth5u6nJWZejfugR5ez1gmvUKoyGbsX/Ev5Rqredo2MEn HGVeyKb7emz7ca7WVqJOsic9KOHMqXtcXmqPAQnLmTT7XUJINuFmH4pJlUpWszismbR7 pw8j0NfV7UZkWAwfEzsozJ8RB/36eB2Lnd/1225Df3kUH/Fz1/IQrmg4aCuu0FB2iSyn tS1mXIhoyJMnQGToI4T4mtEP2Tcx1ZRfqBVtbeMvEX3jR7izeRgGxVxhkLjXdFaTMhGX RuT+I/MqEibxXFA7QPcRy+Zl5BoFFugSDk4gYzfRkgEhXCeFpfRljB47+AmiIOnybBYd p6+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695356574; x=1695961374; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=SH0xgzs3QuUybFVVDW+KXZAhD1IovoV8Yv87HePRHyA=; b=MLCJrI7+amVNbU0sEUE+bZydBfI/0T6Lqe5Jsdzvf916qwOHqMQdpEFX0zoWMRUnbP y2qzLeKyi9avKKzZ51qlLlDmjGVKTPswAPfoe357DOyMh83u+4KHvCou9ei/kHT5wyfq W0jY/4EFY6QPTXPjVG5HA2vlP36eF19IbmhrD6H8jHgZg7i5DftbkgYclZnLA8dBdcfR kaS9vnM/GpavrqOpc7nawLd+v71+XFNibLtxOZHeTQmQsM8BwmxfcaPiyRzLjaN3t2p0 aTLRoJHHvdYkt/Dslu7dRB2LH6mYiLs8kjZDIV9eL7JzBRS5HuJ3CHcnqVQIXKemwuwu +OHQ== X-Gm-Message-State: AOJu0Yz14uXgnX9/HZd4fZaTfIsr1rwYbVJ5QNR8A3/+v1NfPpWPOS3m a9r5pYWWqTzENLaEXn8FetU= X-Google-Smtp-Source: AGHT+IHlDgSuzDw2Jn8uEY1nw1Zy1OzeKq35n9w7CGMLVKxUP7JRFDSwkqQjWmeqk4BuW+InAU+geg== X-Received: by 2002:a17:906:7387:b0:9ae:3f69:9b89 with SMTP id f7-20020a170906738700b009ae3f699b89mr7337034ejl.7.1695356573977; Thu, 21 Sep 2023 21:22:53 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id z27-20020a1709060adb00b00993cc1242d4sm2074314ejf.151.2023.09.21.21.22.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 21:22:52 -0700 (PDT) Message-ID: Subject: Re: [bug#66099] [PATCH gnome-team 0/3] Update upower From: Liliana Marie Prikler To: Vivien Kraus , 66099@debbugs.gnu.org Date: Fri, 22 Sep 2023 06:22:50 +0200 In-Reply-To: <4c33ab1d7c349f4215c5fdd7a1d42389d0e34bd3.camel@planete-kraus.eu> References: <4c52ffd0442ea8f35ff6f18cef7a21be4092bf27.camel@gmail.com> <4c33ab1d7c349f4215c5fdd7a1d42389d0e34bd3.camel@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Freitag, dem 22.09.2023 um 00:03 +0200 schrieb Vivien Kraus: > So, presumably, upower tries to install itself into eudev stuff, > which fails. Now, it should install into upower=E2=80=99s prefix, but I= =E2=80=99m not > sure how udevadm hwdb --update can be made to find hwdb files both > from eudev and from upower. Maybe we need to introduce a search path, > but I=E2=80=99m not sure udevadm understands any search path. This is a mostly solved problem on the Guix side. We either use search paths, or in case a single file is really, absolutely, positively needed, we can also make do with a profile hook or some other lookup mechanism (see below). In either case, we let packages write to *their own* output directory rather than some other packages'. For udev specifically, we have configuration files that specify where to look up stuff generated by udev-service-type. You might want to place hwdb-related logic there. Cheers From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 30 06:47:20 2023 Received: (at 66099) by debbugs.gnu.org; 30 Sep 2023 10:47:20 +0000 Received: from localhost ([127.0.0.1]:57788 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmXVH-0003iG-T2 for submit@debbugs.gnu.org; Sat, 30 Sep 2023 06:47:20 -0400 Received: from planete-kraus.eu ([89.234.140.182]:48792) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmXVC-0003hw-Of for 66099@debbugs.gnu.org; Sat, 30 Sep 2023 06:47:18 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 479fe1a3; Sat, 30 Sep 2023 10:46:56 +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=albinoniA; bh=8IllG/iUYeuMh4Fe17WtACJeN8U=; b=3 uUjA5bv8G79U7yhGwKM5LB0uXHPG9VhA2qMNdeSCqAq3hMWC8G+LTvMpy0cN5CR5 PP0neED5uSK8r1JQmCURJeOxX49Vx8R3mXjW7Egj53b9w7sS4ba1eHlWzGH/H0YI Ve7fhz39RgUT0MZxSGrFQ8KRYsYL+zxBRR8jVFozx+Mpgb0aSFDFN6cN9TYHHDY8 6DIhpsIcv13p/T1am2t7rdAyk8DAu0iVDrtzb5K4uAiIy9xugRFZzADVfz5uNHEm SWfvBpST3vh13g3KU1AlCuwIbYH9FsV/RrvDyVcxiU4vH6QlqijSOtK4EXTPWyyn qz3qNQeh9BrQZYCMbEvrQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id fc2f8375 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 30 Sep 2023 10:46:56 +0000 (UTC) Message-ID: <74d52597372713113a36207dc9542abda7c02a98.1696070591.git.vivien@planete-kraus.eu> In-Reply-To: References: From: Vivien Kraus Date: Tue, 19 Sep 2023 13:32:26 +0200 Subject: [WIP PATCH gnome-team v2 2/3] gnu: libgudev: Update to 238. To: Liliana Marie Prikler ,66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ea3dc455a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-pl [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ea3dc455a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-pl [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ea3dc455a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-plugins (define-public libgudev (package (name "libgudev") - (version "236") + (version "238") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "094mgjmwgsgqrr1i0vd20ynvlkihvs3vgbmpbrhswjsrdp86j0z5")))) + "1laxgdkgmr30aw44sm4rgpsdybwxx5rszcm8c2y3vmy9myqnl9k1")))) (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 30 06:47:27 2023 Received: (at 66099) by debbugs.gnu.org; 30 Sep 2023 10:47:27 +0000 Received: from localhost ([127.0.0.1]:57792 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmXVP-0003ig-5C for submit@debbugs.gnu.org; Sat, 30 Sep 2023 06:47:27 -0400 Received: from planete-kraus.eu ([89.234.140.182]:48792) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmXVG-0003hw-LX for 66099@debbugs.gnu.org; Sat, 30 Sep 2023 06:47:19 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 0854ba00; Sat, 30 Sep 2023 10:47:00 +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:mime-version :content-type:content-transfer-encoding:to:cc; s=albinoniA; bh=H GiP9DJaqlkBpu3ZlC5b+zWqZ/A=; b=e6Atx5ZGbrXMLlCnFFarKO0UBhITgH29v ihQAGcXPKJcxJCPWdul/cCOcObjfli+b8DomkJU5+kB3eqQjZujw4PE13QaFyNdx JOmuh/zOQCfRyVC7KlW6WH6eHxxUyJSvGL/9twZljgrgwr8IITkFUn6VHyCTLu/S qQMSgM8V5R61aV0aJOOuo9qszoLtaBG71HAmT/rmTIin7LsQuFr4sLnwSbVuM4q5 iINkn53jam9MPf0mbJrRBxj8U9H5jx5HAkxXl6qWO7gxBN4N8nhrBTzD8kgzHqCx USNicZRXNTe1MAruGvDwYR2nGxTwh7BAqmdLYl87XZVabhA1PJO/Q== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 269b99b9 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 30 Sep 2023 10:46:59 +0000 (UTC) Message-ID: <4b7bd62cdef6986e0d659816ada6cb0bf3d60cdc.1696070591.git.vivien@planete-kraus.eu> In-Reply-To: References: From: Vivien Kraus Date: Tue, 19 Sep 2023 13:32:46 +0200 Subject: [WIP PATCH gnome-team v2 3/3] gnu: upower: Update to 1.90.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: Liliana Marie Prikler ,66099@debbugs.gnu.org User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The new eudev now can install hwdb files. Upower has some, but they should get installed in upower’s output, not eudev’s. The phases needed a rework. Now the 32-bit-specific test fix is always there, except it may be empty. Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The new eudev now can install hwdb files. Upower has some, but they should get installed in upower’s output, not eudev’s. The phases needed a rework. Now the 32-bit-specific test fix is always there, except it may be empty. Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager The new eudev now can install hwdb files. Upower has some, but they should get installed in upower’s output, not eudev’s. The phases needed a rework. Now the 32-bit-specific test fix is always there, except it may be empty. Upower tests now requires that upower-provided hwdb files be installed. So I call udevadm hwdb --update first. * gnu/packages/gnome.scm (upower): Update to 1.90.2. [#:configure-flags]: Set udevhwdbdir. [#:phases] : Add this phase unconditionnally : Move it after 'install, and call set up hwdb first. --- gnu/packages/gnome.scm | 52 ++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4ea3dc455a..0c240dbb9a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5727,7 +5727,7 @@ (define-public geocode-glib-with-libsoup2 (define-public upower (package (name "upower") - (version "1.90.0") + (version "1.90.2") (source (origin (method git-fetch) @@ -5736,7 +5736,7 @@ (define-public upower (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1g17rm91p8vfpjyb0k2shylrs55nccn3fa890vlk4n9s71sghbzq")) + (base32 "13xp423ycv8imf2cmgf6lii9f01p7x2v19cny7acrmczkc0cqv7d")) (modules '((guix build utils))) (snippet ;; Upstream commit . - (substitute* "src/linux/integration-test.py" - (("assertEqual(.*)40\\.0" _ middle) - (string-append - "assertAlmostEqual" middle "40.0")))))) - #~%standard-phases))) + (string-append "-Dudevrulesdir=" #$output "/bin/udev/rules.d") + (string-append "-Dudevhwdbdir=" #$output "/lib/udev/hwdb.d")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'adjust-test-for-excess-precision + (lambda _ + #$@(if (target-x86-32?) + ;; Address test failure caused by excess precision + ;; on i686: + ;; . + '((substitute* "src/linux/integration-test.py" + (("assertEqual(.*)40\\.0" _ middle) + (string-append + "assertAlmostEqual" middle "40.0")))) + '(*unspecified*)))) + (delete 'check) ;; move after the install phase + (add-after 'install 'check + (lambda* (#:key parallel-tests? tests? #:allow-other-keys) + (when tests? + (setenv "UDEV_HWDB_PATH" + (apply string-append #$output "/lib/udev/hwdb.d" + (let ((p (getenv "HWDB_BIN_PATH"))) + (if p + (list ":" p) + '())))) + (let ((hwdb.bin (string-append (getcwd) "/test-hwdb.bin"))) + (invoke "udevadm" "hwdb" "--update" + "-o" hwdb.bin) + (setenv "UDEV_HWDB_BIN" hwdb.bin)) + (setenv "MESON_TESTTHREADS" + (if parallel-tests? + (number->string (parallel-job-count)) + "1")) + (invoke "dbus-run-session" "--" + "meson" "test" "-t" "0"))))))) (native-inputs (list `(,glib "bin") ; for gdbus-codegen gobject-introspection -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 30 06:47:28 2023 Received: (at 66099) by debbugs.gnu.org; 30 Sep 2023 10:47:28 +0000 Received: from localhost ([127.0.0.1]:57794 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmXVP-0003ik-Lk for submit@debbugs.gnu.org; Sat, 30 Sep 2023 06:47:27 -0400 Received: from planete-kraus.eu ([89.234.140.182]:48792) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmXVH-0003hw-Ua for 66099@debbugs.gnu.org; Sat, 30 Sep 2023 06:47:22 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id ebe324e0; Sat, 30 Sep 2023 10:47:04 +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:mime-version :content-type:content-transfer-encoding:to:cc; s=albinoniA; bh=p pC4qBGeqqTYlEtiCtoTTpjQ29g=; b=VhZIbyMxcDB6PGu2gaAmN3d34xc9zHZO2 1/LivK1PLinDgOi/Kr+z8yoQ1cNSt1E2rINNKohFyXzYQc475IpNYv8Y2dKw1p1I lPAh2wRLAOosD2wz/puzR9x33JU7iZHFxLLcUu13NQU7G7dPN/Oi6XXR0/xxRNd1 qfzzQW4CBo+jIZlLkSQSrXVm5jvyuPsedJzvNP2POcDhbw9McfOjNny8GMKea//N K3Fgv1r83C1+krcMpt5y+2e6OWRe6nkSWel5RUDY3/QC+wifGmj2yHZFiOo8ySUP ooe1wL14ghgF4oKMk/5+/Q/AFp6ymtEkU1NsfgxrLH2F6zk7ea83A== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 840a9c0a (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 30 Sep 2023 10:47:03 +0000 (UTC) Message-ID: In-Reply-To: References: From: Vivien Kraus Date: Sat, 30 Sep 2023 12:43:11 +0200 Subject: [WIP PATCH gnome-team v2 0/3] Nicer eudev, upower still fails MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: Liliana Marie Prikler ,66099@debbugs.gnu.org User-Agent: Evolution 3.46.4 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Dear guix, I fixed eudev so that the "hwdb" can be used with a search path. However, we still need a profile hook to generate the indexed hwdb.bin file and set UDEV_HWDB_BIN. I don’t know how to do that, do you have any pointers? Unfortunately, upower still fails to build. I don’t know what is happening. Vivien Kraus (3): gnu: eudev: Update libudev version to 251. gnu: libgudev: Update to 238. gnu: upower: Update to 1.90.2. gnu/local.mk | 2 + gnu/packages/gnome.scm | 56 +++- gnu/packages/linux.scm | 32 +- gnu/packages/patches/eudev-bump-to-251.patch | 134 ++++++++ .../patches/eudev-hwdb-bin-path.patch | 309 ++++++++++++++++++ 5 files changed, 502 insertions(+), 31 deletions(-) create mode 100644 gnu/packages/patches/eudev-bump-to-251.patch create mode 100644 gnu/packages/patches/eudev-hwdb-bin-path.patch base-commit: b18b2d13488f2a92331ccad2dc8cbb54ee15582f -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 30 06:47:29 2023 Received: (at 66099) by debbugs.gnu.org; 30 Sep 2023 10:47:29 +0000 Received: from localhost ([127.0.0.1]:57796 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmXVQ-0003iq-0e for submit@debbugs.gnu.org; Sat, 30 Sep 2023 06:47:29 -0400 Received: from planete-kraus.eu ([89.234.140.182]:48792) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmXVK-0003hw-LG for 66099@debbugs.gnu.org; Sat, 30 Sep 2023 06:47:24 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id b01f7927; Sat, 30 Sep 2023 10:47:06 +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:mime-version :content-type:content-transfer-encoding:to:cc; s=albinoniA; bh=N zcE4NE462ijEDP9ENqJivz9WhU=; b=wA82C2WsbQuTc/MDNvktHgz3XMV9qtveP QhLv+/ve/AtZiBG+LzYC6r600gTMKS34wyVVb61fL4hB6jWcaqQgTyJ6aarNNiFN BqZ6qQDVURmkB5Sa66Ejd+xr1rhaBC45SvRDGCHN2UIEIF1OePRVkNdjhia8BSQM Ga20I14KxIXYfkaumOBMPsiCmlqq/jxBU3jpCypI4QwyC2l/4fJl2oX4tA5JwYPD +IFlfIvXWdANr5rwIF245+Mzg9XgKVfWIlV6mBTOrowzt9sQAf+TbkGIwIjNeVwE 2smISqxY9r0sh/2eEZ5Rvcu2odruTsqEfEeyq1RXzDXHhQtSEmZJA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 373a9cf6 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 30 Sep 2023 10:47:05 +0000 (UTC) Message-ID: <18ff7cf952823194b52adcd0e6a13171d701ab94.1696070591.git.vivien@planete-kraus.eu> In-Reply-To: References: From: Vivien Kraus Date: Tue, 19 Sep 2023 13:23:22 +0200 Subject: [WIP PATCH gnome-team v2 1/3] gnu: eudev: Update libudev version to 251. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: Liliana Marie Prikler ,66099@debbugs.gnu.org User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Support for version 251 is only provided as a merge request for now: https://github.com/eudev-project/eudev/pull/253 This merge request bumps the eudev version to 3.2.14, but it has not been released yet. Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Support for version 251 is only provided as a merge request for now: https://github.com/eudev-project/eudev/pull/253 This merge request bumps the eudev version to 3.2.14, but it has not been released yet. Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Support for version 251 is only provided as a merge request for now: https://github.com/eudev-project/eudev/pull/253 This merge request bumps the eudev version to 3.2.14, but it has not been released yet. Eudev now has a hardware database that installs descriptions of hardware in /etc, but they should go to /lib prior to being used. I added a phase to copy all the /etc files to /lib. I submitted 3 patches to make udev hwdb more guix-friendly, fused in eudev-hwdb-bin-path.patch. libudev requires an indexed binary file that knows about all devices, and this file is generated by udevadm hwdb --update -o /lib/udev/hwdb.bin. This udevadm hwdb command respects the UDEV_HWDB_PATH to collect all entries for the hwdb. Then, libudev can use UDEV_HWDB_BIN to select the database at run-time. I think everything could work out for Guix if we add a new profile hook that: 1. Calls udevadm hwdb --update -o /lib/udev/hwdb.bin; 2. Set UDEV_HWDB_BIN to /lib/udev/hwdb.bin. Unfortunately, I don’t know how to do that profile hook thing. Do you have pointers? * gnu/packages/linux.scm (eudev): Update to v3.2.12, but bump version to 3.2.14.beta. [#:phases] : New phase. : Update accordingly. [search-paths]: Add UDEV_HWDB_PATH. * gnu/packages/patches/eudev-bump-to-251.patch: New file. * gnu/packages/patches/eudev-hwdb-bin-path.patch: New file. * gnu/packages/linux.scm (eudev): Use them here. * gnu/local.mk (dist_patch_DATA): Register them here. --- gnu/local.mk | 2 + gnu/packages/linux.scm | 32 +- gnu/packages/patches/eudev-bump-to-251.patch | 134 ++++++++ .../patches/eudev-hwdb-bin-path.patch | 309 ++++++++++++++++++ 4 files changed, 463 insertions(+), 14 deletions(-) create mode 100644 gnu/packages/patches/eudev-bump-to-251.patch create mode 100644 gnu/packages/patches/eudev-hwdb-bin-path.patch diff --git a/gnu/local.mk b/gnu/local.mk index 72c9954492..6c98ede191 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1127,6 +1127,8 @@ dist_patch_DATA = \ %D%/packages/patches/esmini-use-pkgconfig.patch \ %D%/packages/patches/esmtp-add-lesmtp.patch \ %D%/packages/patches/eudev-rules-directory.patch \ + %D%/packages/patches/eudev-bump-to-251.patch \ + %D%/packages/patches/eudev-hwdb-bin-path.patch \ %D%/packages/patches/exercism-disable-self-update.patch \ %D%/packages/patches/extempore-unbundle-external-dependencies.patch \ %D%/packages/patches/extundelete-e2fsprogs-1.44.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 85e3d9845d..5ea44e886e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4265,16 +4265,18 @@ (define-public eudev ;; The post-systemd fork, maintained by Gentoo. (package (name "eudev") - (version "3.2.11") + (version "3.2.14.beta") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/gentoo/eudev") - (commit (string-append "v" version)))) + (commit "v3.2.12"))) (file-name (git-file-name name version)) (sha256 (base32 - "0dzaqwjnl55f69ird57wb6skahc6l7zs1slsrzqqfhww33icp6av")) - (patches (search-patches "eudev-rules-directory.patch")))) + "0wpckjxzsb4wkj3pwnw14zmp3z8ivf03hjbgs838q5gfridpxnf7")) + (patches (search-patches "eudev-rules-directory.patch" + "eudev-bump-to-251.patch" + "eudev-hwdb-bin-path.patch")))) (build-system gnu-build-system) (arguments (list @@ -4297,18 +4299,20 @@ (define-public eudev (substitute* (string-append #$output "/lib/libudev.la") (("old_library=.*") "old_library=''\n"))))) - (add-after 'install 'build-hwdb + (add-after 'install 'allow-eudev-hwdb (lambda _ - ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and - ;; similar tools to display product names. - ;; - ;; XXX: This can't be done when cross-compiling. Find another way - ;; to generate hwdb.bin for cross-built systems. - #$@(if (%current-target-system) - #~(#t) - #~((invoke (string-append #$output "/bin/udevadm") - "hwdb" "--update")))))) + ;; eudev distributes the hwdb, but each file has to be enabled + ;; by being copied under /lib/udev/hwdb.d. We accept all of + ;; them. + (symlink (string-append #$output "/etc/udev/hwdb.d") + (string-append #$output "/lib/udev/hwdb.d"))))) #:configure-flags #~(list "--enable-manpages"))) + (search-paths + (list (search-path-specification + (variable "UDEV_HWDB_PATH") + (files '("lib/udev/hwdb.d"))))) + ;; FIXME: there needs to be a profile hook that calls udevadm hwdb + ;; --update -o /lib/udev/hwdb.bin (native-inputs (list autoconf automake diff --git a/gnu/packages/patches/eudev-bump-to-251.patch b/gnu/packages/patches/eudev-bump-to-251.patch new file mode 100644 index 0000000000..96a73f4ede --- /dev/null +++ b/gnu/packages/patches/eudev-bump-to-251.patch @@ -0,0 +1,134 @@ +From 4d29151078c351569767dfef490a29e379afd430 Mon Sep 17 00:00:00 2001 +Message-ID: <4d29151078c351569767dfef490a29e379afd430.1695104483.git.vivien@planete-kraus.eu> +In-Reply-To: +References: +From: Boian Bonev +Date: Tue, 30 May 2023 16:16:33 +0000 +Subject: [PATCH 1/1] Update as per IRC discussion + +Bump udev version to 251 + +Export dummies for + + - udev_device_has_current_tag + - udev_device_get_current_tags_list_entry + +since the current eudev device database does not support the concept of +current tags + +bump version to 3.2.14 +--- + README.md | 18 ++++++++++++------ + configure.ac | 4 ++-- + src/libudev/libudev-device.c | 11 +++++++++++ + src/libudev/libudev.h | 2 ++ + src/libudev/libudev.sym | 6 ++++++ + 5 files changed, 33 insertions(+), 8 deletions(-) + +diff --git a/README.md b/README.md +index 848ef3348..6016380ba 100644 +--- a/README.md ++++ b/README.md +@@ -1,11 +1,17 @@ +-This git repo is a fork of git://anongit.freedesktop.org/systemd/systemd +-with the aim of isolating udev from any particular flavor of system +-initialization. In this case, the isolation is from systemd. ++**eudev** is a standalone dynamic and persistent device naming support (aka ++userspace devfs) daemon that runs independently from the init system. ++**eudev** strives to remain init system and linux distribution neutral. It is ++currently used as the devfs manager for more than a dozen different linux ++distributions. ++ ++This git repo is a fork of git://anongit.freedesktop.org/systemd/systemd with ++the aim of isolating udev from any particular flavor of system initialization. ++In this case, the isolation is from systemd. + + This is a project started by Gentoo developers and testing was initially being +-done mostly on OpenRC. We welcome contribution from others using a variety of +-system initializations to ensure eudev remains system initialization and +-distribution neutral. On 2021-08-20 Gentoo decided to abandon eudev and a new ++done mostly on OpenRC. We welcome contribution from others using a variety of ++system initializations to ensure **eudev** remains system initialization and ++distribution neutral. On 2021-08-20 Gentoo decided to abandon eudev and a new + project was established on 2021-09-14 by Alpine, Devuan and Gentoo + contributors (alphabetical order). + +diff --git a/configure.ac b/configure.ac +index 3e31b0ebc..0d9a135bc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,6 +1,6 @@ + AC_PREREQ([2.68]) +-AC_INIT([eudev],[3.2.12],[https://github.com/gentoo/eudev/issues]) +-AC_SUBST(UDEV_VERSION, 243) ++AC_INIT([eudev],[3.2.14],[https://github.com/gentoo/eudev/issues]) ++AC_SUBST(UDEV_VERSION, 251) + AC_CONFIG_SRCDIR([src/udev/udevd.c]) + + AC_USE_SYSTEM_EXTENSIONS +diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c +index ac67ce846..7d7a6622e 100644 +--- a/src/libudev/libudev-device.c ++++ b/src/libudev/libudev-device.c +@@ -1819,6 +1819,12 @@ _public_ struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_dev + return udev_list_get_entry(&udev_device->tags_list); + } + ++_public_ struct udev_list_entry *udev_device_get_current_tags_list_entry(struct udev_device *udev_device) ++{ ++ // TODO: eudev database does not support current tags ++ return udev_device_get_tags_list_entry(udev_device); ++} ++ + /** + * udev_device_has_tag: + * @udev_device: udev device +@@ -1842,6 +1848,11 @@ _public_ int udev_device_has_tag(struct udev_device *udev_device, const char *ta + return false; + } + ++_public_ int udev_device_has_current_tag(struct udev_device *udev_device, const char *tag) { ++ // TODO: eudev database does not support current tags ++ return udev_device_has_tag(udev_device, tag); ++} ++ + #define ENVP_SIZE 128 + #define MONITOR_BUF_SIZE 4096 + static int update_envp_monitor_buf(struct udev_device *udev_device) +diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h +index 8491d2b81..0202964d6 100644 +--- a/src/libudev/libudev.h ++++ b/src/libudev/libudev.h +@@ -100,6 +100,7 @@ int udev_device_get_is_initialized(struct udev_device *udev_device); + struct udev_list_entry *udev_device_get_devlinks_list_entry(struct udev_device *udev_device); + struct udev_list_entry *udev_device_get_properties_list_entry(struct udev_device *udev_device); + struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_device *udev_device); ++struct udev_list_entry *udev_device_get_current_tags_list_entry(struct udev_device *udev_device); + struct udev_list_entry *udev_device_get_sysattr_list_entry(struct udev_device *udev_device); + const char *udev_device_get_property_value(struct udev_device *udev_device, const char *key); + const char *udev_device_get_driver(struct udev_device *udev_device); +@@ -110,6 +111,7 @@ unsigned long long int udev_device_get_usec_since_initialized(struct udev_device + const char *udev_device_get_sysattr_value(struct udev_device *udev_device, const char *sysattr); + int udev_device_set_sysattr_value(struct udev_device *udev_device, const char *sysattr, char *value); + int udev_device_has_tag(struct udev_device *udev_device, const char *tag); ++int udev_device_has_current_tag(struct udev_device *udev_device, const char *tag); + + /* + * udev_monitor +diff --git a/src/libudev/libudev.sym b/src/libudev/libudev.sym +index 76726fca7..d56c2aeab 100644 +--- a/src/libudev/libudev.sym ++++ b/src/libudev/libudev.sym +@@ -118,3 +118,9 @@ global: + udev_queue_flush; + udev_queue_get_fd; + } LIBUDEV_199; ++ ++LIBUDEV_247 { ++global: ++ udev_device_has_current_tag; ++ udev_device_get_current_tags_list_entry; ++} LIBUDEV_215; +-- +2.41.0 + diff --git a/gnu/packages/patches/eudev-hwdb-bin-path.patch b/gnu/packages/patches/eudev-hwdb-bin-path.patch new file mode 100644 index 0000000000..f6fa91dad0 --- /dev/null +++ b/gnu/packages/patches/eudev-hwdb-bin-path.patch @@ -0,0 +1,309 @@ +From 097290727d6e16aa2e5859e3cd6f0c5ea4c47101 Mon Sep 17 00:00:00 2001 +Message-ID: <097290727d6e16aa2e5859e3cd6f0c5ea4c47101.1696060300.git.vivien@planete-kraus.eu> +From: Vivien Kraus +Date: Tue, 26 Sep 2023 18:17:34 +0200 +Subject: [PATCH] Improvements for Guix + +--- +This is the combination of: + + - https://github.com/eudev-project/eudev/pull/262 + - https://github.com/eudev-project/eudev/pull/263 + - https://github.com/eudev-project/eudev/pull/264 + + src/libudev/libudev-hwdb.c | 37 +++++++++-- + src/libudev/libudev.h | 4 +- + src/udev/udevadm-hwdb.c | 127 +++++++++++++++++++++++++++++++++---- + 3 files changed, 149 insertions(+), 19 deletions(-) + +diff --git a/src/libudev/libudev-hwdb.c b/src/libudev/libudev-hwdb.c +index 62029e2b2..f7212c519 100644 +--- a/src/libudev/libudev-hwdb.c ++++ b/src/libudev/libudev-hwdb.c +@@ -47,6 +47,7 @@ struct udev_hwdb { + struct udev *udev; + int refcount; + ++ char *bin_paths; + FILE *f; + struct stat st; + union { +@@ -256,10 +257,28 @@ static int trie_search_f(struct udev_hwdb *hwdb, const char *search) { + return 0; + } + +-static const char hwdb_bin_paths[] = +- "/etc/udev/hwdb.bin\0" +- UDEV_LIBEXEC_DIR "/hwdb.bin\0"; +- ++static char *get_hwdb_bin_paths (void) { ++ static const char default_locations[] = ++ "/etc/udev/hwdb.bin\0" ++ UDEV_LIBEXEC_DIR "/hwdb.bin\0"; ++ const char *by_env = getenv("UDEV_HWDB_BIN"); ++ if (by_env != NULL) { ++ char *path = malloc(strlen(by_env) + 1 ++ + sizeof (default_locations)); ++ if (path != NULL) { ++ memcpy(path, by_env, strlen(by_env) + 1); ++ memcpy(path + strlen(by_env) + 1, ++ default_locations, ++ sizeof (default_locations)); ++ } ++ return path; ++ } ++ char *path = malloc(sizeof (default_locations)); ++ if (path != NULL) { ++ memcpy(path, default_locations, sizeof (default_locations)); ++ } ++ return path; ++} + + /** + * udev_hwdb_new: +@@ -282,7 +301,12 @@ _public_ struct udev_hwdb *udev_hwdb_new(struct udev *udev) { + udev_list_init(udev, &hwdb->properties_list, true); + + /* find hwdb.bin in hwdb_bin_paths */ +- NULSTR_FOREACH(hwdb_bin_path, hwdb_bin_paths) { ++ hwdb->bin_paths = get_hwdb_bin_paths(); ++ if (hwdb->bin_paths == NULL) { ++ udev_hwdb_unref(hwdb); ++ return NULL; ++ } ++ NULSTR_FOREACH(hwdb_bin_path, hwdb->bin_paths) { + hwdb->f = fopen(hwdb_bin_path, "re"); + if (hwdb->f) + break; +@@ -363,6 +387,7 @@ _public_ struct udev_hwdb *udev_hwdb_unref(struct udev_hwdb *hwdb) { + return NULL; + if (hwdb->map) + munmap((void *)hwdb->map, hwdb->st.st_size); ++ free(hwdb->bin_paths); + if (hwdb->f) + fclose(hwdb->f); + udev_list_cleanup(&hwdb->properties_list); +@@ -381,7 +406,7 @@ bool udev_hwdb_validate(struct udev_hwdb *hwdb) { + return false; + + /* if hwdb.bin doesn't exist anywhere, we need to update */ +- NULSTR_FOREACH(p, hwdb_bin_paths) { ++ NULSTR_FOREACH(p, hwdb->bin_paths) { + if (stat(p, &st) >= 0) { + found = true; + break; +diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h +index 8491d2b81..e4bc18970 100644 +--- a/src/libudev/libudev.h ++++ b/src/libudev/libudev.h +@@ -185,7 +185,9 @@ struct udev_list_entry *udev_queue_get_queued_list_entry(struct udev_queue *udev + /* + * udev_hwdb + * +- * access to the static hardware properties database ++ * access to the static hardware properties database; the database to ++ * use can be overriden by setting the UDEV_HWDB_BIN environment ++ * variable to its file name + */ + struct udev_hwdb; + struct udev_hwdb *udev_hwdb_new(struct udev *udev); +diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c +index d14a3434f..c2214dc91 100644 +--- a/src/udev/udevadm-hwdb.c ++++ b/src/udev/udevadm-hwdb.c +@@ -35,11 +35,69 @@ + * Uses a Patricia/radix trie to index all matches for efficient lookup. + */ + +-static const char * const conf_file_dirs[] = { +- UDEV_HWDB_DIR, +- UDEV_LIBEXEC_DIR "/hwdb.d", +- NULL +-}; ++static ssize_t follow_path (const char *path_variable, char **destination, size_t max) { ++ size_t n = 0; ++ if (path_variable != NULL) { ++ while (path_variable[0] == ':') { ++ path_variable++; ++ } ++ while (path_variable[0] != '\0') { ++ const char *end = strchr(path_variable, ':'); ++ if (end == NULL) { ++ end = path_variable + strlen(path_variable); ++ } ++ if (n < max) { ++ destination[n] = strndup(path_variable, end - path_variable); ++ if (destination[n] == NULL) { ++ return -ENOMEM; ++ } ++ } ++ n++; ++ path_variable = end; ++ while (path_variable[0] == ':') { ++ path_variable++; ++ } ++ } ++ } ++ if (n < max) { ++ destination[n] = NULL; ++ } ++ return n; ++} ++ ++static char ** list_conf_file_dirs (void) { ++ static const char *main_hwdb_dir = UDEV_HWDB_DIR; ++ static const char *libexec_dir = UDEV_LIBEXEC_DIR "/hwdb.d"; ++ const char *path_variable = getenv ("UDEV_HWDB_PATH"); ++ ssize_t path_length = 0; ++ if (path_variable != NULL) { ++ path_length = follow_path(path_variable, NULL, 0); ++ if (path_length < 0) { ++ return NULL; ++ } ++ } ++ char **all_dirs = malloc((path_length + 2 + 1) * sizeof (char *)); ++ if (all_dirs == NULL) { ++ return NULL; ++ } ++ for (ssize_t i = 0; i < path_length + 2 + 1; i++) { ++ all_dirs[i] = NULL; ++ } ++ ssize_t error = follow_path(path_variable, all_dirs, path_length + 1); ++ all_dirs[path_length] = strdup(main_hwdb_dir); ++ all_dirs[path_length + 1] = strdup(libexec_dir); ++ all_dirs[path_length + 2] = NULL; ++ if (error < 0 ++ || all_dirs[path_length] == NULL ++ || all_dirs[path_length + 1] == NULL) { ++ for (ssize_t i = 0; i < path_length + 2 + 1; i++) { ++ free(all_dirs[i]); ++ } ++ free(all_dirs); ++ all_dirs = NULL; ++ } ++ return all_dirs; ++} + + /* in-memory trie objects */ + struct trie { +@@ -564,10 +622,15 @@ static int import_file(struct udev *udev, struct trie *trie, const char *filenam + static void help(void) { + printf("Usage: udevadm hwdb OPTIONS\n" + " -u,--update update the hardware database\n" ++ " -o,--output=.../hwdb.bin generate in .../hwdb.bin instead of /etc/udev/hwdb.bin\n" + " --usr generate in " UDEV_LIBEXEC_DIR " instead of /etc/udev\n" + " -t,--test=MODALIAS query database and print result\n" + " -r,--root=PATH alternative root path in the filesystem\n" +- " -h,--help\n\n"); ++ " -h,--help\n" ++ "\n" ++ "The HWDB is searched in the UDEV_HWDB_PATH search path, " ++ UDEV_HWDB_DIR ", and " UDEV_LIBEXEC_DIR "/hwdb.d.\n" ++ "\n"); + } + + static int adm_hwdb(struct udev *udev, int argc, char *argv[]) { +@@ -578,6 +641,7 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) { + static const struct option options[] = { + { "update", no_argument, NULL, 'u' }, + { "usr", no_argument, NULL, ARG_USR }, ++ { "output", required_argument, NULL, 'o' }, + { "test", required_argument, NULL, 't' }, + { "root", required_argument, NULL, 'r' }, + { "help", no_argument, NULL, 'h' }, +@@ -585,19 +649,37 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) { + }; + const char *test = NULL; + const char *root = ""; +- const char *hwdb_bin_dir = "/etc/udev"; + bool update = false; + struct trie *trie = NULL; + int err, c; + int rc = EXIT_SUCCESS; + +- while ((c = getopt_long(argc, argv, "ut:r:h", options, NULL)) >= 0) ++ _cleanup_free_ char *hwdb_bin = strdup("/etc/udev/hwdb.bin"); ++ if (hwdb_bin == NULL) { ++ rc = EXIT_FAILURE; ++ goto out; ++ } ++ ++ while ((c = getopt_long(argc, argv, "uo:t:r:h", options, NULL)) >= 0) + switch(c) { + case 'u': + update = true; + break; + case ARG_USR: +- hwdb_bin_dir = UDEV_LIBEXEC_DIR; ++ free(hwdb_bin); ++ hwdb_bin = strdup(UDEV_LIBEXEC_DIR "/hwdb.bin"); ++ if (hwdb_bin == NULL) { ++ rc = EXIT_FAILURE; ++ goto out; ++ } ++ break; ++ case 'o': ++ free(hwdb_bin); ++ hwdb_bin = strdup(optarg); ++ if (hwdb_bin == NULL) { ++ rc = EXIT_FAILURE; ++ goto out; ++ } + break; + case 't': + test = optarg; +@@ -619,9 +701,18 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) { + return EXIT_FAILURE; + } + ++ if (root) { ++ char *full_hwdb_bin = strjoin(root, "/", hwdb_bin, NULL); ++ if (full_hwdb_bin == NULL) { ++ rc = EXIT_FAILURE; ++ goto out; ++ } ++ free (hwdb_bin); ++ hwdb_bin = full_hwdb_bin; ++ } ++ + if (update) { + char **files, **f; +- _cleanup_free_ char *hwdb_bin = NULL; + + trie = new0(struct trie, 1); + if (!trie) { +@@ -644,7 +735,20 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) { + } + trie->nodes_count++; + +- err = conf_files_list_strv(&files, ".hwdb", root, conf_file_dirs); ++ char **conf_file_dirs = list_conf_file_dirs (); ++ if (conf_file_dirs == NULL) { ++ rc = EXIT_FAILURE; ++ goto out; ++ } ++ err = conf_files_list_strv(&files, ".hwdb", root, ++ (const char * const*) conf_file_dirs); ++ size_t dir_to_cleanup = 0; ++ for (dir_to_cleanup = 0; ++ conf_file_dirs[dir_to_cleanup] != NULL; ++ dir_to_cleanup++) { ++ free (conf_file_dirs[dir_to_cleanup]); ++ } ++ free (conf_file_dirs); + if (err < 0) { + log_error_errno(err, "failed to enumerate hwdb files: %m"); + rc = EXIT_FAILURE; +@@ -672,7 +776,6 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) { + log_debug("strings dedup'ed: %8zu bytes (%8zu)", + trie->strings->dedup_len, trie->strings->dedup_count); + +- hwdb_bin = strjoin(root, "/", hwdb_bin_dir, "/hwdb.bin", NULL); + if (!hwdb_bin) { + rc = EXIT_FAILURE; + goto out; + +base-commit: 0d86dd9a2a57d5d0809de6395dc36abe515818b5 +-- +2.41.0 + -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 30 10:23:46 2023 Received: (at 66099) by debbugs.gnu.org; 30 Sep 2023 14:23:46 +0000 Received: from localhost ([127.0.0.1]:59606 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmask-0004j5-0f for submit@debbugs.gnu.org; Sat, 30 Sep 2023 10:23:46 -0400 Received: from planete-kraus.eu ([89.234.140.182]:59648) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmasg-0004iu-NH for 66099@debbugs.gnu.org; Sat, 30 Sep 2023 10:23:44 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 88daa405; Sat, 30 Sep 2023 14:23:24 +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:mime-version :content-type:content-transfer-encoding:to:cc; s=albinoniA; bh=5 xVDTvb0aXGsYalLx4lLW7m+XlU=; b=Mr6UhhnV3DLM8c2heh31N1PtI7x+j+HbY NidMbE9tg5ns9UjBSMH1rab1GW3V5xO374zwZpmVsrCM+9ftfdxa8ZDvLM/h0b4U U0GIIlwRifjAKWo/vABBt5S3fafhNGOoC1og19HuzhaGNoHXgnWHyzq/cDJwvuAF dbTZMW6MAEU2hvT/ghDUu6KoouDIediOSJuIrHbx+5rQYPOrxnYmWUplTlgdSsf0 J75WK0mOKD7cJD/VXxqJI68wpiEEgmkYrEUaQIiPROvw+oF5S1jgMhVfadqpP0Kc 4amuQ4JZrdPLyz33DUaTYGL1voMNeJBOz94MF+T5oQT/lUSNZmVUw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id f9f7cca0 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 30 Sep 2023 14:23:24 +0000 (UTC) Message-ID: In-Reply-To: , References: , From: Vivien Kraus Date: Sat, 30 Sep 2023 16:20:14 +0200 Subject: [PATCH gnome-team v3 0/3] Update eudev and upower MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: Liliana Marie Prikler , 66099@debbugs.gnu.org User-Agent: Evolution 3.46.4 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Dear guix, I managed to learn about profile hooks and fix eudev and upower. Now it should work! It is still possible that I missed a few things, as this is the first time I’m writing a profile hook. What do you think? Best regards, Vivien Vivien Kraus (3): gnu: eudev: Update libudev version to 251. gnu: libgudev: Update to 238. gnu: upower: Update to 1.90.2. gnu/local.mk | 3 + gnu/packages/gnome.scm | 42 ++- gnu/packages/linux.scm | 38 ++- gnu/packages/patches/eudev-bump-to-251.patch | 134 ++++++++ .../patches/eudev-hwdb-bin-path.patch | 309 ++++++++++++++++++ gnu/packages/patches/eudev-pr-255.patch | 39 +++ guix/profiles.scm | 29 ++ 7 files changed, 563 insertions(+), 31 deletions(-) create mode 100644 gnu/packages/patches/eudev-bump-to-251.patch create mode 100644 gnu/packages/patches/eudev-hwdb-bin-path.patch create mode 100644 gnu/packages/patches/eudev-pr-255.patch base-commit: b18b2d13488f2a92331ccad2dc8cbb54ee15582f -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 30 10:24:11 2023 Received: (at 66099) by debbugs.gnu.org; 30 Sep 2023 14:24:11 +0000 Received: from localhost ([127.0.0.1]:59610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmat9-0004kJ-Bs for submit@debbugs.gnu.org; Sat, 30 Sep 2023 10:24:11 -0400 Received: from planete-kraus.eu ([89.234.140.182]:42088) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmat7-0004kB-HH for 66099@debbugs.gnu.org; Sat, 30 Sep 2023 10:24:09 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 6b7e260f; Sat, 30 Sep 2023 14:23:53 +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=albinoniA; bh=8IllG/iUYeuMh4Fe17WtACJeN8U=; b=l vUhSF8D5wePXXXo63vrtMRB9ZVXz95ETmtNOBEmJ7bq2bOPJ98FQTTykolNbgwEz 7zczz2U5Yc176L9zEJfTKc2ubry/dEqZYWZg1xRKmA4gr5J/G0/CWdl7kVH9q49y XiMUe2kxAOoHFA7Ug6Z0H+NlADqVQbTKwuoPJwyPp6NwJK/kxpt4prQh9aj/29+y 2Bt+eDnlt7WSOnbi6FgQxNPmv5qF/QzzTCFhL/TQMFi+0G5s1bE2ehHMUm1wfjGg O+CphwgFVOuUqzg6M0jTy4nI8Q+zJHui/sH+GQBAbADmAKDEipqmsvo7QXaAvnee tD/lxI9UI8RY33wSX4Jqg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 3a054814 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 30 Sep 2023 14:23:53 +0000 (UTC) Message-ID: <2bfee11ea66c2005e76523654dc5c92b2974cfd1.1696083614.git.vivien@planete-kraus.eu> In-Reply-To: References: , From: Vivien Kraus Date: Tue, 19 Sep 2023 13:32:26 +0200 Subject: [PATCH gnome-team v3 2/3] gnu: libgudev: Update to 238. To: Liliana Marie Prikler , 66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ea3dc455a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-pl [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ea3dc455a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-pl [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ea3dc455a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-plugins (define-public libgudev (package (name "libgudev") - (version "236") + (version "238") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "094mgjmwgsgqrr1i0vd20ynvlkihvs3vgbmpbrhswjsrdp86j0z5")))) + "1laxgdkgmr30aw44sm4rgpsdybwxx5rszcm8c2y3vmy9myqnl9k1")))) (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 30 10:24:20 2023 Received: (at 66099) by debbugs.gnu.org; 30 Sep 2023 14:24:20 +0000 Received: from localhost ([127.0.0.1]:59614 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmatG-0004km-Jw for submit@debbugs.gnu.org; Sat, 30 Sep 2023 10:24:20 -0400 Received: from planete-kraus.eu ([89.234.140.182]:42088) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmatB-0004kB-1u for 66099@debbugs.gnu.org; Sat, 30 Sep 2023 10:24:14 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id a8625675; Sat, 30 Sep 2023 14:23:56 +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=albinoniA; bh=yasrfNluVUMgJm0+51i4Ekbi5aM=; b=d wFoDw+vVOf2Rs2QvhAl7hZ6CEVL3FnhLy+dqeaSHoRCfdwQ2ysntxuY6PtmTUtnK G427LqJ/YpZpv/P0lP/bV7KRNeXukwbfuNjJNK/7RJaErnWscKc3S/qTozMLch9b jHoCGtAkl8P2rucpEkQkmg0NPTNYHzaa9ev4rgEOLNxdJ6hsIVRwzYMCBOGF075W +W1xTOcsurIVM9tDt4tyHIZl+FrrLBcEP0yEQnljQnJQQPv4CWGAraB4XjUgy19V Dinso6kHiJ2bPcn5exndh8gprIFbiabmLlAl/Xf3MIO3VlVV5W4rnHmvlJcHva6y Ep69nmvj3fgzhoVqLq+pg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id ab8b6bd9 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 30 Sep 2023 14:23:55 +0000 (UTC) Message-ID: In-Reply-To: References: , From: Vivien Kraus Date: Tue, 19 Sep 2023 13:23:22 +0200 Subject: [PATCH gnome-team v3 1/3] gnu: eudev: Update libudev version to 251. To: Liliana Marie Prikler , 66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Support for version 251 is only provided as a merge request for now: https://github.com/eudev-project/eudev/pull/253 This merge request bumps the eudev version to 3.2.14, but it has not been released yet. Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Support for version 251 is only provided as a merge request for now: https://github.com/eudev-project/eudev/pull/253 This merge request bumps the eudev version to 3.2.14, but it has not been released yet. Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Support for version 251 is only provided as a merge request for now: https://github.com/eudev-project/eudev/pull/253 This merge request bumps the eudev version to 3.2.14, but it has not been released yet. Eudev now has a hardware database that installs descriptions of hardware in /etc, but they should go to /lib prior to being used. I added a phase to copy all the /etc files to /lib. I submitted 3 patches to make udev hwdb more guix-friendly, fused in eudev-hwdb-bin-path.patch. libudev requires an indexed binary file that knows about all devices, and this file is generated by udevadm hwdb --update -o /lib/udev/hwdb.bin. This udevadm hwdb command respects the UDEV_HWDB_PATH to collect all entries for the hwdb. Then, libudev can use UDEV_HWDB_BIN to select the database at run-time. Another unreleased patch for PR 255 is also included. I think everything could work out for Guix if we add a new profile hook that: 1. Calls udevadm hwdb --update -o /lib/udev/hwdb.bin; 2. Set UDEV_HWDB_BIN to /lib/udev/hwdb.bin. This is why there are actually 2 search paths: one for UDEV_HWDB_PATH, and one for UDEV_HWDB_BIN (the latter accepting only 1 value). * gnu/packages/linux.scm (eudev): Update to v3.2.12, but bump version to 3.2.14.beta. [#:phases] : New phase. : Update accordingly. [native-search-paths]: Add UDEV_HWDB_PATH. * gnu/packages/patches/eudev-bump-to-251.patch: New file. * gnu/packages/patches/eudev-hwdb-bin-path.patch: New file. * gnu/packages/patches/eudev-pr-255.patch: New file. * gnu/packages/linux.scm (eudev): Use them here. * gnu/local.mk (dist_patch_DATA): Register them here. * guix/profiles.scm (udev-hwdb-bin): New profile hook to generate hwdb.bin. (%default-profile-hooks): Register it here. --- gnu/local.mk | 3 + gnu/packages/linux.scm | 38 ++- gnu/packages/patches/eudev-bump-to-251.patch | 134 ++++++++ .../patches/eudev-hwdb-bin-path.patch | 309 ++++++++++++++++++ gnu/packages/patches/eudev-pr-255.patch | 39 +++ guix/profiles.scm | 29 ++ 6 files changed, 538 insertions(+), 14 deletions(-) create mode 100644 gnu/packages/patches/eudev-bump-to-251.patch create mode 100644 gnu/packages/patches/eudev-hwdb-bin-path.patch create mode 100644 gnu/packages/patches/eudev-pr-255.patch diff --git a/gnu/local.mk b/gnu/local.mk index 72c9954492..6efe1944e7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1127,6 +1127,9 @@ dist_patch_DATA = \ %D%/packages/patches/esmini-use-pkgconfig.patch \ %D%/packages/patches/esmtp-add-lesmtp.patch \ %D%/packages/patches/eudev-rules-directory.patch \ + %D%/packages/patches/eudev-bump-to-251.patch \ + %D%/packages/patches/eudev-hwdb-bin-path.patch \ + %D%/packages/patches/eudev-pr-255.patch \ %D%/packages/patches/exercism-disable-self-update.patch \ %D%/packages/patches/extempore-unbundle-external-dependencies.patch \ %D%/packages/patches/extundelete-e2fsprogs-1.44.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 85e3d9845d..7b69ad7466 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4265,16 +4265,19 @@ (define-public eudev ;; The post-systemd fork, maintained by Gentoo. (package (name "eudev") - (version "3.2.11") + (version "3.2.14.beta") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/gentoo/eudev") - (commit (string-append "v" version)))) + (commit "v3.2.12"))) (file-name (git-file-name name version)) (sha256 (base32 - "0dzaqwjnl55f69ird57wb6skahc6l7zs1slsrzqqfhww33icp6av")) - (patches (search-patches "eudev-rules-directory.patch")))) + "0wpckjxzsb4wkj3pwnw14zmp3z8ivf03hjbgs838q5gfridpxnf7")) + (patches (search-patches "eudev-rules-directory.patch" + "eudev-bump-to-251.patch" + "eudev-hwdb-bin-path.patch" + "eudev-pr-255.patch")))) (build-system gnu-build-system) (arguments (list @@ -4297,18 +4300,25 @@ (define-public eudev (substitute* (string-append #$output "/lib/libudev.la") (("old_library=.*") "old_library=''\n"))))) - (add-after 'install 'build-hwdb + (add-after 'install 'allow-eudev-hwdb (lambda _ - ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and - ;; similar tools to display product names. - ;; - ;; XXX: This can't be done when cross-compiling. Find another way - ;; to generate hwdb.bin for cross-built systems. - #$@(if (%current-target-system) - #~(#t) - #~((invoke (string-append #$output "/bin/udevadm") - "hwdb" "--update")))))) + ;; eudev distributes the hwdb, but each file has to be enabled + ;; by being copied under /lib/udev/hwdb.d. We accept all of + ;; them. + (symlink (string-append #$output "/etc/udev/hwdb.d") + (string-append #$output "/lib/udev/hwdb.d"))))) #:configure-flags #~(list "--enable-manpages"))) + (native-search-paths + (list (search-path-specification + (variable "UDEV_HWDB_PATH") + (files '("lib/udev/hwdb.d"))) + ;; Never install a hwdb.bin file, always let the udev-hwdb-bin + ;; profile hook generate it. + (search-path-specification + (variable "UDEV_HWDB_BIN") + (files '("lib/udev/hwdb.bin")) + (file-type 'regular) + (separator #f)))) (native-inputs (list autoconf automake diff --git a/gnu/packages/patches/eudev-bump-to-251.patch b/gnu/packages/patches/eudev-bump-to-251.patch new file mode 100644 index 0000000000..96a73f4ede --- /dev/null +++ b/gnu/packages/patches/eudev-bump-to-251.patch @@ -0,0 +1,134 @@ +From 4d29151078c351569767dfef490a29e379afd430 Mon Sep 17 00:00:00 2001 +Message-ID: <4d29151078c351569767dfef490a29e379afd430.1695104483.git.vivien@planete-kraus.eu> +In-Reply-To: +References: +From: Boian Bonev +Date: Tue, 30 May 2023 16:16:33 +0000 +Subject: [PATCH 1/1] Update as per IRC discussion + +Bump udev version to 251 + +Export dummies for + + - udev_device_has_current_tag + - udev_device_get_current_tags_list_entry + +since the current eudev device database does not support the concept of +current tags + +bump version to 3.2.14 +--- + README.md | 18 ++++++++++++------ + configure.ac | 4 ++-- + src/libudev/libudev-device.c | 11 +++++++++++ + src/libudev/libudev.h | 2 ++ + src/libudev/libudev.sym | 6 ++++++ + 5 files changed, 33 insertions(+), 8 deletions(-) + +diff --git a/README.md b/README.md +index 848ef3348..6016380ba 100644 +--- a/README.md ++++ b/README.md +@@ -1,11 +1,17 @@ +-This git repo is a fork of git://anongit.freedesktop.org/systemd/systemd +-with the aim of isolating udev from any particular flavor of system +-initialization. In this case, the isolation is from systemd. ++**eudev** is a standalone dynamic and persistent device naming support (aka ++userspace devfs) daemon that runs independently from the init system. ++**eudev** strives to remain init system and linux distribution neutral. It is ++currently used as the devfs manager for more than a dozen different linux ++distributions. ++ ++This git repo is a fork of git://anongit.freedesktop.org/systemd/systemd with ++the aim of isolating udev from any particular flavor of system initialization. ++In this case, the isolation is from systemd. + + This is a project started by Gentoo developers and testing was initially being +-done mostly on OpenRC. We welcome contribution from others using a variety of +-system initializations to ensure eudev remains system initialization and +-distribution neutral. On 2021-08-20 Gentoo decided to abandon eudev and a new ++done mostly on OpenRC. We welcome contribution from others using a variety of ++system initializations to ensure **eudev** remains system initialization and ++distribution neutral. On 2021-08-20 Gentoo decided to abandon eudev and a new + project was established on 2021-09-14 by Alpine, Devuan and Gentoo + contributors (alphabetical order). + +diff --git a/configure.ac b/configure.ac +index 3e31b0ebc..0d9a135bc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,6 +1,6 @@ + AC_PREREQ([2.68]) +-AC_INIT([eudev],[3.2.12],[https://github.com/gentoo/eudev/issues]) +-AC_SUBST(UDEV_VERSION, 243) ++AC_INIT([eudev],[3.2.14],[https://github.com/gentoo/eudev/issues]) ++AC_SUBST(UDEV_VERSION, 251) + AC_CONFIG_SRCDIR([src/udev/udevd.c]) + + AC_USE_SYSTEM_EXTENSIONS +diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c +index ac67ce846..7d7a6622e 100644 +--- a/src/libudev/libudev-device.c ++++ b/src/libudev/libudev-device.c +@@ -1819,6 +1819,12 @@ _public_ struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_dev + return udev_list_get_entry(&udev_device->tags_list); + } + ++_public_ struct udev_list_entry *udev_device_get_current_tags_list_entry(struct udev_device *udev_device) ++{ ++ // TODO: eudev database does not support current tags ++ return udev_device_get_tags_list_entry(udev_device); ++} ++ + /** + * udev_device_has_tag: + * @udev_device: udev device +@@ -1842,6 +1848,11 @@ _public_ int udev_device_has_tag(struct udev_device *udev_device, const char *ta + return false; + } + ++_public_ int udev_device_has_current_tag(struct udev_device *udev_device, const char *tag) { ++ // TODO: eudev database does not support current tags ++ return udev_device_has_tag(udev_device, tag); ++} ++ + #define ENVP_SIZE 128 + #define MONITOR_BUF_SIZE 4096 + static int update_envp_monitor_buf(struct udev_device *udev_device) +diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h +index 8491d2b81..0202964d6 100644 +--- a/src/libudev/libudev.h ++++ b/src/libudev/libudev.h +@@ -100,6 +100,7 @@ int udev_device_get_is_initialized(struct udev_device *udev_device); + struct udev_list_entry *udev_device_get_devlinks_list_entry(struct udev_device *udev_device); + struct udev_list_entry *udev_device_get_properties_list_entry(struct udev_device *udev_device); + struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_device *udev_device); ++struct udev_list_entry *udev_device_get_current_tags_list_entry(struct udev_device *udev_device); + struct udev_list_entry *udev_device_get_sysattr_list_entry(struct udev_device *udev_device); + const char *udev_device_get_property_value(struct udev_device *udev_device, const char *key); + const char *udev_device_get_driver(struct udev_device *udev_device); +@@ -110,6 +111,7 @@ unsigned long long int udev_device_get_usec_since_initialized(struct udev_device + const char *udev_device_get_sysattr_value(struct udev_device *udev_device, const char *sysattr); + int udev_device_set_sysattr_value(struct udev_device *udev_device, const char *sysattr, char *value); + int udev_device_has_tag(struct udev_device *udev_device, const char *tag); ++int udev_device_has_current_tag(struct udev_device *udev_device, const char *tag); + + /* + * udev_monitor +diff --git a/src/libudev/libudev.sym b/src/libudev/libudev.sym +index 76726fca7..d56c2aeab 100644 +--- a/src/libudev/libudev.sym ++++ b/src/libudev/libudev.sym +@@ -118,3 +118,9 @@ global: + udev_queue_flush; + udev_queue_get_fd; + } LIBUDEV_199; ++ ++LIBUDEV_247 { ++global: ++ udev_device_has_current_tag; ++ udev_device_get_current_tags_list_entry; ++} LIBUDEV_215; +-- +2.41.0 + diff --git a/gnu/packages/patches/eudev-hwdb-bin-path.patch b/gnu/packages/patches/eudev-hwdb-bin-path.patch new file mode 100644 index 0000000000..f6fa91dad0 --- /dev/null +++ b/gnu/packages/patches/eudev-hwdb-bin-path.patch @@ -0,0 +1,309 @@ +From 097290727d6e16aa2e5859e3cd6f0c5ea4c47101 Mon Sep 17 00:00:00 2001 +Message-ID: <097290727d6e16aa2e5859e3cd6f0c5ea4c47101.1696060300.git.vivien@planete-kraus.eu> +From: Vivien Kraus +Date: Tue, 26 Sep 2023 18:17:34 +0200 +Subject: [PATCH] Improvements for Guix + +--- +This is the combination of: + + - https://github.com/eudev-project/eudev/pull/262 + - https://github.com/eudev-project/eudev/pull/263 + - https://github.com/eudev-project/eudev/pull/264 + + src/libudev/libudev-hwdb.c | 37 +++++++++-- + src/libudev/libudev.h | 4 +- + src/udev/udevadm-hwdb.c | 127 +++++++++++++++++++++++++++++++++---- + 3 files changed, 149 insertions(+), 19 deletions(-) + +diff --git a/src/libudev/libudev-hwdb.c b/src/libudev/libudev-hwdb.c +index 62029e2b2..f7212c519 100644 +--- a/src/libudev/libudev-hwdb.c ++++ b/src/libudev/libudev-hwdb.c +@@ -47,6 +47,7 @@ struct udev_hwdb { + struct udev *udev; + int refcount; + ++ char *bin_paths; + FILE *f; + struct stat st; + union { +@@ -256,10 +257,28 @@ static int trie_search_f(struct udev_hwdb *hwdb, const char *search) { + return 0; + } + +-static const char hwdb_bin_paths[] = +- "/etc/udev/hwdb.bin\0" +- UDEV_LIBEXEC_DIR "/hwdb.bin\0"; +- ++static char *get_hwdb_bin_paths (void) { ++ static const char default_locations[] = ++ "/etc/udev/hwdb.bin\0" ++ UDEV_LIBEXEC_DIR "/hwdb.bin\0"; ++ const char *by_env = getenv("UDEV_HWDB_BIN"); ++ if (by_env != NULL) { ++ char *path = malloc(strlen(by_env) + 1 ++ + sizeof (default_locations)); ++ if (path != NULL) { ++ memcpy(path, by_env, strlen(by_env) + 1); ++ memcpy(path + strlen(by_env) + 1, ++ default_locations, ++ sizeof (default_locations)); ++ } ++ return path; ++ } ++ char *path = malloc(sizeof (default_locations)); ++ if (path != NULL) { ++ memcpy(path, default_locations, sizeof (default_locations)); ++ } ++ return path; ++} + + /** + * udev_hwdb_new: +@@ -282,7 +301,12 @@ _public_ struct udev_hwdb *udev_hwdb_new(struct udev *udev) { + udev_list_init(udev, &hwdb->properties_list, true); + + /* find hwdb.bin in hwdb_bin_paths */ +- NULSTR_FOREACH(hwdb_bin_path, hwdb_bin_paths) { ++ hwdb->bin_paths = get_hwdb_bin_paths(); ++ if (hwdb->bin_paths == NULL) { ++ udev_hwdb_unref(hwdb); ++ return NULL; ++ } ++ NULSTR_FOREACH(hwdb_bin_path, hwdb->bin_paths) { + hwdb->f = fopen(hwdb_bin_path, "re"); + if (hwdb->f) + break; +@@ -363,6 +387,7 @@ _public_ struct udev_hwdb *udev_hwdb_unref(struct udev_hwdb *hwdb) { + return NULL; + if (hwdb->map) + munmap((void *)hwdb->map, hwdb->st.st_size); ++ free(hwdb->bin_paths); + if (hwdb->f) + fclose(hwdb->f); + udev_list_cleanup(&hwdb->properties_list); +@@ -381,7 +406,7 @@ bool udev_hwdb_validate(struct udev_hwdb *hwdb) { + return false; + + /* if hwdb.bin doesn't exist anywhere, we need to update */ +- NULSTR_FOREACH(p, hwdb_bin_paths) { ++ NULSTR_FOREACH(p, hwdb->bin_paths) { + if (stat(p, &st) >= 0) { + found = true; + break; +diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h +index 8491d2b81..e4bc18970 100644 +--- a/src/libudev/libudev.h ++++ b/src/libudev/libudev.h +@@ -185,7 +185,9 @@ struct udev_list_entry *udev_queue_get_queued_list_entry(struct udev_queue *udev + /* + * udev_hwdb + * +- * access to the static hardware properties database ++ * access to the static hardware properties database; the database to ++ * use can be overriden by setting the UDEV_HWDB_BIN environment ++ * variable to its file name + */ + struct udev_hwdb; + struct udev_hwdb *udev_hwdb_new(struct udev *udev); +diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c +index d14a3434f..c2214dc91 100644 +--- a/src/udev/udevadm-hwdb.c ++++ b/src/udev/udevadm-hwdb.c +@@ -35,11 +35,69 @@ + * Uses a Patricia/radix trie to index all matches for efficient lookup. + */ + +-static const char * const conf_file_dirs[] = { +- UDEV_HWDB_DIR, +- UDEV_LIBEXEC_DIR "/hwdb.d", +- NULL +-}; ++static ssize_t follow_path (const char *path_variable, char **destination, size_t max) { ++ size_t n = 0; ++ if (path_variable != NULL) { ++ while (path_variable[0] == ':') { ++ path_variable++; ++ } ++ while (path_variable[0] != '\0') { ++ const char *end = strchr(path_variable, ':'); ++ if (end == NULL) { ++ end = path_variable + strlen(path_variable); ++ } ++ if (n < max) { ++ destination[n] = strndup(path_variable, end - path_variable); ++ if (destination[n] == NULL) { ++ return -ENOMEM; ++ } ++ } ++ n++; ++ path_variable = end; ++ while (path_variable[0] == ':') { ++ path_variable++; ++ } ++ } ++ } ++ if (n < max) { ++ destination[n] = NULL; ++ } ++ return n; ++} ++ ++static char ** list_conf_file_dirs (void) { ++ static const char *main_hwdb_dir = UDEV_HWDB_DIR; ++ static const char *libexec_dir = UDEV_LIBEXEC_DIR "/hwdb.d"; ++ const char *path_variable = getenv ("UDEV_HWDB_PATH"); ++ ssize_t path_length = 0; ++ if (path_variable != NULL) { ++ path_length = follow_path(path_variable, NULL, 0); ++ if (path_length < 0) { ++ return NULL; ++ } ++ } ++ char **all_dirs = malloc((path_length + 2 + 1) * sizeof (char *)); ++ if (all_dirs == NULL) { ++ return NULL; ++ } ++ for (ssize_t i = 0; i < path_length + 2 + 1; i++) { ++ all_dirs[i] = NULL; ++ } ++ ssize_t error = follow_path(path_variable, all_dirs, path_length + 1); ++ all_dirs[path_length] = strdup(main_hwdb_dir); ++ all_dirs[path_length + 1] = strdup(libexec_dir); ++ all_dirs[path_length + 2] = NULL; ++ if (error < 0 ++ || all_dirs[path_length] == NULL ++ || all_dirs[path_length + 1] == NULL) { ++ for (ssize_t i = 0; i < path_length + 2 + 1; i++) { ++ free(all_dirs[i]); ++ } ++ free(all_dirs); ++ all_dirs = NULL; ++ } ++ return all_dirs; ++} + + /* in-memory trie objects */ + struct trie { +@@ -564,10 +622,15 @@ static int import_file(struct udev *udev, struct trie *trie, const char *filenam + static void help(void) { + printf("Usage: udevadm hwdb OPTIONS\n" + " -u,--update update the hardware database\n" ++ " -o,--output=.../hwdb.bin generate in .../hwdb.bin instead of /etc/udev/hwdb.bin\n" + " --usr generate in " UDEV_LIBEXEC_DIR " instead of /etc/udev\n" + " -t,--test=MODALIAS query database and print result\n" + " -r,--root=PATH alternative root path in the filesystem\n" +- " -h,--help\n\n"); ++ " -h,--help\n" ++ "\n" ++ "The HWDB is searched in the UDEV_HWDB_PATH search path, " ++ UDEV_HWDB_DIR ", and " UDEV_LIBEXEC_DIR "/hwdb.d.\n" ++ "\n"); + } + + static int adm_hwdb(struct udev *udev, int argc, char *argv[]) { +@@ -578,6 +641,7 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) { + static const struct option options[] = { + { "update", no_argument, NULL, 'u' }, + { "usr", no_argument, NULL, ARG_USR }, ++ { "output", required_argument, NULL, 'o' }, + { "test", required_argument, NULL, 't' }, + { "root", required_argument, NULL, 'r' }, + { "help", no_argument, NULL, 'h' }, +@@ -585,19 +649,37 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) { + }; + const char *test = NULL; + const char *root = ""; +- const char *hwdb_bin_dir = "/etc/udev"; + bool update = false; + struct trie *trie = NULL; + int err, c; + int rc = EXIT_SUCCESS; + +- while ((c = getopt_long(argc, argv, "ut:r:h", options, NULL)) >= 0) ++ _cleanup_free_ char *hwdb_bin = strdup("/etc/udev/hwdb.bin"); ++ if (hwdb_bin == NULL) { ++ rc = EXIT_FAILURE; ++ goto out; ++ } ++ ++ while ((c = getopt_long(argc, argv, "uo:t:r:h", options, NULL)) >= 0) + switch(c) { + case 'u': + update = true; + break; + case ARG_USR: +- hwdb_bin_dir = UDEV_LIBEXEC_DIR; ++ free(hwdb_bin); ++ hwdb_bin = strdup(UDEV_LIBEXEC_DIR "/hwdb.bin"); ++ if (hwdb_bin == NULL) { ++ rc = EXIT_FAILURE; ++ goto out; ++ } ++ break; ++ case 'o': ++ free(hwdb_bin); ++ hwdb_bin = strdup(optarg); ++ if (hwdb_bin == NULL) { ++ rc = EXIT_FAILURE; ++ goto out; ++ } + break; + case 't': + test = optarg; +@@ -619,9 +701,18 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) { + return EXIT_FAILURE; + } + ++ if (root) { ++ char *full_hwdb_bin = strjoin(root, "/", hwdb_bin, NULL); ++ if (full_hwdb_bin == NULL) { ++ rc = EXIT_FAILURE; ++ goto out; ++ } ++ free (hwdb_bin); ++ hwdb_bin = full_hwdb_bin; ++ } ++ + if (update) { + char **files, **f; +- _cleanup_free_ char *hwdb_bin = NULL; + + trie = new0(struct trie, 1); + if (!trie) { +@@ -644,7 +735,20 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) { + } + trie->nodes_count++; + +- err = conf_files_list_strv(&files, ".hwdb", root, conf_file_dirs); ++ char **conf_file_dirs = list_conf_file_dirs (); ++ if (conf_file_dirs == NULL) { ++ rc = EXIT_FAILURE; ++ goto out; ++ } ++ err = conf_files_list_strv(&files, ".hwdb", root, ++ (const char * const*) conf_file_dirs); ++ size_t dir_to_cleanup = 0; ++ for (dir_to_cleanup = 0; ++ conf_file_dirs[dir_to_cleanup] != NULL; ++ dir_to_cleanup++) { ++ free (conf_file_dirs[dir_to_cleanup]); ++ } ++ free (conf_file_dirs); + if (err < 0) { + log_error_errno(err, "failed to enumerate hwdb files: %m"); + rc = EXIT_FAILURE; +@@ -672,7 +776,6 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) { + log_debug("strings dedup'ed: %8zu bytes (%8zu)", + trie->strings->dedup_len, trie->strings->dedup_count); + +- hwdb_bin = strjoin(root, "/", hwdb_bin_dir, "/hwdb.bin", NULL); + if (!hwdb_bin) { + rc = EXIT_FAILURE; + goto out; + +base-commit: 0d86dd9a2a57d5d0809de6395dc36abe515818b5 +-- +2.41.0 + diff --git a/gnu/packages/patches/eudev-pr-255.patch b/gnu/packages/patches/eudev-pr-255.patch new file mode 100644 index 0000000000..505a5e7074 --- /dev/null +++ b/gnu/packages/patches/eudev-pr-255.patch @@ -0,0 +1,39 @@ +From b9cc389aabf14379685e4582c3275c23f5a9d0bc Mon Sep 17 00:00:00 2001 +Message-ID: +From: NaofumiHonda +Date: Tue, 22 Aug 2023 00:17:45 +0900 +Subject: [PATCH] Clear sysattr cache if a null pointer is passed (#255) + +* Clear sysattr cache if a null pointer is passed + +* remove tabs +--- + src/libudev/libudev-device.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c +index ac67ce846..d6bc4032a 100644 +--- a/src/libudev/libudev-device.c ++++ b/src/libudev/libudev-device.c +@@ -1557,9 +1557,15 @@ _public_ int udev_device_set_sysattr_value(struct udev_device *udev_device, cons + dev = udev_device; + if (sysattr == NULL) + return -EINVAL; +- if (value == NULL) +- value_len = 0; +- else ++ if (value == NULL) { ++ struct udev_list_entry *list_entry; ++ ++ list_entry = udev_list_get_entry(&udev_device->sysattr_value_list); ++ list_entry = udev_list_entry_get_by_name(list_entry, sysattr); ++ if (list_entry != NULL) ++ udev_list_entry_delete(list_entry); ++ goto out; ++ } else + value_len = strlen(value); + + strscpyl(path, sizeof(path), udev_device_get_syspath(dev), "/", sysattr, NULL); +-- +2.41.0 + diff --git a/guix/profiles.scm b/guix/profiles.scm index c88672c25a..d308e7fb88 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1905,6 +1905,34 @@ (define (texlive-font-maps manifest) (hook . texlive-font-maps))) (return #f)))) +(define (udev-hwdb-bin manifest) + "Return a derivation that builds lib/udev/hwdb.bin." + (define eudev + (module-ref (resolve-interface '(gnu packages linux)) 'eudev)) + (define build + (with-imported-modules + (source-module-closure '((guix build utils))) + #~(begin + (use-modules (guix build utils)) + (let* ((inputs '#$(manifest-inputs manifest)) + (hwdb-directories + (filter + file-exists? + (map (lambda (directory) + (string-append directory "/lib/udev/hwdb.d")) + inputs)))) + (setenv "UDEV_HWDB_PATH" + (string-join hwdb-directories ":"))) + (invoke #$(file-append eudev "/bin/udevadm") + "hwdb" "--update" + "-o" (string-append #$output "/lib/udev/hwdb.bin"))))) + (gexp->derivation "udev-hwdb-bin" build + #:substitutable? #f + #:local-build? #t + #:properties + `((type . profile-hook) + (hook . udev-hwdb-bin)))) + (define %default-profile-hooks ;; This is the list of derivation-returning procedures that are called by ;; default when making a non-empty profile. @@ -1919,6 +1947,7 @@ (define %default-profile-hooks gtk-icon-themes gtk-im-modules texlive-font-maps + udev-hwdb-bin xdg-desktop-database xdg-mime-database)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 30 10:24:20 2023 Received: (at 66099) by debbugs.gnu.org; 30 Sep 2023 14:24:20 +0000 Received: from localhost ([127.0.0.1]:59616 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmatI-0004kr-3k for submit@debbugs.gnu.org; Sat, 30 Sep 2023 10:24:20 -0400 Received: from planete-kraus.eu ([89.234.140.182]:42088) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmatD-0004kB-BO for 66099@debbugs.gnu.org; Sat, 30 Sep 2023 10:24:15 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 1fcf6b8d; Sat, 30 Sep 2023 14:23:59 +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:mime-version :content-type:content-transfer-encoding:to:cc; s=albinoniA; bh=R doyfZW9C24IvHXLgbzW4siEHvA=; b=fGymF4fI96RBul03JygVfCzNPgo6b6EVz NWiLFZk8ACGnWeuNX5gTpaskKiPhxxD+5YBn/1IZ2JG8dNCvPesHdMHDuQbs5yYA Hc+0ME01Pau0hK04QZ1HaUD01PLV1oF09DLKlFPdX0cva4U2sQdar8GHkOxeK0qa vp7KW3mD8lumEFQ+A+v6YtIBE1e6+P4PdJqXp5iRUOlA0u21PiNh1ZMSkM8rfDcW n4G59Lc+y4M53mDZ7DM5bH2/iUFIszEO/t2KunrBBb05B3BL3DqIDp1Nw8PR6z5q k2I+WtWwHdmLWYSa2oUjYQCYJuSgpq5x80GWkbBOWs1Er5Zpja0lA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id a7baf7ab (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 30 Sep 2023 14:23:58 +0000 (UTC) Message-ID: <30b94b124745c3bbb33fc042e766ce57f1ac8005.1696083614.git.vivien@planete-kraus.eu> In-Reply-To: References: , From: Vivien Kraus Date: Tue, 19 Sep 2023 13:32:46 +0200 Subject: [PATCH gnome-team v3 3/3] gnu: upower: Update to 1.90.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: Liliana Marie Prikler , 66099@debbugs.gnu.org User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The new eudev now can install hwdb files. Upower has some, but they should get installed in upower’s output, not eudev’s. The phases needed a rework. Now the 32-bit-specific test fix is always there, except it may be empty. A test needs to be disabled. Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The new eudev now can install hwdb files. Upower has some, but they should get installed in upower’s output, not eudev’s. The phases needed a rework. Now the 32-bit-specific test fix is always there, except it may be empty. A test needs to be disabled. Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager The new eudev now can install hwdb files. Upower has some, but they should get installed in upower’s output, not eudev’s. The phases needed a rework. Now the 32-bit-specific test fix is always there, except it may be empty. A test needs to be disabled. * gnu/packages/gnome.scm (upower): Update to 1.90.2. [#:configure-flags]: Set udevhwdbdir. [#:phases] : Add this phase unconditionnally : Disable the test. --- gnu/packages/gnome.scm | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4ea3dc455a..76018a4b5e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5727,7 +5727,7 @@ (define-public geocode-glib-with-libsoup2 (define-public upower (package (name "upower") - (version "1.90.0") + (version "1.90.2") (source (origin (method git-fetch) @@ -5736,7 +5736,7 @@ (define-public upower (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1g17rm91p8vfpjyb0k2shylrs55nccn3fa890vlk4n9s71sghbzq")) + (base32 "13xp423ycv8imf2cmgf6lii9f01p7x2v19cny7acrmczkc0cqv7d")) (modules '((guix build utils))) (snippet ;; Upstream commit . - (substitute* "src/linux/integration-test.py" - (("assertEqual(.*)40\\.0" _ middle) - (string-append - "assertAlmostEqual" middle "40.0")))))) - #~%standard-phases))) + (string-append "-Dudevrulesdir=" #$output "/bin/udev/rules.d") + (string-append "-Dudevhwdbdir=" #$output "/lib/udev/hwdb.d")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-failing-test + (lambda _ + ;; This test calls an unimplemented bluez dbus method + (substitute* "src/linux/integration-test.py" + (("test_bluetooth_hidpp_mouse") + "disabled_test_bluetooth_hidpp_mouse")))) + (add-after 'unpack 'adjust-test-for-excess-precision + (lambda _ + #$@(if (target-x86-32?) + ;; Address test failure caused by excess precision + ;; on i686: + ;; . + '((substitute* "src/linux/integration-test.py" + (("assertEqual(.*)40\\.0" _ middle) + (string-append + "assertAlmostEqual" middle "40.0")))) + '(*unspecified*))))))) (native-inputs (list `(,glib "bin") ; for gdbus-codegen gobject-introspection -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 30 14:00:29 2023 Received: (at 66099) by debbugs.gnu.org; 30 Sep 2023 18:00:29 +0000 Received: from localhost ([127.0.0.1]:59729 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmeGT-0005da-DB for submit@debbugs.gnu.org; Sat, 30 Sep 2023 14:00:29 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:55336) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmeGO-0005dE-R4 for 66099@debbugs.gnu.org; Sat, 30 Sep 2023 14:00:27 -0400 Received: by mail-wm1-x342.google.com with SMTP id 5b1f17b1804b1-405361bba99so150313315e9.2 for <66099@debbugs.gnu.org>; Sat, 30 Sep 2023 11:00:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696096803; x=1696701603; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=W18WkK6X6LrBPfL5tz8I7tgMPA0XQLWBs+32i+mpcac=; b=OiNjHMonnjoxmKYW5ITYP3dd04KSormU8SFQrNJEGy+3kMZxa/slXynHvLF3/R5HNJ c+QNKdJMPqhc8Na6ks5pHALZPRuxbClzuV5NnSgvBXa8bZ3qGYB1Cs6itwg24FLMDIlL slA0imEBTw0o7k/G7bPot0n+rJyV33DLxGortVd9JgXWkM83B4bKyXDvP3CFSxNq8RU8 Atl+OYmKXvcvZJ/SXbFjuSrxj92AAnnprMrkUht0wQaRhylCOdsht3QiOaQDfqtV3i3t dV35TpD6NdyASpzq1z82CqjWuaXGRj3s9ZOSiKc/nNM9DpM0XcNhavBR6590X1tIzC0Y q/hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696096803; x=1696701603; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=W18WkK6X6LrBPfL5tz8I7tgMPA0XQLWBs+32i+mpcac=; b=uZhKnKo7ESH4vHpdQa6yc6gn8dYljGFUrc0p9kbENBSW90DWJRyD/4kAg3/EHRUTfN MVo4Zir2lpARx7CHdrMYbKS4gKETC0+O6ZosXp0Hq9DWFRqfto9ZaHNZe+YKs0XpQALB UiayO5konvf3hdqRhN8jmse4E2Mw7Ck3uSQk+29EwvXvYBC7H5n4h6bqlHl+y+680yWS TP7hrsQz5uvqC6P4E4lKpkf8iY8bDcKSMX2rYrxJhUxkYXz48lm/hIFLiXJeW9xtFOy5 aZusXSD1fPe1vWHPjcOonvgz9c0S4I6fOZrk9f9mLExGYbk3xxvKMsTmWlmAXmXf4mUg YvCQ== X-Gm-Message-State: AOJu0Yz8Qqp5kJPnW0DU4hYuQnAxRFF4CV1vWSU5bNqNTJaUuEbUMq+v Hjpg9dtH/WSiegofDEXlX74= X-Google-Smtp-Source: AGHT+IEq9jijJsM3Z7E8XeGrq9BLWA+8MZmNR0jwfRz4nfHdN2Y3NbI+0I1vKnUFZCwTYCNSQaGcuA== X-Received: by 2002:a05:600c:3786:b0:405:3ee3:c69c with SMTP id o6-20020a05600c378600b004053ee3c69cmr6183356wmr.15.1696096802779; Sat, 30 Sep 2023 11:00:02 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id f21-20020a7bcc15000000b00404719b05b5sm3807937wmh.27.2023.09.30.11.00.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Sep 2023 11:00:01 -0700 (PDT) Message-ID: Subject: Re: [PATCH gnome-team v3 1/3] gnu: eudev: Update libudev version to 251. From: Liliana Marie Prikler To: Vivien Kraus , 66099@debbugs.gnu.org Date: Sat, 30 Sep 2023 19:59:58 +0200 In-Reply-To: References: , Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Dienstag, dem 19.09.2023 um 13:23 +0200 schrieb Vivien Kraus: > Support for version 251 is only provided as a merge request for now: >=20 > https://github.com/eudev-project/eudev/pull/253 >=20 > This merge request bumps the eudev version to 3.2.14, but it has not > been released yet. >=20 > Eudev now has a hardware database that installs descriptions of > hardware in /etc, but they should go to /lib prior to being used. I > added a phase to copy all the /etc files to /lib. >=20 > I submitted 3 patches to make udev hwdb more guix-friendly, fused in > eudev-hwdb-bin-path.patch. libudev requires an indexed binary file > that knows about all devices, and this file is generated by udevadm > hwdb --update -o /lib/udev/hwdb.bin. This udevadm hwdb > command respects the UDEV_HWDB_PATH to collect all entries for the > hwdb. Then, libudev can use UDEV_HWDB_BIN to select the database at > run-time. >=20 > Another unreleased patch for PR 255 is also included. >=20 > I think everything could work out for Guix if we add a new profile > hook that: > 1. Calls udevadm hwdb --update -o /lib/udev/hwdb.bin; > 2. Set UDEV_HWDB_BIN to /lib/udev/hwdb.bin. >=20 > This is why there are actually 2 search paths: one for > UDEV_HWDB_PATH, and one for UDEV_HWDB_BIN (the latter accepting only > 1 value). Move personal comments below the --- line, keeping explanations above the ChangeLog. > * gnu/packages/linux.scm (eudev): Update to v3.2.12, but bump version > to 3.2.14.beta. Why not simply use git-version and a commit? Or alternative have v3.2.12 as the version while cherry-picking those commits. > [#:phases] : New phase. > : Update accordingly. > [native-search-paths]: Add UDEV_HWDB_PATH. > * gnu/packages/patches/eudev-bump-to-251.patch: New file. > * gnu/packages/patches/eudev-hwdb-bin-path.patch: New file. > * gnu/packages/patches/eudev-pr-255.patch: New file. You might want to rename these patches to explain what they do in the file name, e.g. "eudev-libudev251-compat.patch". > * gnu/packages/linux.scm (eudev): Use them here. > * gnu/local.mk (dist_patch_DATA): Register them here. > * guix/profiles.scm (udev-hwdb-bin): New profile hook to generate > hwdb.bin. > (%default-profile-hooks): Register it here. Unless it's absolutely required to make use of eudev, you might want to separate this hook into a separate patch. Cheers From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 01 16:25:59 2023 Received: (at 66099) by debbugs.gnu.org; 1 Oct 2023 20:26:00 +0000 Received: from localhost ([127.0.0.1]:35454 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qn30p-00074K-K1 for submit@debbugs.gnu.org; Sun, 01 Oct 2023 16:25:59 -0400 Received: from planete-kraus.eu ([89.234.140.182]:37020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qn30o-000748-2C for 66099@debbugs.gnu.org; Sun, 01 Oct 2023 16:25:59 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 78faf0f7; Sun, 1 Oct 2023 20:25:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:from:date:subject:mime-version:content-type :content-transfer-encoding:to:cc; s=albinoniB; bh=YKX+OgCT8LVxiX dT62NZ2oiM9xk=; b=r1NOWHpwxvQbeQMLpnGFkABsnfVUHRCZKzqT8cvuri3vN4 1Ojy6YsZUF4MauL6KUpy9vfFpM3HZzGnbK7nb4dYg3YIGTBtKFU3/zIHiOUL0QjP Ie6M/ZpATfWuweqErhxawFVXxisHfMd6ctkwF/hCTNl1QytwRnjFZ/imV4EXXh1/ LcAIMZf+f50F2M4eLOvOtntsiSvYYgzmNZRh4T4548hqj5LCyOHpTdXsZs+aVohF pAhMsi+5hYOTkYNDUh5SnMk9QuNfeRU9QM3NriyI0OvFnUdaVhT79W5pNmY+SjIo sYZG+pkpSOYfAABuGkEbp1e7W5c+XaobE7LUSYPg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id d6de781c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 1 Oct 2023 20:25:39 +0000 (UTC) Message-ID: From: Vivien Kraus Date: Sun, 1 Oct 2023 22:20:43 +0200 Subject: [PATCH gnome-team v4 0/4] Update eudev and upower MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: Liliana Marie Prikler , 66099@debbugs.gnu.org User-Agent: Evolution 3.46.4 X-Spam-Score: 1.7 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Dear guix, eudev now has merged the search path support, so I can use an unreleased commit and avoid 2 patch files. I noticed the dbus-glib dependency is unused. Content analysis details: (1.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.7 URIBL_BLACK Contains an URL listed in the URIBL blacklist [URIs: local.mk] X-Debbugs-Envelope-To: 66099 Cc: , rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.7 (/) Dear guix, eudev now has merged the search path support, so I can use an unreleased commit and avoid 2 patch files. I noticed the dbus-glib dependency is unused. Best regards, Vivien Vivien Kraus (4): gnu: eudev: Update libudev version to 251. guix: Add udev-hwdb-bin profile hook. gnu: libgudev: Update to 238. gnu: upower: Update to 1.90.2. gnu/local.mk | 1 + gnu/packages/gnome.scm | 45 ++++--- gnu/packages/linux.scm | 39 ++++--- .../patches/eudev-libudev-251-compat.patch | 110 ++++++++++++++++++ .../patches/eudev-rules-directory.patch | 9 +- guix/profiles.scm | 29 +++++ 6 files changed, 197 insertions(+), 36 deletions(-) create mode 100644 gnu/packages/patches/eudev-libudev-251-compat.patch base-commit: b18b2d13488f2a92331ccad2dc8cbb54ee15582f -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 01 16:26:13 2023 Received: (at 66099) by debbugs.gnu.org; 1 Oct 2023 20:26:13 +0000 Received: from localhost ([127.0.0.1]:35458 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qn312-00075E-WA for submit@debbugs.gnu.org; Sun, 01 Oct 2023 16:26:13 -0400 Received: from planete-kraus.eu ([89.234.140.182]:59580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qn310-000755-Mx for 66099@debbugs.gnu.org; Sun, 01 Oct 2023 16:26:11 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 6fd9a6ca; Sun, 1 Oct 2023 20:25:53 +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=TgpVzCdq0KT8n6nBtrO782p0yhY=; b=J Xg0MpTDft9s1N/+wqLmP5LlnXsi9Bm7EwiiPeQPPIQEvSsFCSpxrYK3H2wlClUpQ /ATnfW4MFjzLN8O3uNg+8Y87WgdrfhPvelNp4g82sXTgAVVU4y09kN0eaqFh68ZS 48DpIGWzvUEOg7LrBcNGqpleMp9/cMLVZuEQi6jf0vlOxUa1rsK2Z3XAAVKXQY+z Becgmfs5htq3hfHhNBaZJ/4Ejzmgxr0ln3E9g3mwEWMwjNe16KICOPKFJOVnu8cs BoCyxaqnoOmVei/5BqJ6oPYqyIDsGmnHld3QI3880DkTRbK+8P4D3l1VwjigfkfM Wi8I4fWlnl7joEbpfL4Wg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 317f163c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 1 Oct 2023 20:25:53 +0000 (UTC) Message-ID: In-Reply-To: References: From: Vivien Kraus Date: Tue, 19 Sep 2023 13:23:22 +0200 Subject: [PATCH gnome-team v4 1/4] gnu: eudev: Update libudev version to 251. To: Liliana Marie Prikler , 66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: 3.8 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Support for version 251 is only provided as a pull request for now: https://github.com/eudev-project/eudev/pull/253 This pull request is included as a patch, without the version bump. Content analysis details: (3.8 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.7 URIBL_BLACK Contains an URL listed in the URIBL blacklist [URIs: local.mk] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-Debbugs-Envelope-To: 66099 Cc: , rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.8 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Support for version 251 is only provided as a pull request for now: https://github.com/eudev-project/eudev/pull/253 This pull request is included as a patch, without the version bump. Content analysis details: (2.8 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.7 URIBL_BLACK Contains an URL listed in the URIBL blacklist [URIs: local.mk] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Support for version 251 is only provided as a pull request for now: https://github.com/eudev-project/eudev/pull/253 This pull request is included as a patch, without the version bump. Eudev now has a hardware database that installs descriptions of hardware in /etc, but they should go to /lib prior to being used. A new phase moves the hwdb files from /etc to /lib. Some commits have been added since 3.2.12, in order to support search paths for udev hwdb, and fixing a regression. * gnu/packages/linux.scm (eudev): Update to a post-v3.2.12 commit. [#:phases] : New phase. : Update accordingly. [native-search-paths]: Add UDEV_HWDB_PATH and UDEV_HWDB_BIN. * gnu/packages/patches/eudev-libudev-251-compat.patch: New file. * gnu/packages/linux.scm (eudev): Use it here. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/patches/eudev-rules-directory.patch: Rebase it. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 39 ++++--- .../patches/eudev-libudev-251-compat.patch | 110 ++++++++++++++++++ .../patches/eudev-rules-directory.patch | 9 +- 4 files changed, 141 insertions(+), 18 deletions(-) create mode 100644 gnu/packages/patches/eudev-libudev-251-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 72c9954492..b9880332f3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1127,6 +1127,7 @@ dist_patch_DATA = \ %D%/packages/patches/esmini-use-pkgconfig.patch \ %D%/packages/patches/esmtp-add-lesmtp.patch \ %D%/packages/patches/eudev-rules-directory.patch \ + %D%/packages/patches/eudev-libudev-251-compat.patch \ %D%/packages/patches/exercism-disable-self-update.patch \ %D%/packages/patches/extempore-unbundle-external-dependencies.patch \ %D%/packages/patches/extundelete-e2fsprogs-1.44.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 85e3d9845d..254cca715e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4263,18 +4263,22 @@ (define-public earlyoom (define-public eudev ;; The post-systemd fork, maintained by Gentoo. + (define commit + "2e4dd05900e7b42d96cd7bdd5689c8ee431fb000") + (define revision "1") (package (name "eudev") - (version "3.2.11") + (version (git-version "3.2.12" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/gentoo/eudev") - (commit (string-append "v" version)))) + (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "0dzaqwjnl55f69ird57wb6skahc6l7zs1slsrzqqfhww33icp6av")) - (patches (search-patches "eudev-rules-directory.patch")))) + "0kl2lmp759wix83pxnax2p9954b6w3j8zqzgxl99nm6brl8cx11i")) + (patches (search-patches "eudev-rules-directory.patch" + "eudev-libudev-251-compat.patch")))) (build-system gnu-build-system) (arguments (list @@ -4297,18 +4301,25 @@ (define-public eudev (substitute* (string-append #$output "/lib/libudev.la") (("old_library=.*") "old_library=''\n"))))) - (add-after 'install 'build-hwdb + (add-after 'install 'allow-eudev-hwdb (lambda _ - ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and - ;; similar tools to display product names. - ;; - ;; XXX: This can't be done when cross-compiling. Find another way - ;; to generate hwdb.bin for cross-built systems. - #$@(if (%current-target-system) - #~(#t) - #~((invoke (string-append #$output "/bin/udevadm") - "hwdb" "--update")))))) + ;; eudev distributes the hwdb, but each file has to be enabled + ;; by being copied under /lib/udev/hwdb.d. We accept all of + ;; them. + (symlink (string-append #$output "/etc/udev/hwdb.d") + (string-append #$output "/lib/udev/hwdb.d"))))) #:configure-flags #~(list "--enable-manpages"))) + (native-search-paths + (list (search-path-specification + (variable "UDEV_HWDB_PATH") + (files '("lib/udev/hwdb.d"))) + ;; Never install a hwdb.bin file, always let the udev-hwdb-bin + ;; profile hook generate it. + (search-path-specification + (variable "UDEV_HWDB_BIN") + (files '("lib/udev/hwdb.bin")) + (file-type 'regular) + (separator #f)))) (native-inputs (list autoconf automake diff --git a/gnu/packages/patches/eudev-libudev-251-compat.patch b/gnu/packages/patches/eudev-libudev-251-compat.patch new file mode 100644 index 0000000000..b24893d79c --- /dev/null +++ b/gnu/packages/patches/eudev-libudev-251-compat.patch @@ -0,0 +1,110 @@ +From ca8607912b6da3ce87ecd8a7209f23840fec5a90 Mon Sep 17 00:00:00 2001 +Message-ID: +From: Vivien Kraus +Date: Sun, 1 Oct 2023 20:40:40 +0200 +Subject: [PATCH] Squashed commit of the following: + +commit dacff83d872c1dcb563439f98c9b974e244fcd46 +Author: Boian Bonev +Date: Fri Aug 11 23:14:02 2023 +0000 + + Export dummies for + + - udev_device_has_current_tag + - udev_device_get_current_tags_list_entry + + since the current eudev device database does not support the concept of + current tags + +commit 7d2123ead5a15d4b2aff70eafc6f7b9b2f6527ac +Author: Boian Bonev +Date: Fri Aug 11 22:08:27 2023 +0000 + + Bump udev version to 251 +--- + configure.ac | 2 +- + src/libudev/libudev-device.c | 11 +++++++++++ + src/libudev/libudev.h | 2 ++ + src/libudev/libudev.sym | 6 ++++++ + 4 files changed, 20 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 3e31b0ebc..069fdfb87 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,6 +1,6 @@ + AC_PREREQ([2.68]) + AC_INIT([eudev],[3.2.12],[https://github.com/gentoo/eudev/issues]) +-AC_SUBST(UDEV_VERSION, 243) ++AC_SUBST(UDEV_VERSION, 251) + AC_CONFIG_SRCDIR([src/udev/udevd.c]) + + AC_USE_SYSTEM_EXTENSIONS +diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c +index d6bc4032a..312d9ee84 100644 +--- a/src/libudev/libudev-device.c ++++ b/src/libudev/libudev-device.c +@@ -1825,6 +1825,12 @@ _public_ struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_dev + return udev_list_get_entry(&udev_device->tags_list); + } + ++_public_ struct udev_list_entry *udev_device_get_current_tags_list_entry(struct udev_device *udev_device) ++{ ++ // TODO: eudev database does not support current tags ++ return udev_device_get_tags_list_entry(udev_device); ++} ++ + /** + * udev_device_has_tag: + * @udev_device: udev device +@@ -1848,6 +1854,11 @@ _public_ int udev_device_has_tag(struct udev_device *udev_device, const char *ta + return false; + } + ++_public_ int udev_device_has_current_tag(struct udev_device *udev_device, const char *tag) { ++ // TODO: eudev database does not support current tags ++ return udev_device_has_tag(udev_device, tag); ++} ++ + #define ENVP_SIZE 128 + #define MONITOR_BUF_SIZE 4096 + static int update_envp_monitor_buf(struct udev_device *udev_device) +diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h +index e4bc18970..62fab107f 100644 +--- a/src/libudev/libudev.h ++++ b/src/libudev/libudev.h +@@ -100,6 +100,7 @@ int udev_device_get_is_initialized(struct udev_device *udev_device); + struct udev_list_entry *udev_device_get_devlinks_list_entry(struct udev_device *udev_device); + struct udev_list_entry *udev_device_get_properties_list_entry(struct udev_device *udev_device); + struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_device *udev_device); ++struct udev_list_entry *udev_device_get_current_tags_list_entry(struct udev_device *udev_device); + struct udev_list_entry *udev_device_get_sysattr_list_entry(struct udev_device *udev_device); + const char *udev_device_get_property_value(struct udev_device *udev_device, const char *key); + const char *udev_device_get_driver(struct udev_device *udev_device); +@@ -110,6 +111,7 @@ unsigned long long int udev_device_get_usec_since_initialized(struct udev_device + const char *udev_device_get_sysattr_value(struct udev_device *udev_device, const char *sysattr); + int udev_device_set_sysattr_value(struct udev_device *udev_device, const char *sysattr, char *value); + int udev_device_has_tag(struct udev_device *udev_device, const char *tag); ++int udev_device_has_current_tag(struct udev_device *udev_device, const char *tag); + + /* + * udev_monitor +diff --git a/src/libudev/libudev.sym b/src/libudev/libudev.sym +index 76726fca7..d56c2aeab 100644 +--- a/src/libudev/libudev.sym ++++ b/src/libudev/libudev.sym +@@ -118,3 +118,9 @@ global: + udev_queue_flush; + udev_queue_get_fd; + } LIBUDEV_199; ++ ++LIBUDEV_247 { ++global: ++ udev_device_has_current_tag; ++ udev_device_get_current_tags_list_entry; ++} LIBUDEV_215; + +base-commit: 2e4dd05900e7b42d96cd7bdd5689c8ee431fb000 +-- +2.41.0 + diff --git a/gnu/packages/patches/eudev-rules-directory.patch b/gnu/packages/patches/eudev-rules-directory.patch index 54fc01c6d5..c4b1cfae39 100644 --- a/gnu/packages/patches/eudev-rules-directory.patch +++ b/gnu/packages/patches/eudev-rules-directory.patch @@ -4,9 +4,9 @@ The old udev 182 supported $UDEV_CONFIG_FILE, which in turn allowed the search path to be customized, but eudev no longer has this, hence this hack. ---- eudev-3.1.5/src/udev/udev-rules.c 2015-10-13 06:22:14.000000000 +0800 -+++ eudev-3.1.5/src/udev/udev-rules.c 2015-10-16 20:45:38.491934336 +0800 -@@ -47,15 +47,11 @@ +--- a/src/udev/udev-rules.c ++++ b/src/udev/udev-rules.c +@@ -48,16 +48,11 @@ struct uid_gid { }; }; @@ -20,11 +20,12 @@ this hack. - "/lib/udev/rules.d", - "/usr/lib/udev/rules.d", -#endif +- "/usr/local/lib/udev/rules.d", + NULL, /* placeholder for $EUDEV_RULES_DIRECTORY */ NULL}; struct udev_rules { -@@ -1704,6 +1700,9 @@ +@@ -1718,6 +1713,9 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) { udev_rules_check_timestamp(rules); -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 01 16:26:22 2023 Received: (at 66099) by debbugs.gnu.org; 1 Oct 2023 20:26:22 +0000 Received: from localhost ([127.0.0.1]:35462 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qn31B-00075e-SB for submit@debbugs.gnu.org; Sun, 01 Oct 2023 16:26:22 -0400 Received: from planete-kraus.eu ([89.234.140.182]:59580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qn316-000755-16 for 66099@debbugs.gnu.org; Sun, 01 Oct 2023 16:26:16 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 4bdbcb0d; Sun, 1 Oct 2023 20:25:58 +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=iWJzn6C1ibGcQLFbUkQ/pnuTVK0=; b=s cqyNlDlrib5oLU4voXxpYg7jJzyDCCLd1xPftd7PRQ08ax5Yof+pgbruto/Rw90g Z69Xtue2XOjr/8CObcw3RFYNsE1c8oBl8lOwVOtle54Mc3b7GiAxxTeaQqclD2OB zxN6wImtOk2ugjgtdr1ZS0LbZtwCu5vchKbe9ALwqUXwe9SqTYpXa80TkzTCSbsg 3xkEyTAQPfZ+EFjpc0E+IHugqLsXrxSAbAHFXxLgzUAR/dfwVfndSlAdkAat+FKG hEae3abxStXGmpH7E2hqeXiWkjZuJ1YP794BHVroox4HnKuDqU7AzBx/Ygr6nqal 4VmRzRm3rHciyinCMBE0A== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 198c55db (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 1 Oct 2023 20:25:57 +0000 (UTC) Message-ID: In-Reply-To: References: From: Vivien Kraus Date: Sat, 30 Sep 2023 21:32:59 +0200 Subject: [PATCH gnome-team v4 2/4] guix: Add udev-hwdb-bin profile hook. To: Liliana Marie Prikler , 66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 66099 Cc: , rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) The new eudev introduced an index for a hardware database. This index file must be unique. * guix/profiles.scm (udev-hwdb-bin): New profile hook to generate hwdb.bin. (%default-profile-hooks): Register it here. --- guix/profiles.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/guix/profiles.scm b/guix/profiles.scm index c88672c25a..d308e7fb88 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1905,6 +1905,34 @@ (define (texlive-font-maps manifest) (hook . texlive-font-maps))) (return #f)))) +(define (udev-hwdb-bin manifest) + "Return a derivation that builds lib/udev/hwdb.bin." + (define eudev + (module-ref (resolve-interface '(gnu packages linux)) 'eudev)) + (define build + (with-imported-modules + (source-module-closure '((guix build utils))) + #~(begin + (use-modules (guix build utils)) + (let* ((inputs '#$(manifest-inputs manifest)) + (hwdb-directories + (filter + file-exists? + (map (lambda (directory) + (string-append directory "/lib/udev/hwdb.d")) + inputs)))) + (setenv "UDEV_HWDB_PATH" + (string-join hwdb-directories ":"))) + (invoke #$(file-append eudev "/bin/udevadm") + "hwdb" "--update" + "-o" (string-append #$output "/lib/udev/hwdb.bin"))))) + (gexp->derivation "udev-hwdb-bin" build + #:substitutable? #f + #:local-build? #t + #:properties + `((type . profile-hook) + (hook . udev-hwdb-bin)))) + (define %default-profile-hooks ;; This is the list of derivation-returning procedures that are called by ;; default when making a non-empty profile. @@ -1919,6 +1947,7 @@ (define %default-profile-hooks gtk-icon-themes gtk-im-modules texlive-font-maps + udev-hwdb-bin xdg-desktop-database xdg-mime-database)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 01 16:26:28 2023 Received: (at 66099) by debbugs.gnu.org; 1 Oct 2023 20:26:28 +0000 Received: from localhost ([127.0.0.1]:35465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qn31I-000760-A8 for submit@debbugs.gnu.org; Sun, 01 Oct 2023 16:26:28 -0400 Received: from planete-kraus.eu ([89.234.140.182]:59580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qn31H-000755-1R for 66099@debbugs.gnu.org; Sun, 01 Oct 2023 16:26:27 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 50dd6d46; Sun, 1 Oct 2023 20:26:09 +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=8IllG/iUYeuMh4Fe17WtACJeN8U=; b=g cDKZNPhLiSrSszA8U9piJzpVM1eHdU8wqXNHRnfPup1Az8mL2xBCl29c7U+EwBEP ci3iCrpT2XJcn7QkO8UYsd4EP/hCCLeIa0DxTq7Mm0R9Y3lg7GuQM/Od1BNhVvf8 6uCB36wRdYFAY973eRtcq78bBQsTLLuMylupSH/gTHt1QhSF4o/BbkuQcNeLzMqY kkNSBzpcpgZOibv3TIRUMWUhhXAqzT4uPUwcx5KpD8rtMxPH49R0iET/MJYw4+9G RFCwBIUi4/T6LlYy1K5kvdS5oVwFJepDYWBW0Ru3Fjv+7lsliwiXaPNUY+Raigv+ Y+mW8HAi0PZhVYoFmrwQw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 650c0ed9 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 1 Oct 2023 20:26:09 +0000 (UTC) Message-ID: <976afb59b36ddc714ff1232d1257b3e025f82b11.1696191643.git.vivien@planete-kraus.eu> In-Reply-To: References: From: Vivien Kraus Date: Tue, 19 Sep 2023 13:32:26 +0200 Subject: [PATCH gnome-team v4 3/4] gnu: libgudev: Update to 238. To: Liliana Marie Prikler , 66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ea3dc455a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-pl [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-Debbugs-Envelope-To: 66099 Cc: , rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ea3dc455a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-pl [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ea3dc455a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-plugins (define-public libgudev (package (name "libgudev") - (version "236") + (version "238") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "094mgjmwgsgqrr1i0vd20ynvlkihvs3vgbmpbrhswjsrdp86j0z5")))) + "1laxgdkgmr30aw44sm4rgpsdybwxx5rszcm8c2y3vmy9myqnl9k1")))) (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 01 16:26:36 2023 Received: (at 66099) by debbugs.gnu.org; 1 Oct 2023 20:26:36 +0000 Received: from localhost ([127.0.0.1]:35468 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qn31P-00076R-LY for submit@debbugs.gnu.org; Sun, 01 Oct 2023 16:26:36 -0400 Received: from planete-kraus.eu ([89.234.140.182]:59580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qn31N-000755-1m for 66099@debbugs.gnu.org; Sun, 01 Oct 2023 16:26:34 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id a7c522e3; Sun, 1 Oct 2023 20:26:15 +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:mime-version :content-type:content-transfer-encoding:to:cc; s=albinoniB; bh=B chcVV9NyWqvqUUVmxhN0sPJN9g=; b=yg6jsIpmVKjt+FsihEDCo/aJvlVbN+rg5 gdS2m3snQNDEGyHycu84G9dXnua6UiVu1s2v+ZnIBBWUlvbCIkU9XTvL8g9Ksrrw QBlvXQ3xhdwXsvVajyTeCgH7juhU28Gf41EC73pKnw0xjJL9gvXtdY+b4nMcWaO4 DqJqYeo+9+rw4RHrxGKD8gKEPaAY+DLskTCw8jiTaP09CYR3Z/+uKbdxa73A91Fa JwOdHcc303agS3ecfMixXIWUaKfsCcDNl1VDlOzNK9yroHnDYSWtpmH5RsUO4dDH wHvyQ96IUWdceFMGD5J0CDJ9y67HKbsG7SkhGwhiJFcgE8mTQuC3w== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id c84c0dd7 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 1 Oct 2023 20:26:15 +0000 (UTC) Message-ID: In-Reply-To: References: From: Vivien Kraus Date: Tue, 19 Sep 2023 13:32:46 +0200 Subject: [PATCH gnome-team v4 4/4] gnu: upower: Update to 1.90.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: Liliana Marie Prikler , 66099@debbugs.gnu.org User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The new eudev now can install hwdb files. Upower has some, but they should get installed in upower’s output, not eudev’s. The phases needed a rework. Now the 32-bit-specific test fix is always there, except it may be empty. A test needs to be disabled. Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-Debbugs-Envelope-To: 66099 Cc: , rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The new eudev now can install hwdb files. Upower has some, but they should get installed in upower’s output, not eudev’s. The phases needed a rework. Now the 32-bit-specific test fix is always there, except it may be empty. A test needs to be disabled. Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager The new eudev now can install hwdb files. Upower has some, but they should get installed in upower’s output, not eudev’s. The phases needed a rework. Now the 32-bit-specific test fix is always there, except it may be empty. A test needs to be disabled. * gnu/packages/gnome.scm (upower): Update to 1.90.2. [#:configure-flags]: Set udevhwdbdir. [#:phases] : Add this phase unconditionnally : Disable the test. [inputs]: Remove dbus-glib. [native-inputs]: Add dbus for the tests. --- gnu/packages/gnome.scm | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4ea3dc455a..d4628d01b2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5727,7 +5727,7 @@ (define-public geocode-glib-with-libsoup2 (define-public upower (package (name "upower") - (version "1.90.0") + (version "1.90.2") (source (origin (method git-fetch) @@ -5736,7 +5736,7 @@ (define-public upower (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1g17rm91p8vfpjyb0k2shylrs55nccn3fa890vlk4n9s71sghbzq")) + (base32 "13xp423ycv8imf2cmgf6lii9f01p7x2v19cny7acrmczkc0cqv7d")) (modules '((guix build utils))) (snippet ;; Upstream commit . - (substitute* "src/linux/integration-test.py" - (("assertEqual(.*)40\\.0" _ middle) - (string-append - "assertAlmostEqual" middle "40.0")))))) - #~%standard-phases))) + (string-append "-Dudevrulesdir=" #$output "/bin/udev/rules.d") + (string-append "-Dudevhwdbdir=" #$output "/lib/udev/hwdb.d")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-failing-test + (lambda _ + ;; This test calls an unimplemented bluez dbus method + (substitute* "src/linux/integration-test.py" + (("test_bluetooth_hidpp_mouse") + "disabled_test_bluetooth_hidpp_mouse")))) + (add-after 'unpack 'adjust-test-for-excess-precision + (lambda _ + #$@(if (target-x86-32?) + ;; Address test failure caused by excess precision + ;; on i686: + ;; . + '((substitute* "src/linux/integration-test.py" + (("assertEqual(.*)40\\.0" _ middle) + (string-append + "assertAlmostEqual" middle "40.0")))) + '(*unspecified*))))))) (native-inputs (list `(,glib "bin") ; for gdbus-codegen gobject-introspection @@ -5785,12 +5793,13 @@ (define-public upower python-packaging python-pygobject umockdev + dbus ;; For man pages. docbook-xsl libxslt ; for 'xsltproc' libxml2)) ; for 'XML_CATALOG_FILES' (inputs - (list dbus-glib libgudev libusb)) + (list libgudev libusb)) (propagated-inputs ;; In Requires of upower-glib.pc. (list glib)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 01 16:32:27 2023 Received: (at 66099) by debbugs.gnu.org; 1 Oct 2023 20:32:27 +0000 Received: from localhost ([127.0.0.1]:35480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qn375-0007IQ-0S for submit@debbugs.gnu.org; Sun, 01 Oct 2023 16:32:27 -0400 Received: from mail-qk1-x72b.google.com ([2607:f8b0:4864:20::72b]:47603) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qn373-0007IB-90 for 66099@debbugs.gnu.org; Sun, 01 Oct 2023 16:32:25 -0400 Received: by mail-qk1-x72b.google.com with SMTP id af79cd13be357-77575531382so408903985a.3 for <66099@debbugs.gnu.org>; Sun, 01 Oct 2023 13:32:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696192323; x=1696797123; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=9U8o4Mv6DPA5ur3eWCq7zvUgm656ZgUjHUN5ROPIrD4=; b=Jmb6zjcMmPYnYqDALIXPfnElKECbvQ1Xj4C2Dn8YoZx8rqp2J8PQyNDJNdrm1noVHJ 6jQGGpp0TxNMOiwxs+AFU1IcXXpdeZEJD9tc+sesGOksJehhF3btDnc6eg0UtbZfFf8f Lrr1wHP63t5GgksW2ks4EJMPxczRD81o2R1mAEfmXFln18XsHjWhhfOFYj6jeRJJCtuY /nT9VyG0Mz2CcyUteP42mXSw2rP5iEM2V9WxuKy3Z1k/qyZ8eOnfuedO0Mm6Bofi6VmM f0qCp4sPkN5VgChm3UgGPH2UaJqWcao+Psj2ocCqYMqeYsGIaZ8E7/AobFDLOnZt2h36 MKWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696192323; x=1696797123; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=9U8o4Mv6DPA5ur3eWCq7zvUgm656ZgUjHUN5ROPIrD4=; b=YhO2LJiw+1zerR9dLM+hSXv+GuaORsMCNP3Q88JRnZn9qTrjpsLhhYaGrCTootNBrz p8nk8pJwtElSpKlF/1lImbVPt445AdEz+gqDeHfM8w6n/yW9bptEffNn7PFeUkrFSBsN HU2SrMcamsT9JmS8ZCscLIE1pl4XNXxAiUK6JbElNa5O6q77gjTIj/OiR66t2uuywNdt ZaneuBt632yvzI6ZyYxlvLAvKIQmEj5Bui1AFSgFPYNm6rKHd0NZG4qhBvUhO+WW+XzF MF1mBVRxPmVXZYGHma5MPGIiyyINI2S0WmoPBnS2mIG37DieJH/e9pSKlX41vHrT8Q+Z AJDA== X-Gm-Message-State: AOJu0Yxt4q9VHk2wMONYGX1TivnoOjYHV8s8VY4VHs9Cldc0U+X0L2RH /w50rAKz1BY8jUnvG3n+y+Y= X-Google-Smtp-Source: AGHT+IGtHZK9EVmU4ZivqWXyq0viK2U3aoz3Sm++VmVCDdMDdqtouMuSLdF07cCvsvOtxSVt8Ijq4Q== X-Received: by 2002:a05:620a:4590:b0:775:6d22:d234 with SMTP id bp16-20020a05620a459000b007756d22d234mr11103335qkb.5.1696192323342; Sun, 01 Oct 2023 13:32:03 -0700 (PDT) Received: from hurd (dsl-10-136-90.b2b2c.ca. [72.10.136.90]) by smtp.gmail.com with ESMTPSA id pj48-20020a05620a1db000b0076ef004f659sm1061080qkn.1.2023.10.01.13.32.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 13:32:02 -0700 (PDT) From: Maxim Cournoyer To: Vivien Kraus Subject: Re: [PATCH gnome-team v3 2/3] gnu: libgudev: Update to 238. References: <2bfee11ea66c2005e76523654dc5c92b2974cfd1.1696083614.git.vivien@planete-kraus.eu> Date: Sun, 01 Oct 2023 16:32:01 -0400 In-Reply-To: <2bfee11ea66c2005e76523654dc5c92b2974cfd1.1696083614.git.vivien@planete-kraus.eu> (Vivien Kraus's message of "Tue, 19 Sep 2023 13:32:26 +0200") Message-ID: <87sf6u5bjy.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: 66099@debbugs.gnu.org, Liliana Marie Prikler , rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Vivien Kraus writes: > * gnu/packages/gnome.scm (libgudev): Update to 238. > --- > gnu/packages/gnome.scm | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm > index eaceb76e1e..4ea3dc455a 100644 > --- a/gnu/packages/gnome.scm > +++ b/gnu/packages/gnome.scm > @@ -6899,14 +6899,14 @@ (define-public eog-plugins > (define-public libgudev > (package > (name "libgudev") > - (version "236") > + (version "238") > (source (origin > (method url-fetch) > (uri (string-append "mirror://gnome/sources/" name "/" > version "/" name "-" version ".tar.xz")) > (sha256 > (base32 > - "094mgjmwgsgqrr1i0vd20ynvlkihvs3vgbmpbrhswjsrdp86j0z5")))) > + "1laxgdkgmr30aw44sm4rgpsdybwxx5rszcm8c2y3vmy9myqnl9k1")))) > (build-system meson-build-system) > (native-inputs > `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. LGTM! -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 01 18:03:18 2023 Received: (at 66099) by debbugs.gnu.org; 1 Oct 2023 22:03:18 +0000 Received: from localhost ([127.0.0.1]:35521 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qn4Wz-00045s-W4 for submit@debbugs.gnu.org; Sun, 01 Oct 2023 18:03:18 -0400 Received: from mail-qk1-x72e.google.com ([2607:f8b0:4864:20::72e]:61901) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qn4Ww-00045d-VR for 66099@debbugs.gnu.org; Sun, 01 Oct 2023 18:03:16 -0400 Received: by mail-qk1-x72e.google.com with SMTP id af79cd13be357-7742be66bd3so835923685a.3 for <66099@debbugs.gnu.org>; Sun, 01 Oct 2023 15:02:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696197773; x=1696802573; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=eLHOEFdW/t2D0XTwHN+oZLe+Tlb1kfz3k3AewkeA0mw=; b=mIoMrVG2EMO7nBY3xiA0xKskhkNTbzNbUB0tfNuJwE6totsjrhLiOVr6+SvAazj866 3RCE7U3nrG0vtrvVYUf1SLNKsB9DjMnpYFvVPdL+1US0dEmF+8bPWTQD4qY0QiLY7E8C kW6l3smgxkX9Z5osZ5LmwiDSfqJ9idPQd1DWgXbPbcx/30zWSGNPFAxwpCLWflUaEqCq ItOmtS6v1th+UnsS7vCHm4djsuc/3zBAolj1vY0H6pj83ddmtB7tw3vidhgNMdiwJLXV Auqgu2QjmVKDFEGpeKqMHBuQp9oWSRqKEgE0IfCRX4m/HhS2LJJp370yydloG03C5b4I YNYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696197773; x=1696802573; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=eLHOEFdW/t2D0XTwHN+oZLe+Tlb1kfz3k3AewkeA0mw=; b=AJ0YyMzUjNpqvzZG5ybsNVYrwMRFH38DPxQbQc+pPKZUtG916n3gDSk6ElxYTtGXz5 DtChsm3Ftr1TQuCK83DKvHTiGFZkpR0a4VRIR3+hdcmqHPcEnhqRBWqVqGzSMPJOGknT ruvSlThDEPaCU+x7Y24EmXZJ+EOaylj1jqyxCsWrdIL7zaTVnZJFjIOdO1m6q2nxTvlq 1GWMYsE+fofOpKtuFxAYpZ+Tlv9m6U+1MyLMuJOSZNEG02LjtHtxYZL4JSQ/1hLYCoSs 6U8qfNtu4AUSGukbEXxKCJ41xz9cXKNwwQsZ7ftxdHT1it4x5VekW9S/PcEO8R4u5UJJ L1xQ== X-Gm-Message-State: AOJu0Yw1UhlmINJ/w77JJlFZrmfVv21fX0HtNKnF5AotygATm869thG9 UM5Dl1xeGmrSrBZB5Vd3eeU= X-Google-Smtp-Source: AGHT+IG6i4Ugtjs+fWzpPqXhTEOji3S2ISEhWLaK7MVnCQEriPSrWfz+BHN4QbqHfwFgRGCDlEN9gg== X-Received: by 2002:a05:620a:d93:b0:767:c572:ab10 with SMTP id q19-20020a05620a0d9300b00767c572ab10mr10543930qkl.35.1696197772925; Sun, 01 Oct 2023 15:02:52 -0700 (PDT) Received: from hurd (dsl-10-136-90.b2b2c.ca. [72.10.136.90]) by smtp.gmail.com with ESMTPSA id w15-20020ae9e50f000000b0077423f849c3sm6753729qkf.24.2023.10.01.15.02.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 15:02:52 -0700 (PDT) From: Maxim Cournoyer To: Vivien Kraus Subject: Re: [PATCH gnome-team v3 1/3] gnu: eudev: Update libudev version to 251. References: Date: Sun, 01 Oct 2023 18:02:51 -0400 In-Reply-To: (Vivien Kraus's message of "Tue, 19 Sep 2023 13:23:22 +0200") Message-ID: <87o7hi57ck.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 1.7 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi, Vivien Kraus writes: > Support for version 251 is only provided as a merge request for now: > > https://github.com/eudev-project/eudev/pull/253 > > This merge request bumps the eudev version to 3.2.14, but it has not been [...] Content analysis details: (1.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (maxim.cournoyer[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:72e listed in] [list.dnswl.org] 1.7 URIBL_BLACK Contains an URL listed in the URIBL blacklist [URIs: local.mk] X-Debbugs-Envelope-To: 66099 Cc: 66099@debbugs.gnu.org, Liliana Marie Prikler , rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.7 (/) Hi, Vivien Kraus writes: > Support for version 251 is only provided as a merge request for now: > > https://github.com/eudev-project/eudev/pull/253 > > This merge request bumps the eudev version to 3.2.14, but it has not been > released yet. > > Eudev now has a hardware database that installs descriptions of hardware in > /etc, but they should go to /lib prior to being used. I added a phase to copy > all the /etc files to /lib. > > I submitted 3 patches to make udev hwdb more guix-friendly, fused in > eudev-hwdb-bin-path.patch. libudev requires an indexed binary file that knows > about all devices, and this file is generated by udevadm hwdb --update -o > /lib/udev/hwdb.bin. This udevadm hwdb command respects the > UDEV_HWDB_PATH to collect all entries for the hwdb. Then, libudev can use > UDEV_HWDB_BIN to select the database at run-time. > > Another unreleased patch for PR 255 is also included. > > I think everything could work out for Guix if we add a new profile hook that: > 1. Calls udevadm hwdb --update -o /lib/udev/hwdb.bin; > 2. Set UDEV_HWDB_BIN to /lib/udev/hwdb.bin. > > This is why there are actually 2 search paths: one for UDEV_HWDB_PATH, and one > for UDEV_HWDB_BIN (the latter accepting only 1 value). > > * gnu/packages/linux.scm (eudev): Update to v3.2.12, but bump version to > 3.2.14.beta. > [#:phases] : New phase. > : Update accordingly. > [native-search-paths]: Add UDEV_HWDB_PATH. > * gnu/packages/patches/eudev-bump-to-251.patch: New file. > * gnu/packages/patches/eudev-hwdb-bin-path.patch: New file. > * gnu/packages/patches/eudev-pr-255.patch: New file. > * gnu/packages/linux.scm (eudev): Use them here. > * gnu/local.mk (dist_patch_DATA): Register them here. > * guix/profiles.scm (udev-hwdb-bin): New profile hook to generate hwdb.bin. > (%default-profile-hooks): Register it here. Impressive work! It seems your patches were warmly welcomed (already merged!) in eudev, which is excellent (and should mean a v4 doesn't need patches anymore, using a specific commit with a git-version computed version. [...] > (build-system gnu-build-system) > (arguments > (list > @@ -4297,18 +4300,25 @@ (define-public eudev > (substitute* (string-append #$output "/lib/libudev.la") > (("old_library=.*") > "old_library=''\n"))))) > - (add-after 'install 'build-hwdb > + (add-after 'install 'allow-eudev-hwdb > (lambda _ > - ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and > - ;; similar tools to display product names. > - ;; > - ;; XXX: This can't be done when cross-compiling. Find another way > - ;; to generate hwdb.bin for cross-built systems. > - #$@(if (%current-target-system) > - #~(#t) > - #~((invoke (string-append #$output "/bin/udevadm") > - "hwdb" "--update")))))) > + ;; eudev distributes the hwdb, but each file has to be enabled > + ;; by being copied under /lib/udev/hwdb.d. We accept all of > + ;; them. > + (symlink (string-append #$output "/etc/udev/hwdb.d") > + (string-append #$output "/lib/udev/hwdb.d"))))) > #:configure-flags #~(list "--enable-manpages"))) > + (native-search-paths > + (list (search-path-specification > + (variable "UDEV_HWDB_PATH") > + (files '("lib/udev/hwdb.d"))) > + ;; Never install a hwdb.bin file, always let the udev-hwdb-bin > + ;; profile hook generate it. > + (search-path-specification > + (variable "UDEV_HWDB_BIN") > + (files '("lib/udev/hwdb.bin")) > + (file-type 'regular) > + (separator #f)))) Maybe add a ;singled valued comment to the end of the above line. Note that given that file is to be generated in a profile hook, UDEV_HWDB_BIN would never be set at *build* time, but that should not matter much (the build environment being containerized and all).) [...] > diff --git a/guix/profiles.scm b/guix/profiles.scm > index c88672c25a..d308e7fb88 100644 > --- a/guix/profiles.scm > +++ b/guix/profiles.scm > @@ -1905,6 +1905,34 @@ (define (texlive-font-maps manifest) > (hook . texlive-font-maps))) > (return #f)))) > > +(define (udev-hwdb-bin manifest) > + "Return a derivation that builds lib/udev/hwdb.bin." ^ @file{lib/udev/hwdb.bin} > + (define eudev > + (module-ref (resolve-interface '(gnu packages linux)) 'eudev)) > + (define build > + (with-imported-modules > + (source-module-closure '((guix build utils))) > + #~(begin > + (use-modules (guix build utils)) > + (let* ((inputs '#$(manifest-inputs manifest)) > + (hwdb-directories > + (filter > + file-exists? > + (map (lambda (directory) > + (string-append directory "/lib/udev/hwdb.d")) > + inputs)))) > + (setenv "UDEV_HWDB_PATH" > + (string-join hwdb-directories ":"))) It'd be nicer to user 'evaluate-search-paths' with the UDEV_HWDB_PATH search path. > + (invoke #$(file-append eudev "/bin/udevadm") > + "hwdb" "--update" > + "-o" (string-append #$output "/lib/udev/hwdb.bin"))))) > + (gexp->derivation "udev-hwdb-bin" build > + #:substitutable? #f > + #:local-build? #t > + #:properties > + `((type . profile-hook) > + (hook . udev-hwdb-bin)))) > > (define %default-profile-hooks > ;; This is the list of derivation-returning procedures that are called by > ;; default when making a non-empty profile. > @@ -1919,6 +1947,7 @@ (define %default-profile-hooks > gtk-icon-themes > gtk-im-modules > texlive-font-maps > + udev-hwdb-bin > xdg-desktop-database > xdg-mime-database)) My only issue with this hook is that it introduces 'eudev' as a hard dependency for generating guix profiles. Would it make sense to follow the approach used in 'gdk-pixbuf-loaders-cache-file', which is to look if eudev is already part of the profile inputs (transitively), and skip the hook if it isn't? -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 02 13:03:26 2023 Received: (at 66099) by debbugs.gnu.org; 2 Oct 2023 17:03:26 +0000 Received: from localhost ([127.0.0.1]:37847 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qnMKL-0000dN-Rw for submit@debbugs.gnu.org; Mon, 02 Oct 2023 13:03:26 -0400 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:54660) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qnMKH-0000d4-14 for 66099@debbugs.gnu.org; Mon, 02 Oct 2023 13:03:24 -0400 Received: by mail-ej1-x642.google.com with SMTP id a640c23a62f3a-9ae2cc4d17eso2369528666b.1 for <66099@debbugs.gnu.org>; Mon, 02 Oct 2023 10:03:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696266178; x=1696870978; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=wbjDAHQXjZdW/0+dnfF9ob0o0U2tWXTznMztt8nS9mw=; b=hwD5M18zUYG1mu/zlcFJCZqm4MdHGF+IvWNtjyDBjc6iv5TTCRabXEW+BkfXze96g4 R30yU227hKEajs8avahf4DSVRdWk3xV6NMQgl9viVTvfu4J2XjgnEei7kHZS+O0v53nV eEVZqmFjfuvIAJutZ11YoGGK6sbbxINBRGg5ZolTtyWG9Ym3iUVXjLqCG9GJqOI5lyWK TWoa9rwsCf4uuUg35mUPsT8BmRPD+dA1qfnZyj6jbda/aHdqKpjNq5QYjmsvvDoowMrK PrxMOsmUWtB784P0VsbBQCbAD2HLpeuXStannDHvlo11k4pDCswwpPWevjnm8zbpwsd3 SuLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696266178; x=1696870978; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=wbjDAHQXjZdW/0+dnfF9ob0o0U2tWXTznMztt8nS9mw=; b=mWBGLOHkHAoUgODnDp0f15LWkuHAF6K4vFDQvBZ2e9hf3qsiXryI5kb5gu52IMSHeW U0QEPyxvsu+RRSbMEF7N98gHOHQqPlW20mix7S1hyHQOxy1/nQuGuu7IVcz1Qfj6p9D7 HJhQAVQLEg84F86+OWXVYUI0hmqkp3k/J8wmlAniDxZw6T0XlQHG9krpiBnWv47KCMA+ uLEFaUFnUTxiZpW8PftXGEctCqJDVpBcVTz8j/uwIQk7Gca9oHvZBB/xK3k5D9iaIcr4 tI5M9M/Qs+tci3yOV3F5x6NBgpJCQmdAQ0BqimguFBH7tiLtA9mOn4wd1H08avt7z0ov dYBg== X-Gm-Message-State: AOJu0Yxg9zmPrEijO5P1dPfvvVOmD+Wrz6QywXK+oSf8Jpt/yKap/Get MTRVWTYmtOJ1sPHWHGtnY5c= X-Google-Smtp-Source: AGHT+IFhrH0BlHZ49C6KwexJD2Zu0wuOzrKwxf0timRAGQt9cDKjYpuxCHIm+umA9m5DpdR/qsOqUA== X-Received: by 2002:a17:907:1386:b0:9ae:6ffd:be0d with SMTP id vs6-20020a170907138600b009ae6ffdbe0dmr9784853ejb.50.1696266178118; Mon, 02 Oct 2023 10:02:58 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id lt2-20020a170906fa8200b00992e265495csm17340994ejb.212.2023.10.02.10.02.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 10:02:56 -0700 (PDT) Message-ID: <15094b9735aedadd8e86b7c6c07ab53619b3e589.camel@gmail.com> Subject: Re: [PATCH gnome-team v3 1/3] gnu: eudev: Update libudev version to 251. From: Liliana Marie Prikler To: Maxim Cournoyer , Vivien Kraus Date: Mon, 02 Oct 2023 19:02:54 +0200 In-Reply-To: <87o7hi57ck.fsf@gmail.com> References: <87o7hi57ck.fsf@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: 66099@debbugs.gnu.org, rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) QW0gU29ubnRhZywgZGVtIDAxLjEwLjIwMjMgdW0gMTg6MDIgLTA0MDAgc2NocmllYiBNYXhpbSBD b3Vybm95ZXI6Cj4gPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc2VhcmNoLXBhdGgtc3BlY2lm aWNhdGlvbgo+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICh2YXJpYWJsZSAiVURFVl9I V0RCX0JJTiIpCj4gPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGZpbGVzICcoImxpYi91 ZGV2L2h3ZGIuYmluIikpCj4gPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGZpbGUtdHlw ZSAncmVndWxhcikKPiA+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc2VwYXJhdG9yICNm KSkpKQo+IAo+IE1heWJlIGFkZCBhIDtzaW5nbGVkIHZhbHVlZCBjb21tZW50IHRvIHRoZSBlbmQg b2YgdGhlIGFib3ZlIGxpbmUuwqAKPiBOb3RlIHRoYXQgZ2l2ZW4gdGhhdCBmaWxlIGlzIHRvIGJl IGdlbmVyYXRlZCBpbiBhIHByb2ZpbGUgaG9vaywKPiBVREVWX0hXREJfQklOIHdvdWxkIG5ldmVy IGJlIHNldCBhdCAqYnVpbGQqIHRpbWUsIGJ1dCB0aGF0IHNob3VsZCBub3QKPiBtYXR0ZXIgbXVj aCAodGhlIGJ1aWxkIGVudmlyb25tZW50IGJlaW5nIGNvbnRhaW5lcml6ZWQgYW5kIGFsbCkuKQo+ IAo+IFsuLi5dCj4gCj4gPiArwqDCoMKgwqDCoMKgwqDCoMKgIChpbnZva2UgIyQoZmlsZS1hcHBl bmQgZXVkZXYgIi9iaW4vdWRldmFkbSIpCj4gPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCAiaHdkYiIgIi0tdXBkYXRlIgo+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgIi1vIiAoc3RyaW5nLWFwcGVuZCAjJG91dHB1dAo+ID4gIi9saWIvdWRldi9od2Ri LmJpbiIpKSkpKQo+ID4gK8KgIChnZXhwLT5kZXJpdmF0aW9uICJ1ZGV2LWh3ZGItYmluIiBidWls ZAo+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICM6c3Vic3RpdHV0 YWJsZT8gI2YKPiA+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAjOmxv Y2FsLWJ1aWxkPyAjdAo+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg ICM6cHJvcGVydGllcwo+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg IGAoKHR5cGUgLiBwcm9maWxlLWhvb2spCj4gPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgIChob29rIC4gdWRldi1od2RiLWJpbikpKSkKPiA+IAo+ID4gwqAoZGVm aW5lICVkZWZhdWx0LXByb2ZpbGUtaG9va3MKPiA+IMKgwqAgOzsgVGhpcyBpcyB0aGUgbGlzdCBv ZiBkZXJpdmF0aW9uLXJldHVybmluZyBwcm9jZWR1cmVzIHRoYXQgYXJlCj4gPiBjYWxsZWQgYnkK PiA+IMKgwqAgOzsgZGVmYXVsdCB3aGVuIG1ha2luZyBhIG5vbi1lbXB0eSBwcm9maWxlLgo+ID4g QEAgLTE5MTksNiArMTk0Nyw3IEBAIChkZWZpbmUgJWRlZmF1bHQtcHJvZmlsZS1ob29rcwo+ID4g wqDCoMKgwqDCoMKgwqDCoCBndGstaWNvbi10aGVtZXMKPiA+IMKgwqDCoMKgwqDCoMKgwqAgZ3Rr LWltLW1vZHVsZXMKPiA+IMKgwqDCoMKgwqDCoMKgwqAgdGV4bGl2ZS1mb250LW1hcHMKPiA+ICvC oMKgwqDCoMKgwqDCoCB1ZGV2LWh3ZGItYmluCj4gPiDCoMKgwqDCoMKgwqDCoMKgIHhkZy1kZXNr dG9wLWRhdGFiYXNlCj4gPiDCoMKgwqDCoMKgwqDCoMKgIHhkZy1taW1lLWRhdGFiYXNlKSkKPiAK PiBNeSBvbmx5IGlzc3VlIHdpdGggdGhpcyBob29rIGlzIHRoYXQgaXQgaW50cm9kdWNlcyAnZXVk ZXYnIGFzIGEgaGFyZAo+IGRlcGVuZGVuY3kgZm9yIGdlbmVyYXRpbmcgZ3VpeCBwcm9maWxlcy7C oCBXb3VsZCBpdCBtYWtlIHNlbnNlIHRvCj4gZm9sbG93IHRoZSBhcHByb2FjaCB1c2VkIGluICdn ZGstcGl4YnVmLWxvYWRlcnMtY2FjaGUtZmlsZScsIHdoaWNoIGlzCj4gdG8gbG9vayBpZiBldWRl diBpcyBhbHJlYWR5IHBhcnQgb2YgdGhlIHByb2ZpbGUgaW5wdXRzCj4gKHRyYW5zaXRpdmVseSks IGFuZCBza2lwIHRoZSBob29rIGlmIGl0IGlzbid0PwpTcGVha2luZyBvZiB3aGljaCwgc2luY2Ug ZXVkZXYgaXMgYmFzaWNhbGx5IHN5c3RlbSBjb25maWcgc3R1ZmYsIEkKdGhpbmsgaXQgbWlnaHQg YmUgYmV0dGVyICpub3QqIHRvIGhhdmUgdGhlIHZhcmlhYmxlIGFuZCB0aGUgaG9vayBhbmQKaW5z dGVhZCBidWlsZCB0aGUgaHdkYiBhcyBwYXJ0IG9mIHVkZXYtc2VydmljZS10eXBlLiAgQXNzdW1p bmcsIG9mCmNvdXJzZSwgdGhhdCB3ZSBjYW4gYWxyZWFkeSBzcGVjaWZ5IGEgZmFsbGJhY2sgdmlh IGNvbmZpZyBmaWxlIOKAkyBpZiBubwpzdWNoIHN3aXRjaCBleGlzdHMsIHdlJ2QgaGF2ZSB0byBh ZGQgaXQuCgpDaGVlcnMK From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 02 13:12:45 2023 Received: (at 66099) by debbugs.gnu.org; 2 Oct 2023 17:12:46 +0000 Received: from localhost ([127.0.0.1]:37861 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qnMTN-0000sh-LY for submit@debbugs.gnu.org; Mon, 02 Oct 2023 13:12:45 -0400 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:43136) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qnMTM-0000sU-DP for 66099@debbugs.gnu.org; Mon, 02 Oct 2023 13:12:44 -0400 Received: by mail-ed1-x544.google.com with SMTP id 4fb4d7f45d1cf-53829312d12so4105020a12.0 for <66099@debbugs.gnu.org>; Mon, 02 Oct 2023 10:12:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696266741; x=1696871541; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=ZVXb7MTWEjdKfeLMJgCBpIeYGooVRTFmrZuBbPOUcqg=; b=QnpULMPLtoqmjFsN8x+sMkuxYjsr1Q8qTZDnCVjWzFiGnl8fXp4QZ5i8n1nZ8uXQRn cIKOrGWLPpAjFROSXEqQDi1Zyz1gm7TeRwtJckrJe640vq9aSvWDAwKlBBtsySSWFi/S n4JmxfrdzC0ix8X9y4jIxPOoKfyCqFM5kvnJWYE5AF/whmWsc//9nKwL69UgsRJvNt8+ rCyBWByeFaZpAmLReJfsHF7sGysAlFz1tLB38lUVYB3xgv+4+gclhcq+oAmEWC7ApNFr x6RWB7XCClval7l3yc07GjWDnO0wQsMr29vHaKKCdQR7x9iHW74U+CWEoLQJCP7EQ2Ua QoQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696266741; x=1696871541; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ZVXb7MTWEjdKfeLMJgCBpIeYGooVRTFmrZuBbPOUcqg=; b=P3BXTntOzvpvCdklWX+0/y97tP+fxBYU3X0A0DVOAw+3HVIhU82J7cU6+27qappCkZ 7CZT3NlRPzAOyruq1sjYU9Ouq2gLHYuP20vsvIMDi/zPPKG895/hGYOZ6F77qCTSRPl2 zRBH31VvMQCBpaxiDihg8yZgdirDWrKjztEVsJlPPddDJVB4ctbxhQ7s07/FVPj54QTK shB2bXrK9xVUxJ6PlnDrfa0QGG1sNFxKD4Sug14UJFJWGDRZgW9o1OW4WWFKCOubJpOk 3QkLuKA8rzR2EL6Y01d3fySPXo9ae+2x4s8aQ+A6Qkj1Nh3wh0qhREIv+UurlM8VvDhg lkuA== X-Gm-Message-State: AOJu0YxdP32cIAnQOfPChTAM+LFm6+qGmBB1k2hAO4Gs7TUwEpFJGkbF IMfPRk580iUkHrGSYLlEbkes+zzVHtX60w== X-Google-Smtp-Source: AGHT+IFLiVljnlsDNhafDZw4unb/Ao1HMV111kTNseMhoekh5VD1ZXf8I4YxJjDrQm6Q0j3WNQBIoA== X-Received: by 2002:a17:906:5391:b0:9ae:5513:e475 with SMTP id g17-20020a170906539100b009ae5513e475mr279379ejo.9.1696266741273; Mon, 02 Oct 2023 10:12:21 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id i22-20020a17090671d600b009929ab17be0sm17198261ejk.162.2023.10.02.10.12.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 10:12:20 -0700 (PDT) Message-ID: Subject: Re: [PATCH gnome-team v4 1/4] gnu: eudev: Update libudev version to 251. From: Liliana Marie Prikler To: Vivien Kraus , 66099@debbugs.gnu.org Date: Mon, 02 Oct 2023 19:12:19 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) QW0gRGllbnN0YWcsIGRlbSAxOS4wOS4yMDIzIHVtIDEzOjIzICswMjAwIHNjaHJpZWIgVml2aWVu IEtyYXVzOgo+ICvCoMKgwqAgKG5hdGl2ZS1zZWFyY2gtcGF0aHMKPiArwqDCoMKgwqDCoCAobGlz dCAoc2VhcmNoLXBhdGgtc3BlY2lmaWNhdGlvbgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCAodmFyaWFibGUgIlVERVZfSFdEQl9QQVRIIikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAgKGZpbGVzICcoImxpYi91ZGV2L2h3ZGIuZCIpKSkKUXVlc3Rpb24gZm9yIHVuZGVyc3RhbmRp bmcgdGhpcyBjb3JyZWN0bHk6IElzIFVERVZfSFdEQl9QQVRIIGhvbm91cmVkCmZvciBtb3JlIHRo YW4ganVzdCBVREVWX0hXREJfQklOIGJlbG93IG9yIGlzIHRoaXMgYSAiZmlyc3QgZmlsZSB3aW5z IgpraW5kIG9mIGRlYWw/Cgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IE5ldmVyIGluc3Rh bGwgYSBod2RiLmJpbiBmaWxlLCBhbHdheXMgbGV0IHRoZSB1ZGV2LQo+IGh3ZGItYmluCj4gK8Kg wqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgcHJvZmlsZSBob29rIGdlbmVyYXRlIGl0Lgo+ICvCoMKg wqDCoMKgwqDCoMKgwqDCoMKgIChzZWFyY2gtcGF0aC1zcGVjaWZpY2F0aW9uCj4gK8KgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgICh2YXJpYWJsZSAiVURFVl9IV0RCX0JJTiIpCj4gK8KgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgIChmaWxlcyAnKCJsaWIvdWRldi9od2RiLmJpbiIpKQo+ICvCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoZmlsZS10eXBlICdyZWd1bGFyKQo+ICvCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoCAoc2VwYXJhdG9yICNmKSkpKQpBcyBzdGF0ZWQgaW4gbXkgcmVwbHkg dG8gTWF4aW0sIHdlIHByb2JhYmx5IGRvbid0IHdhbnQgdG8gc2V0IHRoaXMgaW4gYQpwcm9maWxl IGhvb2ssIGJ1dCByYXRoZXIgb24gYSBzeXN0ZW0vaG9tZSBjb25maWcgbGV2ZWwuCgpDaGVlcnMK From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 02 13:17:45 2023 Received: (at 66099) by debbugs.gnu.org; 2 Oct 2023 17:17:45 +0000 Received: from localhost ([127.0.0.1]:37870 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qnMYC-00011l-MR for submit@debbugs.gnu.org; Mon, 02 Oct 2023 13:17:44 -0400 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:52459) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qnMYA-00011V-CQ for 66099@debbugs.gnu.org; Mon, 02 Oct 2023 13:17:42 -0400 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-9b27bc8b65eso1731229666b.0 for <66099@debbugs.gnu.org>; Mon, 02 Oct 2023 10:17:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696267040; x=1696871840; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=qa/1fsmNZEif+QBjoaR+rqIGC0R2smDPNrOGJUL0Nvg=; b=WCJ+XTPUU5oCloAL9EIwytlHIlKHyaLsCDoFh9Vz0yhM1u9NZYcDtGXRuo2JWZX8w0 NEcu6v648N1sf/X+hCgPsH3zNU/+v5bhvJTkWTFnVwCLs6NaxNhUicGOWtnwFlOlQCVA zjTLNKQOQAbFYBph21hKD1pcN3iUcd+yjTSPYC7n62t1KbYXtUutP+1kdF4rG9Kj0NcH k3UVKunQ1Lhw56ulb3nlCUMR70z2By/c/zm6LAUjmwcV7CU7lJsQzCu2cD+csMd41q1K 2lmSzfawzeP6jj7purt9EeXEecdO+BC2kV2RNlNtPT2keJo6Iv9OOw7dSwtLaQUwoXv5 3hqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696267040; x=1696871840; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=qa/1fsmNZEif+QBjoaR+rqIGC0R2smDPNrOGJUL0Nvg=; b=L8AXajKUy4APVdYiUgv2MdBCKp9ru9YYtqKXjd99Vy2T8iTUs9vqyycIlmkhaoF/W4 sqVqFwju2d0oCaVfrkLOs+G9AbrBjixd7RdxpBtqQMuxLq4sU4EmopLjnx5WaawnS2Rd cQuthlm5hMbYXHnkTdVKbtRYbw90JnM7+Oe0qVL9O9lBDH0nL0NdDJ1v+7B+RomAbAGr +Ve4X1ZrnG4wErJUb9EnMb+hWlICnaACisvV+v4077hhUoDRD8AZViRkYFmoloOtbR+q G0Q0mkO+VAfeoAQDmOrIc3cGE2Jf0w7tuIVbJv46pq2qKH+hPOQmPNobLeyvCWUB3EoX HiXg== X-Gm-Message-State: AOJu0Yx11RZfG3wE7BMBDWWvmbB3c+mWOOwKwX9anhpF7vCDODJVUU5k qTkeEE+LMNKAEpETPrp/ROA= X-Google-Smtp-Source: AGHT+IExvIYKzwzgJi//Wi5Gcso1mIVDIZl+S5XXJHb8FXqpmp865+ixwZuy3Mk5lsW+EfEB70sN2g== X-Received: by 2002:a17:906:8464:b0:9b3:64b:4346 with SMTP id hx4-20020a170906846400b009b3064b4346mr2936092ejc.71.1696267039490; Mon, 02 Oct 2023 10:17:19 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id t20-20020a170906949400b0099bd5d28dc4sm17388631ejx.195.2023.10.02.10.17.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 10:17:18 -0700 (PDT) Message-ID: <0a7a4690a881ab96b46df519a2f7c32c227e2ed6.camel@gmail.com> Subject: Re: [PATCH gnome-team v4 4/4] gnu: upower: Update to 1.90.2. From: Liliana Marie Prikler To: Vivien Kraus , 66099@debbugs.gnu.org Date: Mon, 02 Oct 2023 19:17:17 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Dienstag, dem 19.09.2023 um 13:32 +0200 schrieb Vivien Kraus: > The new eudev now can install hwdb files. Upower has some, but they > should get installed in upower=E2=80=99s output, not eudev=E2=80=99s. >=20 > The phases needed a rework. Now the 32-bit-specific test fix is > always there, > except it may be empty. A test needs to be disabled. "A test" is not helpful here. >=20 > * gnu/packages/gnome.scm (upower): Update to 1.90.2. > [#:configure-flags]: Set udevhwdbdir. > [#:phases] : Add this phase > unconditionnally > : Disable the test. We should probably merge these two into a single fix-test-suite phase. Then we can disable the failing test and adjust the other one for excess precession on those arches where it's needed. > [inputs]: Remove dbus-glib. Okay. > [native-inputs]: Add dbus for the tests. > --- "Add dbus." suffices. Cheers From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 02 15:33:34 2023 Received: (at 66099) by debbugs.gnu.org; 2 Oct 2023 19:33:34 +0000 Received: from localhost ([127.0.0.1]:38100 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qnOfe-0004rP-0u for submit@debbugs.gnu.org; Mon, 02 Oct 2023 15:33:34 -0400 Received: from planete-kraus.eu ([89.234.140.182]:53210) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qnOfc-0004rG-9S for 66099@debbugs.gnu.org; Mon, 02 Oct 2023 15:33:33 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id e71bbcee; Mon, 2 Oct 2023 19:33:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:cc:date:in-reply-to:references :content-type:content-transfer-encoding:mime-version; s= albinoniB; bh=Un+9JfHJ3Cf0p8UkHTtzV+NyLxQ=; b=XZFsh/rffb6S4wH9D/ t0gCRbDmAkGFhXgy+hrFsEgaLXdzT3JMJtUT4W4Zry8Te0R99A0nahaD/CQiswLc y5VX0aKZoXVLTBI/2SVTxD5coxK+w0j5K3kc9TCWJpEX3ttfYa3tNNjddKB5A3OY CSuEt6zA04tE/6Zdj1TMGy1WogpGgU/DdJ2CN2KkFiNaORiMM0mxAkhwrDIcbTRW 6rFCcon3VNU2a211JLcNk1e+LMv9WL1H5Fn7V7cLp1ddXSEPTVOeJ1fnFwSGeOZm kmK21/ktCTVns31QwPenCwghejl2eAhZu9EtH9LHeuLbmrzMUGnmxUmnkfO8on3/ C4ig== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 95e0f456 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 2 Oct 2023 19:33:13 +0000 (UTC) Message-ID: <525efd48e0848f0e6f11dc51c8fcd710d6f78f8f.camel@planete-kraus.eu> Subject: Re: [PATCH gnome-team v4 1/4] gnu: eudev: Update libudev version to 251. From: Vivien Kraus To: Liliana Marie Prikler , 66099@debbugs.gnu.org Date: Mon, 02 Oct 2023 21:33:11 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi! Le lundi 02 octobre 2023 =C3=A0 19:12 +0200, Liliana Marie Prikler a =C3=A9= crit=C2=A0: > Am Dienstag, dem 19.09.2023 um 13:23 +0200 schrieb Vivien Kraus: > > +=C2=A0=C2=A0=C2=A0 (native-search-paths > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (list (search-path-specification > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 (variable "UDEV_HWDB_PATH") > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 (files '("lib/udev/hwdb.d"))) > Question for understanding this correctly: Is UDEV_HWDB_PATH honoured > for more than just UDEV_HWDB_BIN below or is this a "first file wins" > kind of deal? Every entry in UDEV_HWDB_PATH is search for files named "*.hwdb". All files from any entry in UDEV_HWDB_PATH is used to generate hwdb.bin, but if two files have the same name in different directories, then only the first file is considered. This is just for udevadm hwdb --update. UDEV_HWDB_BIN is the single location for a hwdb.bin for libudev at run- time. Since hwdb.bin is a complete index, eudev only loads 1 instance in memory, so there is no need for it to be a search path. This is a simple environment variable. I will update the udev-service-type instead of a profile hook. Best regards, Vivien From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 03 21:00:46 2023 Received: (at 66099) by debbugs.gnu.org; 4 Oct 2023 01:00:46 +0000 Received: from localhost ([127.0.0.1]:40982 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qnqFp-0006dF-QS for submit@debbugs.gnu.org; Tue, 03 Oct 2023 21:00:46 -0400 Received: from mail-qv1-xf2b.google.com ([2607:f8b0:4864:20::f2b]:53354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qnqFl-0006cv-Ir for 66099@debbugs.gnu.org; Tue, 03 Oct 2023 21:00:43 -0400 Received: by mail-qv1-xf2b.google.com with SMTP id 6a1803df08f44-65b162328edso8693836d6.2 for <66099@debbugs.gnu.org>; Tue, 03 Oct 2023 18:00:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696381218; x=1696986018; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=6H1F/pU0+J3qC52cXTRAIcn7B7G8IfVLYDaKBu2cnVg=; b=DxAFECLnM5U+bb1PqnFH6zZG1rt0XSP9/alrC5FUsdxwLtIGKz7+BmRxuRunnVUj3a kHSCvK7ggJzz14lT/8oTjAx/3WzZkV1c2L9GFiWcXQnzs7F3KXZRBGC+B4oBAM5PtNq0 1PnpFWIoao6SrSg0koakJFdcU7A5WI026yLuYPNa2xtuiOsbuN5WVQjeC9BK2B5y4QxX v8236x3fDDgJR+qcw+I7xiX10t31s7dxl51AdZEsOMwxDXOuDFsgfPxZGqdK3uTaAz2o jKAex9PIRt1rLLg2QHxCdekaQ9OMHW+9LX52aazaENnHGCiDJ8jG85IAvLBgPuRSxYwy 5vwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696381218; x=1696986018; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=6H1F/pU0+J3qC52cXTRAIcn7B7G8IfVLYDaKBu2cnVg=; b=TpzdJQHM7EjvDR5Qk5bD69XyCIVi47tvG/d5qWcuAAwrq3ywhpKs7/HgnZhWQZo5B7 2dep2INt1rk3G3mfBT/lIct/FVMWL12KXnPjWSW2KQp8jHoKTWckzpTuZ7m1oZ7nyXkq 9WuA+lp6h9SMIx846+nA5S+gM9CRaW4dsKH/H+lc/lJWRw/AmeSR/O+ir1n5t8SbcYGX Ql6TLyNPMJYGHUDNqG9OZ7fHZqB8MiWD8p9GnrbdLP63BVlOjq0LNF657TAJXoC5aMJ0 u1SkUFhR6jVQTXyBk4WvSXIMdJ1Cy4AQRMTVFN2wYxvbkDXy8FPJkhCok/HyP9JnPou1 9BDw== X-Gm-Message-State: AOJu0YzNC7yr2aKBwu1c+xWIgUttPqTPe92r2wNk7aRUrVSwfxGzkT+5 7hmlWwSDEXY5JdSpf87iTKw= X-Google-Smtp-Source: AGHT+IETSsvPQS9fwZ0PybNulukcEqi/wPTF+kSHZfwpLKSuzx1/+DEhRRADpb1cC8Yg1AqYqrwVRQ== X-Received: by 2002:a05:6214:a0c:b0:64f:539b:f52a with SMTP id dw12-20020a0562140a0c00b0064f539bf52amr929428qvb.20.1696381218369; Tue, 03 Oct 2023 18:00:18 -0700 (PDT) Received: from hurd (dsl-141-24.b2b2c.ca. [66.158.141.24]) by smtp.gmail.com with ESMTPSA id v12-20020a0cdd8c000000b0064f3b0d0143sm899497qvk.142.2023.10.03.18.00.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 18:00:17 -0700 (PDT) From: Maxim Cournoyer To: Vivien Kraus Subject: Re: [PATCH gnome-team v4 1/4] gnu: eudev: Update libudev version to 251. References: <525efd48e0848f0e6f11dc51c8fcd710d6f78f8f.camel@planete-kraus.eu> Date: Tue, 03 Oct 2023 21:00:16 -0400 In-Reply-To: <525efd48e0848f0e6f11dc51c8fcd710d6f78f8f.camel@planete-kraus.eu> (Vivien Kraus's message of "Mon, 02 Oct 2023 21:33:11 +0200") Message-ID: <87cyxv6w2n.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: 66099@debbugs.gnu.org, Liliana Marie Prikler , rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Vivien Kraus writes: > Hi! > > Le lundi 02 octobre 2023 =C3=A0 19:12 +0200, Liliana Marie Prikler a =C3= =A9crit=C2=A0: >> Am Dienstag, dem 19.09.2023 um 13:23 +0200 schrieb Vivien Kraus: >> > +=C2=A0=C2=A0=C2=A0 (native-search-paths >> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (list (search-path-specification >> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 (variable "UDEV_HWDB_PATH") >> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 (files '("lib/udev/hwdb.d"))) >> Question for understanding this correctly: Is UDEV_HWDB_PATH honoured >> for more than just UDEV_HWDB_BIN below or is this a "first file wins" >> kind of deal? > > Every entry in UDEV_HWDB_PATH is search for files named "*.hwdb". All > files from any entry in UDEV_HWDB_PATH is used to generate hwdb.bin, > but if two files have the same name in different directories, then only > the first file is considered. This is just for udevadm hwdb --update. > > UDEV_HWDB_BIN is the single location for a hwdb.bin for libudev at run- > time. Since hwdb.bin is a complete index, eudev only loads 1 instance > in memory, so there is no need for it to be a search path. This is a > simple environment variable. > > I will update the udev-service-type instead of a profile hook. As discussed in #guix, this approach sounds good to me! Thanks to Liliana for suggesting it. --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 04 06:02:29 2023 Received: (at 66099) by debbugs.gnu.org; 4 Oct 2023 10:02:30 +0000 Received: from localhost ([127.0.0.1]:41604 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qnyi5-0003Oy-JD for submit@debbugs.gnu.org; Wed, 04 Oct 2023 06:02:29 -0400 Received: from planete-kraus.eu ([89.234.140.182]:34064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qnyi3-0003On-BI for 66099@debbugs.gnu.org; Wed, 04 Oct 2023 06:02:28 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 30f0cacf; Wed, 4 Oct 2023 10:02:07 +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:mime-version :content-type:content-transfer-encoding:to:cc; s=albinoniB; bh=z degA0f+6GRynZMB9SKxJTld6sg=; b=leoyycPAI5LbmGLH1OawJ5gc/dk8XI2WP lXGfMGFv/BHd7vo5DwLL6e0VZYQoPj29p4UQIrT/GBHLr+XcBhM0c5M9jrL0/oYk ggi1xTKto6rbvsmS90DGomP+yPmZoyXS4kJ/V+np8571wPeTOG/Ps7tvighlnNdT 5TF+e/vXBIMB2Q3gFZFj/A7FiF1bTcTRZrdML6xfYHs0h8rWSnhwC+0RXNdKRRSL 6ZFmWnT2rUA0NeoPuSItbOLlCbXslmzNGwi3Jh9dt52y9RbLvwXbF0spVAnVL0uU rXyFZHCYn9h73Gmn/X77QVFstWBzuNvv4SR3zrajbfp25sKsOQy3Q== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id b5dbe55c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 4 Oct 2023 10:02:07 +0000 (UTC) Message-ID: In-Reply-To: , <15094b9735aedadd8e86b7c6c07ab53619b3e589.camel@gmail.com>, , <0a7a4690a881ab96b46df519a2f7c32c227e2ed6.camel@gmail.com> References: ,<15094b9735aedadd8e86b7c6c07ab53619b3e589.camel@gmail.com> , ,<0a7a4690a881ab96b46df519a2f7c32c227e2ed6.camel@gmail.com> From: Vivien Kraus Date: Wed, 4 Oct 2023 12:00:23 +0200 Subject: [PATCH gnome-team v5 0/4] Update eudev and udev-service-type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: Liliana Marie Prikler ,maxim.cournoyer@gmail.com,66099@debbugs.gnu.org User-Agent: Evolution 3.46.4 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Dear guix, In this version, I removed the profile hook, and instead generated the hwdb.bin as part of the udev-service-type. What do you think? Best regards, Vivien Vivien Kraus (4): gnu: eudev: Update libudev version to 251. gnu: udev-service-type: accept hwdb file extensions. gnu: libgudev: Update to 238. gnu: upower: Update to 1.90.2. doc/guix.texi | 52 +++++++-- gnu/local.mk | 1 + gnu/packages/gnome.scm | 43 +++++--- gnu/packages/linux.scm | 55 +++++++--- .../patches/eudev-rules-directory.patch | 9 +- .../patches/eudev-set-version-to-3.2.12.patch | 25 +++++ gnu/services/base.scm | 103 ++++++++++++++---- 7 files changed, 217 insertions(+), 71 deletions(-) create mode 100644 gnu/packages/patches/eudev-set-version-to-3.2.12.patch base-commit: b18b2d13488f2a92331ccad2dc8cbb54ee15582f -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 04 06:02:45 2023 Received: (at 66099) by debbugs.gnu.org; 4 Oct 2023 10:02:45 +0000 Received: from localhost ([127.0.0.1]:41607 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qnyiH-0003PS-Ug for submit@debbugs.gnu.org; Wed, 04 Oct 2023 06:02:45 -0400 Received: from planete-kraus.eu ([89.234.140.182]:34064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qnyiC-0003On-M6 for 66099@debbugs.gnu.org; Wed, 04 Oct 2023 06:02:40 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 2f364442; Wed, 4 Oct 2023 10:02:17 +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:mime-version :content-type:content-transfer-encoding:to:cc; s=albinoniB; bh=h 2+Q5ja6OZF2TbkPqAMhSW+hyfw=; b=KZZU7jElNABXfrViWuh0EMPl01VIt709h PMyUb971Pi6984bZLhSmq80Ivx5KGOHxurAPOrqS8PaVjS7xMOBBZsgwkZwfvYJJ vNDT+GB6TRHFjL/j0zZHPwjMTY8itIBsXI6ziC3ngZXZUaDfJfGJP0Vctysz6Tde hqjFqwD9m12P3mvhFVUptSIT/dPlkHQAwTF/5TBUT9kRuGTIFqckZfgxyuf05ttq IoNy5PUQiCkc9zHZDYnE23uJTp5t+7rF9F+r9WUaHDArr2lH6JvFmWvxy9HH5Q6g fpVqlYMY6bWU8Ir2Y/YkTsoX40tJtMaEelyifDR7mEE7zAuvcU9cA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 3a6c98da (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 4 Oct 2023 10:02:17 +0000 (UTC) Message-ID: In-Reply-To: References: , <15094b9735aedadd8e86b7c6c07ab53619b3e589.camel@gmail.com>, , <0a7a4690a881ab96b46df519a2f7c32c227e2ed6.camel@gmail.com> From: Vivien Kraus Date: Tue, 19 Sep 2023 13:23:22 +0200 Subject: [PATCH gnome-team v5 1/4] gnu: eudev: Update libudev version to 251. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: Liliana Marie Prikler ,maxim.cournoyer@gmail.com,66099@debbugs.gnu.org User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Eudev has significant improvements from 3.2.12, but they are not released yet. The package version number has already been bumped to 3.2.14, but since it is not released yet, the version number is dow [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Eudev has significant improvements from 3.2.12, but they are not released yet. The package version number has already been bumped to 3.2.14, but since it is not released yet, the version number is dow [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Eudev has significant improvements from 3.2.12, but they are not released yet. The package version number has already been bumped to 3.2.14, but since it is not released yet, the version number is downgraded to 3.2.12. Everything that eudev searches in "sysconf" (/etc/udev/*) is actually searched under its installation prefix. The udev-service-type however prepares every file in /etc/udev, without a prefix. Eudev has a hardware database that installs descriptions of hardware in /etc, but they should go to /lib prior to being used. The build system can’t install to /etc, and should not, because this directory is owned by the udev-service-type. So they are installed directly in /lib. Another file, an empty /etc/udev.conf, is simply ignored. The hwdb.bin file used to be generated in /etc/udev/hwdb.bin, but since the sysconf dir is now directly /etc, the hwdb.bin index will not be found under /etc/udev/hwdb.bin. * gnu/packages/linux.scm (eudev): Update to a post-v3.2.12 commit. [#:phases] : New phase. : New phase. : Remove phase. [#:configure-flags]: Set sysconfdir to avoid a prefix. [native-search-paths]: Add UDEV_HWDB_PATH. * gnu/packages/patches/eudev-set-version-to-3.2.12.patch: New file. * gnu/packages/linux.scm (eudev): Use it here. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/patches/eudev-rules-directory.patch: Rebase it. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 55 +++++++++++++------ .../patches/eudev-rules-directory.patch | 9 +-- .../patches/eudev-set-version-to-3.2.12.patch | 25 +++++++++ 4 files changed, 69 insertions(+), 21 deletions(-) create mode 100644 gnu/packages/patches/eudev-set-version-to-3.2.12.patch diff --git a/gnu/local.mk b/gnu/local.mk index 72c9954492..73beb8daff 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1127,6 +1127,7 @@ dist_patch_DATA = \ %D%/packages/patches/esmini-use-pkgconfig.patch \ %D%/packages/patches/esmtp-add-lesmtp.patch \ %D%/packages/patches/eudev-rules-directory.patch \ + %D%/packages/patches/eudev-set-version-to-3.2.12.patch \ %D%/packages/patches/exercism-disable-self-update.patch \ %D%/packages/patches/extempore-unbundle-external-dependencies.patch \ %D%/packages/patches/extundelete-e2fsprogs-1.44.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 85e3d9845d..e1959fde3d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4263,18 +4263,22 @@ (define-public earlyoom (define-public eudev ;; The post-systemd fork, maintained by Gentoo. + (define commit + "c5bae0b656513463f92808f324f8fcbe34a0b401") + (define revision "1") (package (name "eudev") - (version "3.2.11") + (version (git-version "3.2.12" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/gentoo/eudev") - (commit (string-append "v" version)))) + (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "0dzaqwjnl55f69ird57wb6skahc6l7zs1slsrzqqfhww33icp6av")) - (patches (search-patches "eudev-rules-directory.patch")))) + "0rqyzmp8kcnxiy1hq13pr2syp4krnf6q97xwlr0bwcd6x4grbak4")) + (patches (search-patches "eudev-rules-directory.patch" + "eudev-set-version-to-3.2.12.patch")))) (build-system gnu-build-system) (arguments (list @@ -4285,6 +4289,28 @@ (define-public eudev (substitute* "man/make.sh" (("/usr/bin/xsltproc") (search-input-file (or native-inputs inputs) "/bin/xsltproc"))))) + (add-before 'bootstrap 'install-in-lib + (lambda _ + ;; eudev wants to install its provided hwdb files in /etc, but + ;; we want them in udevlibexecdir. + (copy-file "hwdb/Makefile.am" "hwdb/files.am") + (call-with-output-file "hwdb/Makefile.am" + (lambda (port) + (format port "udevhwdblibdir = $(udevlibexecdir)/hwdb.d\n") + (format port "include ./files.am"))) + (substitute* "hwdb/files.am" + (("dist_udevhwdb_DATA =") + "dist_udevhwdblib_DATA =")) + ;; eudev wants to install a template udev.conf into /etc, but we + ;; do not care. + (substitute* "src/udev/Makefile.am" + (("dist_udevconf_DATA =") + "dist_noinst_DATA =")) + ;; eudev thinks we want to make sure /etc/udev/rules.d exists + ;; when installing - we do not. + (substitute* "rules/Makefile.am" + (("\\$\\(MKDIR_P\\) \\$\\(DESTDIR\\)\\$\\(udevconfdir\\)/rules\\.d") + "true")))) (add-after 'install 'move-static-library (lambda _ (let ((source (string-append #$output "/lib/libudev.a")) @@ -4296,19 +4322,14 @@ (define-public eudev ;; such that Libtool looks for it in the usual places. (substitute* (string-append #$output "/lib/libudev.la") (("old_library=.*") - "old_library=''\n"))))) - (add-after 'install 'build-hwdb - (lambda _ - ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and - ;; similar tools to display product names. - ;; - ;; XXX: This can't be done when cross-compiling. Find another way - ;; to generate hwdb.bin for cross-built systems. - #$@(if (%current-target-system) - #~(#t) - #~((invoke (string-append #$output "/bin/udevadm") - "hwdb" "--update")))))) - #:configure-flags #~(list "--enable-manpages"))) + "old_library=''\n")))))) + #:configure-flags + #~(list "--enable-manpages" + "--sysconfdir=/etc"))) + (native-search-paths + (list (search-path-specification + (variable "UDEV_HWDB_PATH") + (files '("lib/udev/hwdb.d"))))) (native-inputs (list autoconf automake diff --git a/gnu/packages/patches/eudev-rules-directory.patch b/gnu/packages/patches/eudev-rules-directory.patch index 54fc01c6d5..c4b1cfae39 100644 --- a/gnu/packages/patches/eudev-rules-directory.patch +++ b/gnu/packages/patches/eudev-rules-directory.patch @@ -4,9 +4,9 @@ The old udev 182 supported $UDEV_CONFIG_FILE, which in turn allowed the search path to be customized, but eudev no longer has this, hence this hack. ---- eudev-3.1.5/src/udev/udev-rules.c 2015-10-13 06:22:14.000000000 +0800 -+++ eudev-3.1.5/src/udev/udev-rules.c 2015-10-16 20:45:38.491934336 +0800 -@@ -47,15 +47,11 @@ +--- a/src/udev/udev-rules.c ++++ b/src/udev/udev-rules.c +@@ -48,16 +48,11 @@ struct uid_gid { }; }; @@ -20,11 +20,12 @@ this hack. - "/lib/udev/rules.d", - "/usr/lib/udev/rules.d", -#endif +- "/usr/local/lib/udev/rules.d", + NULL, /* placeholder for $EUDEV_RULES_DIRECTORY */ NULL}; struct udev_rules { -@@ -1704,6 +1700,9 @@ +@@ -1718,6 +1713,9 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) { udev_rules_check_timestamp(rules); diff --git a/gnu/packages/patches/eudev-set-version-to-3.2.12.patch b/gnu/packages/patches/eudev-set-version-to-3.2.12.patch new file mode 100644 index 0000000000..9221269e08 --- /dev/null +++ b/gnu/packages/patches/eudev-set-version-to-3.2.12.patch @@ -0,0 +1,25 @@ +From 6a8fdb8a14dc9e0480c68426edcf3f4b55e9cfe3 Mon Sep 17 00:00:00 2001 +Message-ID: <6a8fdb8a14dc9e0480c68426edcf3f4b55e9cfe3.1696356960.git.vivien@planete-kraus.eu> +From: Vivien Kraus +Date: Tue, 3 Oct 2023 20:15:48 +0200 +Subject: [PATCH] Revert "bump version to 3.2.14" + +This reverts commit df220edbc585d2e7a08ed8ad90770fefd0e60bb5. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 0d9a135bc..069fdfb87 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,5 +1,5 @@ + AC_PREREQ([2.68]) +-AC_INIT([eudev],[3.2.14],[https://github.com/gentoo/eudev/issues]) ++AC_INIT([eudev],[3.2.12],[https://github.com/gentoo/eudev/issues]) + AC_SUBST(UDEV_VERSION, 251) + AC_CONFIG_SRCDIR([src/udev/udevd.c]) + +-- +2.41.0 + -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 04 06:02:54 2023 Received: (at 66099) by debbugs.gnu.org; 4 Oct 2023 10:02:54 +0000 Received: from localhost ([127.0.0.1]:41610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qnyiT-0003Pq-KS for submit@debbugs.gnu.org; Wed, 04 Oct 2023 06:02:54 -0400 Received: from planete-kraus.eu ([89.234.140.182]:34064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qnyiR-0003On-MI for 66099@debbugs.gnu.org; Wed, 04 Oct 2023 06:02:52 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 49fd8351; Wed, 4 Oct 2023 10:02:32 +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=P8DWGs8iChk95tviP8qgTVFed04=; b=T 8SfvdXUA6ZzzdpcRZYJpRhvGm1NJEt3rMEssETVGhhjs2nVuccgI3blltGQosE8P eJzPv8tf+LWMvVhOOONV4qjrCX1R+v0aW4Ok728Zh/nyouH2iiDOskwcHjtC9df7 /rTDBFS5KGAb3SeHT4qfpRgahZ1b/0UmFVduvcFgou1ZsiA1vGPSIPz96tyS4NQY 5bL9liGmeJiXXn3VKit1UFgfZ5jmR0OYM62ATX6BVN411/barq8Tb/Ot6NVwOXVv D5BFoGpfdrsHhApOgHYr3+fe9KsPFaci58NncI+4pASBT/x3kcIGBMIoj1dURQwc BI4ly9r0KfCJNJps1ynTQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id cf7e4896 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 4 Oct 2023 10:02:32 +0000 (UTC) Message-ID: In-Reply-To: References: , <15094b9735aedadd8e86b7c6c07ab53619b3e589.camel@gmail.com>, , <0a7a4690a881ab96b46df519a2f7c32c227e2ed6.camel@gmail.com> From: Vivien Kraus Date: Mon, 2 Oct 2023 21:08:49 +0200 Subject: [PATCH gnome-team v5 2/4] gnu: udev-service-type: accept hwdb file extensions. To: Liliana Marie Prikler ,maxim.cournoyer@gmail.com,66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) The "rules" field in the udev-configuration record can now hold both rules and hwdb files. The udev-rules-union has been made generic, so that it works with either rules or hwdb files. Some udev-related auxiliary functions in (gnu services base) had non-texinfo variable references in their docstrings ("FILE-NAME" instead of "@var{file-name}"). udev-rule and file->udev-rule have very similar effects. file->udev-rule operates on a file-like, and udev-rule on plain string contents. Now udev-rule calls file->udev-rule with a plain-file file-like object. The contents of the /etc directory now includes hwdb.d and hwdb.bin, which is computed immediately. The documentation has been reworked so as to explain why creating udev rules or hwdb needs helper functions for configuration or extension. The hwdb.bin file is conditionally computed by a native version of eudev, that may be configured in the udev-service-type configuration. The condition is that both target and native eudev have the same version. If so, we can reasonably expect that the hwdb.bin file created by native eudev can later be read by target eudev. * gnu/services/base.scm (udev-things-union): Make udev-rules-union generic. (udev-rules-union): Use udev-things-union. (udev-hwdb-union): New function. (udev-rule): Fix docstring and call file->udev-rule. (udev-hwdb): New function. (file->udev-rule): Fix docstring. (file->udev-hwdb): New function. (udev-rules-service): Fix docstring. (udev-hwdb-service): New function. (udev-etc): Add hwdb.d and hwdb.bin. (module): Export udev-hwdb, file->udev-hwdb, and udev-hwdb-service. (): Add the native-udev field. * doc/guix.texi (Base Services)[udev-service-type]: Explain configuration and extension values. * doc/guix.texi (Base Services)[udev-hwdb]: Document it. [udev-hwdb-service]: Same. * doc/guix.texi (Base Services)[udev-configuration]: Document the native-udev field. --- doc/guix.texi | 52 +++++++++++++++++---- gnu/services/base.scm | 103 +++++++++++++++++++++++++++++++++--------- 2 files changed, 123 insertions(+), 32 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 46591b2f64..3310271ec8 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -19322,9 +19322,23 @@ Base Services @file{/dev} directory dynamically, whose value is a @code{} object. -This service type can be @emph{extended} using procedures -@code{udev-rules-service} along with @code{file->udev-rule} or -@code{udev-rule} which simplify the process of writing udev rules. +Since the file names for udev rules and hwdb files matters, the +configuration items for rules and hwdb cannot simply be plain file-like +objects with the rules content, because the name would be +ignored. Instead, they are directory file-like objects that contain +optional rules in @code{lib/udev/rules.d} and optional hwdb files in +@code{lib/udev/hwdb.d}. This way, the service can be configured with +whole packages from which to take rules and hwdb files. + +The @code{udev-service-type} can be @emph{extended} with file-like +directories that respect this hierarchy. However, to generate a +configuration or an extension, it is advised to use @code{udev-rule} and +@code{file->udev-rule} for rules, and @code{udev-hwdb} and +@code{file->udev-hwdb} for hwdb files. + +In an operating-system declaration, this service type can be +@emph{extended} using procedures @code{udev-rules-service} and +@code{udev-hwdb-service}. @end defvar @deftp {Data Type} udev-configuration @@ -19334,8 +19348,18 @@ Base Services @item @code{udev} (default: @code{eudev}) (type: file-like) Package object of the udev service. +@item @code{native-udev} (default: @code{eudev}) (type: file-like) +Native udev package to compile @code{hwdb.bin}. The trie format used for +@code{hwdb.bin} must be compatible with the @code{udev} and +@code{native-udev} fields of the udev configuration. To avoid generating +@code{hwdb.bin}, pass @code{#f} as the @code{native-udev} field. + +In any case, if the package version string differs between @code{udev} +and @code{native-udev}, @code{hwdb.bin} is @strong{not} created. + @item @code{rules} (default: @var{'()}) (type: list-of-file-like) -List of file-like objects denoting udev-rule files. +List of file-like objects denoting udev-rule or udev-hwdb files under a +sub-directory. @end table @end deftp @@ -19358,6 +19382,11 @@ Base Services @end lisp @end deffn +@deffn {Procedure} udev-hwdb @var{file-name} @var{contents} +Return a udev-hwdb file named @var{file-name} containing the hardware +information @var{contents}. +@end deffn + @deffn {Procedure} udev-rules-service @var{name} @var{rules} [#:groups '()] Return a service that extends @code{udev-service-type} with @var{rules} and @code{account-service-type} with @var{groups} as system groups. @@ -19377,6 +19406,11 @@ Base Services @end lisp @end deffn +@deffn {Procedure} udev-hwdb-service @var{name} @var{hwdb} +Return a service that extends @code{udev-service-type} with +@var{hwdb}. The service name is @code{@var{name}-udev-hwdb}. +@end deffn + @deffn {Procedure} file->udev-rule @var{file-name} @var{file} Return a udev-rule file named @var{file-name} containing the rules defined within @var{file}, a file-like object. @@ -19401,12 +19435,10 @@ Base Services @end lisp @end deffn -Additionally, Guix package definitions can be included in @var{rules} in -order to extend the udev rules with the definitions found under their -@file{lib/udev/rules.d} sub-directory. In lieu of the previous -@var{file->udev-rule} example, we could have used the -@var{android-udev-rules} package which exists in Guix in the @code{(gnu -packages android)} module. +@deffn {Procedure} file->udev-hwdb @var{file-name} @var{file} +Return a udev-hwdb file named @var{file-name} containing the rules +defined within @var{file}, a file-like object. +@end deffn The following example shows how to use the @var{android-udev-rules} package so that the Android tool @command{adb} can detect devices diff --git a/gnu/services/base.scm b/gnu/services/base.scm index b3f2d2e8b8..c813293697 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -81,6 +81,7 @@ (define-module (gnu services base) #:select (mount-flags->bit-mask swap-space->flags-bit-mask)) #:use-module (guix gexp) + #:use-module ((guix packages) #:select (package-version)) #:use-module (guix records) #:use-module (guix modules) #:use-module (guix pki) @@ -153,8 +154,11 @@ (define-module (gnu services base) udev-service-type udev-service ; deprecated udev-rule + udev-hwdb file->udev-rule + file->udev-hwdb udev-rules-service + udev-hwdb-service login-configuration login-configuration? @@ -2181,11 +2185,14 @@ (define-record-type* udev-configuration? (udev udev-configuration-udev ;file-like (default eudev)) - (rules udev-configuration-rules ;list of file-like + (native-udev udev-configuration-native-udev + (default eudev)) + (rules udev-configuration-rules ;list of rule- and + ;hwdb-providing packages (default '()))) -(define (udev-rules-union packages) - "Return the union of the @code{lib/udev/rules.d} directories found in each +(define (udev-things-union what packages) + "Return the union of the @code{lib/udev/@var{what}.d} directories found in each item of @var{packages}." (define build (with-imported-modules '((guix build union) @@ -2197,7 +2204,8 @@ (define (udev-rules-union packages) (srfi srfi-26)) (define %standard-locations - '("/lib/udev/rules.d" "/libexec/udev/rules.d")) + '(#$(string-append "/lib/udev/" what ".d") + #$(string-append "/libexec/udev/" what ".d"))) (define (rules-sub-directory directory) ;; Return the sub-directory of DIRECTORY containing udev rules, or @@ -2208,10 +2216,27 @@ (define (udev-rules-union packages) (union-build #$output (filter-map rules-sub-directory '#$packages))))) - (computed-file "udev-rules" build)) + (computed-file (string-append "udev-" what) build)) + +(define (udev-rules-union packages) + (udev-things-union "rules" packages)) + +(define (udev-hwdb-union packages) + (udev-things-union "hwdb" packages)) (define (udev-rule file-name contents) - "Return a directory with a udev rule file FILE-NAME containing CONTENTS." + "Return a directory with a udev rule file @var{file-name} containing +@var{contents}." + (file->udev-rule file-name (plain-file file-name contents))) + +(define (udev-hwdb file-name contents) + "Return a directory with a udev hwdb file @var{file-name} containing +@var{contents}." + (file->udev-hwdb file-name (plain-file file-name contents))) + +(define (file->udev-rule file-name file) + "Return a directory with a udev rule file @var{file-name} which is a copy of +@var{file}." (computed-file file-name (with-imported-modules '((guix build utils)) #~(begin @@ -2220,26 +2245,27 @@ (define (udev-rule file-name contents) (define rules.d (string-append #$output "/lib/udev/rules.d")) + (define file-copy-dest + (string-append rules.d "/" #$file-name)) + (mkdir-p rules.d) - (call-with-output-file - (string-append rules.d "/" #$file-name) - (lambda (port) - (display #$contents port))))))) + (copy-file #$file file-copy-dest))))) -(define (file->udev-rule file-name file) - "Return a directory with a udev rule file FILE-NAME which is a copy of FILE." +(define (file->udev-hwdb file-name file) + "Return a directory with a udev hwdb file @var{file-name} which is a copy of +@var{file}." (computed-file file-name (with-imported-modules '((guix build utils)) #~(begin (use-modules (guix build utils)) - (define rules.d - (string-append #$output "/lib/udev/rules.d")) + (define hwdb.d + (string-append #$output "/lib/udev/hwdb.d")) (define file-copy-dest - (string-append rules.d "/" #$file-name)) + (string-append hwdb.d "/" #$file-name)) - (mkdir-p rules.d) + (mkdir-p hwdb.d) (copy-file #$file file-copy-dest))))) (define kvm-udev-rule @@ -2349,13 +2375,33 @@ (define udev.conf (define (udev-etc config) (match-record config - (udev rules) + (udev native-udev rules) + (let* ((hwdb.d + (udev-hwdb-union (cons* udev rules))) + (hwdb.bin + (and native-udev + (equal? (package-version udev) + (package-version native-udev)) + (computed-file + "hwdb.bin" + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + (setenv "UDEV_HWDB_PATH" #$hwdb.d) + (invoke #+(file-append native-udev "/bin/udevadm") + "hwdb" + "--update" + "-o" #$output))))))) `(("udev" ,(file-union "udev" `(("udev.conf" ,udev.conf) ("rules.d" ,(udev-rules-union (cons* udev kvm-udev-rule - rules))))))))) + rules))) + ("hwdb.d" ,hwdb.d) + ,@(if hwdb.bin + `(("hwdb.bin" ,hwdb.bin)) + '())))))))) (define udev-service-type (service-type (name 'udev) @@ -2384,10 +2430,10 @@ (define-deprecated (udev-service #:key (udev eudev) (rules '())) (udev-configuration (udev udev) (rules rules)))) (define* (udev-rules-service name rules #:key (groups '())) - "Return a service that extends udev-service-type with RULES and -account-service-type with GROUPS as system groups. This works by creating a -singleton service type NAME-udev-rules, of which the returned service is an -instance." + "Return a service that extends udev-service-type with @var{rules} and +@code{account-service-type} with @var{groups} as system groups. This works by +creating a singleton service type @code{@var{name}-udev-rules}, of which the +returned service is an instance." (let* ((name (symbol-append name '-udev-rules)) (account-extension (const (map (lambda (group) @@ -2404,6 +2450,19 @@ (define* (udev-rules-service name rules #:key (groups '())) (description "This service adds udev rules.")))) (service type #f))) +(define (udev-hwdb-service name hwdb-files) + "Return a service that extends udev-service-type with @var{hwdb-files}, named +@code{@var{name}-udev-hwdb}." + (let* ((name (symbol-append name '-udev-hwdb)) + (udev-extension (const (list hwdb-files))) + (type (service-type + (name name) + (extensions (list + (service-extension + udev-service-type udev-extension))) + (description "This service adds udev hwdb files.")))) + (service type #f))) + (define (swap-space->shepherd-service-name space) (let ((target (swap-space-target space))) (symbol-append 'swap- -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 04 06:03:05 2023 Received: (at 66099) by debbugs.gnu.org; 4 Oct 2023 10:03:06 +0000 Received: from localhost ([127.0.0.1]:41616 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qnyif-0003Qt-Iw for submit@debbugs.gnu.org; Wed, 04 Oct 2023 06:03:05 -0400 Received: from planete-kraus.eu ([89.234.140.182]:53376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qnyid-0003Qb-Qk for 66099@debbugs.gnu.org; Wed, 04 Oct 2023 06:03:04 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 59a0297f; Wed, 4 Oct 2023 10:02:45 +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=8IllG/iUYeuMh4Fe17WtACJeN8U=; b=U UBmjaaAJrnIeaiFs+i/BqLoGkpYYsu9qEQIiwFzUhwId9sDung724CNMzkPmXZU7 pvJZUq8tw1tmVmPeB53T2ylAc/mJ8OhEHI8WvbolLqgVNkHGKRYl1H73cyIcLJhv UlHnyczGeffHH4f4IG9GeH0gDkUHY12WgasxZsemhuzyehA9bA5jaizpturPBIy6 qx7KtiTQr8RzZMNnb9Zc+zTJWkammTI/JQClB/1FE+Y0WRQkvD8L3yWvAcfU4xjH bk/dLrbwODhIcKsRyt1d/9v3H77R2di8oFYdSsFrtmv7U3fvtjNTpUVozAkXRefK Jh0MAu//acW/aH30Bkxkg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id ab97ceeb (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 4 Oct 2023 10:02:44 +0000 (UTC) Message-ID: In-Reply-To: References: , <15094b9735aedadd8e86b7c6c07ab53619b3e589.camel@gmail.com>, , <0a7a4690a881ab96b46df519a2f7c32c227e2ed6.camel@gmail.com> From: Vivien Kraus Date: Tue, 19 Sep 2023 13:32:26 +0200 Subject: [PATCH gnome-team v5 3/4] gnu: libgudev: Update to 238. To: Liliana Marie Prikler ,maxim.cournoyer@gmail.com,66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ea3dc455a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-pl [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ea3dc455a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-pl [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ea3dc455a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-plugins (define-public libgudev (package (name "libgudev") - (version "236") + (version "238") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "094mgjmwgsgqrr1i0vd20ynvlkihvs3vgbmpbrhswjsrdp86j0z5")))) + "1laxgdkgmr30aw44sm4rgpsdybwxx5rszcm8c2y3vmy9myqnl9k1")))) (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 04 06:03:19 2023 Received: (at 66099) by debbugs.gnu.org; 4 Oct 2023 10:03:19 +0000 Received: from localhost ([127.0.0.1]:41619 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qnyis-0003RN-Uw for submit@debbugs.gnu.org; Wed, 04 Oct 2023 06:03:19 -0400 Received: from planete-kraus.eu ([89.234.140.182]:49004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qnyiq-0003RF-RP for 66099@debbugs.gnu.org; Wed, 04 Oct 2023 06:03:17 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 59c5e20c; Wed, 4 Oct 2023 10:02:58 +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:mime-version :content-type:content-transfer-encoding:to:cc; s=albinoniB; bh=U 4Q95r5OzDlerBhawFCb592wjQg=; b=mWwgAx9IkoFO77USD7rZ3N6ceQa8mDocF IA9FADZzjeTdw25xhhh20MtQUERr5RRnPjrNDO2dPdejBV5ANQazs29LuvV1U1ff dpsvaohQUTX6aQSfRnEGYeL82VsbivMyp9Rvoh6j7qWKwQ4dKRqSa9SyXaFFxacm pjDSeG7PeAvHIBqpwr2ULmbyWTeVgRbMH0xsZHtmKt1h9zifySO+qsCnKjNIQLBQ Ijp61GW0LVJe9xCtZb3MGXuBDaPTNvUOGZlOD2Lj7jvKN69T0r16QfNK7b38D9Aq XeU2WuoDtfeOvuyNT3f9ESbywglHVB57KhmzNMmOotvyKJKJTxynQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id da3aa11b (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 4 Oct 2023 10:02:58 +0000 (UTC) Message-ID: In-Reply-To: References: , <15094b9735aedadd8e86b7c6c07ab53619b3e589.camel@gmail.com>, , <0a7a4690a881ab96b46df519a2f7c32c227e2ed6.camel@gmail.com> From: Vivien Kraus Date: Tue, 19 Sep 2023 13:32:46 +0200 Subject: [PATCH gnome-team v5 4/4] gnu: upower: Update to 1.90.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: Liliana Marie Prikler ,maxim.cournoyer@gmail.com,66099@debbugs.gnu.org User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The new eudev now can install hwdb files. Upower has some, but they should get installed in upower’s output, not eudev’s. The phases needed a rework. Now the 32-bit-specific test fix is always there, except it may be empty. Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The new eudev now can install hwdb files. Upower has some, but they should get installed in upower’s output, not eudev’s. The phases needed a rework. Now the 32-bit-specific test fix is always there, except it may be empty. Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager The new eudev now can install hwdb files. Upower has some, but they should get installed in upower’s output, not eudev’s. The phases needed a rework. Now the 32-bit-specific test fix is always there, except it may be empty. test_bluetooth_hidpp_mouse fails, after calling into a bluez dbus method. * gnu/packages/gnome.scm (upower): Update to 1.90.2. [#:configure-flags]: Set udevhwdbdir. [#:phases] : Add this phase unconditionnally : Disable test_bluetooth_hidpp_mouse. [inputs]: Remove dbus-glib. [native-inputs]: Add dbus. --- gnu/packages/gnome.scm | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4ea3dc455a..3f773aae8a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5727,7 +5727,7 @@ (define-public geocode-glib-with-libsoup2 (define-public upower (package (name "upower") - (version "1.90.0") + (version "1.90.2") (source (origin (method git-fetch) @@ -5736,7 +5736,7 @@ (define-public upower (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1g17rm91p8vfpjyb0k2shylrs55nccn3fa890vlk4n9s71sghbzq")) + (base32 "13xp423ycv8imf2cmgf6lii9f01p7x2v19cny7acrmczkc0cqv7d")) (modules '((guix build utils))) (snippet ;; Upstream commit . - (substitute* "src/linux/integration-test.py" - (("assertEqual(.*)40\\.0" _ middle) - (string-append - "assertAlmostEqual" middle "40.0")))))) - #~%standard-phases))) + (string-append "-Dudevrulesdir=" #$output "/bin/udev/rules.d") + (string-append "-Dudevhwdbdir=" #$output "/lib/udev/hwdb.d")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'adjust-test-suite + (lambda _ + ;; This test calls an unimplemented bluez dbus method. + (substitute* "src/linux/integration-test.py" + (("test_bluetooth_hidpp_mouse") + "disabled_test_bluetooth_hidpp_mouse")) + #$@(if (target-x86-32?) + ;; Address test failure caused by excess precision + ;; on i686: + ;; . + '((substitute* "src/linux/integration-test.py" + (("assertEqual(.*)40\\.0" _ middle) + (string-append + "assertAlmostEqual" middle "40.0")))) + '())))))) (native-inputs (list `(,glib "bin") ; for gdbus-codegen gobject-introspection @@ -5785,12 +5791,13 @@ (define-public upower python-packaging python-pygobject umockdev + dbus ;; For man pages. docbook-xsl libxslt ; for 'xsltproc' libxml2)) ; for 'XML_CATALOG_FILES' (inputs - (list dbus-glib libgudev libusb)) + (list libgudev libusb)) (propagated-inputs ;; In Requires of upower-glib.pc. (list glib)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 04 12:53:10 2023 Received: (at 66099) by debbugs.gnu.org; 4 Oct 2023 16:53:10 +0000 Received: from localhost ([127.0.0.1]:45211 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo57V-0005xc-B3 for submit@debbugs.gnu.org; Wed, 04 Oct 2023 12:53:10 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:42348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo57S-0005wz-MW for 66099@debbugs.gnu.org; Wed, 04 Oct 2023 12:53:08 -0400 Received: by mail-ed1-x543.google.com with SMTP id 4fb4d7f45d1cf-536071e79deso156815a12.1 for <66099@debbugs.gnu.org>; Wed, 04 Oct 2023 09:52:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696438362; x=1697043162; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=1IGUt0Vdfo3wAyxKDR8MF239XcooNv4EMU0n64GVvuI=; b=cEtK1XncmQNAUAoeqv+TWxJiG1/fFYS+qnFnaJBzXVaFnQdUJkz1bUSeShEgpEvGyA Z/sgYGLO+QfgRY5ldHwcmx3KSyJHIxiGF5zXkOgBGMpLCRBaEPnuR00TEsPuC0iBwfvb SlW4zkXE7BeZMGW/zRqw+2YO/KgSaM6w8yUR2YrhOUzxNEANWYxJZ3xWlwqOJky/9sTE 1k+GUwPX5xU43hQcsxYZFGv3NMKvgFjq/vIaqlMO+Cysn+ioqIeJTNCPoM2qE797DnXL 2UFo8G8vAomwdVYR4chWXaJWr/moE1A7+PGd0qZ/n6GraGSzX5nkPpjTfw0q7j45oLo3 eQ5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696438362; x=1697043162; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=1IGUt0Vdfo3wAyxKDR8MF239XcooNv4EMU0n64GVvuI=; b=iT7OU6F7VTRyWLnkryyE7LiDIhchT7W76VEyv8iDOhZcxI7owwZdH2Gu0mbq0xJhAm DcTP2G3z+lqdvtMmlnPN+HJaIU5IiTGkr0UGj9c1HgsP5gXD2wz2QX0M10f7oyrjiR/p WizvxGhUDXepx/HOTxDVOonQzCppBU0GDSIV/hqBEhhkBUe6kFu7f3qXDDMxNS4XO4df fLoQoenXfJ6LAwhGeQnTU3o4FyoQqhKoVm+860zMUfk3sN8FwD0jU5aDA3+eWob7zPii +Ms4KCLfEFLw1C/QZnzXI1BiOYpYspncbhQa73PeSKDtETkcyS5PwHAzmHNnnFyggSgD jF+Q== X-Gm-Message-State: AOJu0YwVOkYb+NcRrzweS77Wm+TckXHQboTKaN48R19Oi/8ppB17uTQ6 acq95w/FdoM2glyL5krSCxI= X-Google-Smtp-Source: AGHT+IFAelky/UVszlaD6Md1Q9K/vMCjY6cu2n/E4VFXH3b5C/UHSzq4bIXdawepWlLeePgUnNFLIQ== X-Received: by 2002:a50:fb0c:0:b0:530:8759:a3ac with SMTP id d12-20020a50fb0c000000b005308759a3acmr234510edq.2.1696438361907; Wed, 04 Oct 2023 09:52:41 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id k18-20020aa7c052000000b0053808d83f0fsm130239edo.9.2023.10.04.09.52.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 09:52:40 -0700 (PDT) Message-ID: <42e4b490bce80a94f1afb7f5843d77823058150a.camel@gmail.com> Subject: Re: [PATCH gnome-team v5 2/4] gnu: udev-service-type: accept hwdb file extensions. From: Liliana Marie Prikler To: Vivien Kraus , maxim.cournoyer@gmail.com, 66099@debbugs.gnu.org Date: Wed, 04 Oct 2023 18:52:39 +0200 In-Reply-To: References: ,<15094b9735aedadd8e86b7c6c07ab53619b3e589.camel@gmail.com> , ,<0a7a4690a881ab96b46df519a2f7c32c227e2ed6.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) QW0gTW9udGFnLCBkZW0gMDIuMTAuMjAyMyB1bSAyMTowOCArMDIwMCBzY2hyaWViIFZpdmllbiBL cmF1czoKPiBUaGUgInJ1bGVzIiBmaWVsZCBpbiB0aGUgdWRldi1jb25maWd1cmF0aW9uIHJlY29y ZCBjYW4gbm93IGhvbGQgYm90aAo+IHJ1bGVzIGFuZCBod2RiIGZpbGVzLgo+IAo+IFRoZSB1ZGV2 LXJ1bGVzLXVuaW9uIGhhcyBiZWVuIG1hZGUgZ2VuZXJpYywgc28gdGhhdCBpdCB3b3JrcyB3aXRo Cj4gZWl0aGVyIHJ1bGVzIG9yIGh3ZGIgZmlsZXMuCk1heWJlIHdlIHNob3VsZCByZW5hbWUgdGhp cyB0byB1ZGV2LWNvbmZpZ3VyYXRpb24tdW5pb24gYW5kIGRlcHJlY2F0ZQp0aGUgZm9ybWVyIGlu IGZhdm9yIG9mIHRoZSBsYXR0ZXIgKGlmIGl0IGNhbiBiZSB1c2VkIG91dHNpZGUgb2YgdGhlCm1v ZHVsZSk/Cgo+IFNvbWUgdWRldi1yZWxhdGVkIGF1eGlsaWFyeSBmdW5jdGlvbnMgaW4gKGdudSBz ZXJ2aWNlcyBiYXNlKSBoYWQgbm9uLQo+IHRleGluZm8gdmFyaWFibGUgcmVmZXJlbmNlcyBpbiB0 aGVpciBkb2NzdHJpbmdzICgiRklMRS1OQU1FIiBpbnN0ZWFkCj4gb2YgIkB2YXJ7ZmlsZS1uYW1l fSIpLgo+IAo+IHVkZXYtcnVsZSBhbmQgZmlsZS0+dWRldi1ydWxlIGhhdmUgdmVyeSBzaW1pbGFy IGVmZmVjdHMuIGZpbGUtPnVkZXYtCj4gcnVsZSBvcGVyYXRlcyBvbiBhIGZpbGUtbGlrZSwgYW5k IHVkZXYtcnVsZSBvbiBwbGFpbiBzdHJpbmcgY29udGVudHMuCj4gTm93IHVkZXYtcnVsZSBjYWxs cyBmaWxlLT51ZGV2LXJ1bGUgd2l0aCBhIHBsYWluLWZpbGUgZmlsZS1saWtlCj4gb2JqZWN0LgpJ IHRoaW5rIHRoZSBwYXRjaCB3b3VsZCBiZSBhIGxpdHRsZSBlYXNpZXIgdG8gcmVhZCBpZiB5b3Ug ZGlkIHRoaXMKcmVmYWN0b3JpbmcgaW4gYSBzZXBhcmF0ZSBvbmUuICBUaGUgY29tbWl0IGxvZyB3 b3VsZCByZWFkIHNvbWV0aGluZwpsaWtlOgoKInNlcnZpY2VzOiB1ZGV2OiB1bmlmeSB1ZGV2LXJ1 bGUgYW5kIGZpbmUtPnVkZXYtcnVsZS4KCiogZ251L3NlcnZpY2VzL2Jhc2Uuc2NtICh1ZGV2LXJ1 bGUpOiBJbXBsZW1lbnQgaW4gdGVybXMgb2bCoApmaWxlLT51ZGV2LXJ1bGUuICBVc2UgdGV4aW5m byBpbiBkb2NzdHJpbmcuIgoKPiBUaGUgY29udGVudHMgb2YgdGhlIC9ldGMgZGlyZWN0b3J5IG5v dyBpbmNsdWRlcyBod2RiLmQgYW5kIGh3ZGIuYmluLAo+IHdoaWNoIGlzIGNvbXB1dGVkIGltbWVk aWF0ZWx5Lgo+IAo+IFRoZSBkb2N1bWVudGF0aW9uIGhhcyBiZWVuIHJld29ya2VkIHNvIGFzIHRv IGV4cGxhaW4gd2h5IGNyZWF0aW5nCj4gdWRldiBydWxlcyBvciBod2RiIG5lZWRzIGhlbHBlciBm dW5jdGlvbnMgZm9yIGNvbmZpZ3VyYXRpb24gb3IKPiBleHRlbnNpb24uCj4gCj4gVGhlIGh3ZGIu YmluIGZpbGUgaXMgY29uZGl0aW9uYWxseSBjb21wdXRlZCBieSBhIG5hdGl2ZSB2ZXJzaW9uIG9m Cj4gZXVkZXYsIHRoYXQgbWF5IGJlIGNvbmZpZ3VyZWQgaW4gdGhlIHVkZXYtc2VydmljZS10eXBl IGNvbmZpZ3VyYXRpb24uCj4gVGhlIGNvbmRpdGlvbiBpcyB0aGF0IGJvdGggdGFyZ2V0IGFuZCBu YXRpdmUgZXVkZXYgaGF2ZSB0aGUgc2FtZQo+IHZlcnNpb24uIElmIHNvLCB3ZSBjYW4gcmVhc29u YWJseSBleHBlY3QgdGhhdCB0aGUgaHdkYi5iaW4gZmlsZQo+IGNyZWF0ZWQgYnkgbmF0aXZlIGV1 ZGV2IGNhbiBsYXRlciBiZSByZWFkIGJ5IHRhcmdldCBldWRldi4KPiAKPiAqIGdudS9zZXJ2aWNl cy9iYXNlLnNjbSAodWRldi10aGluZ3MtdW5pb24pOiBNYWtlIHVkZXYtcnVsZXMtdW5pb24KPiBn ZW5lcmljLgo+ICh1ZGV2LXJ1bGVzLXVuaW9uKTogVXNlIHVkZXYtdGhpbmdzLXVuaW9uLgo+ICh1 ZGV2LWh3ZGItdW5pb24pOiBOZXcgZnVuY3Rpb24uCj4gKHVkZXYtcnVsZSk6IEZpeCBkb2NzdHJp bmcgYW5kIGNhbGwgZmlsZS0+dWRldi1ydWxlLgo+ICh1ZGV2LWh3ZGIpOiBOZXcgZnVuY3Rpb24u Cj4gKGZpbGUtPnVkZXYtcnVsZSk6IEZpeCBkb2NzdHJpbmcuCj4gKGZpbGUtPnVkZXYtaHdkYik6 IE5ldyBmdW5jdGlvbi4KPiAodWRldi1ydWxlcy1zZXJ2aWNlKTogRml4IGRvY3N0cmluZy4KPiAo dWRldi1od2RiLXNlcnZpY2UpOiBOZXcgZnVuY3Rpb24uCj4gKHVkZXYtZXRjKTogQWRkIGh3ZGIu ZCBhbmQgaHdkYi5iaW4uCj4gKG1vZHVsZSk6IEV4cG9ydCB1ZGV2LWh3ZGIsIGZpbGUtPnVkZXYt aHdkYiwgYW5kIHVkZXYtaHdkYi1zZXJ2aWNlLgo+ICg8dWRldi1jb25maWd1cmF0aW9uPik6IEFk ZCB0aGUgbmF0aXZlLXVkZXYgZmllbGQuCj4gKiBkb2MvZ3VpeC50ZXhpIChCYXNlIFNlcnZpY2Vz KVt1ZGV2LXNlcnZpY2UtdHlwZV06IEV4cGxhaW4KPiBjb25maWd1cmF0aW9uIGFuZAo+IGV4dGVu c2lvbiB2YWx1ZXMuCj4gKiBkb2MvZ3VpeC50ZXhpIChCYXNlIFNlcnZpY2VzKVt1ZGV2LWh3ZGJd OiBEb2N1bWVudCBpdC4KPiBbdWRldi1od2RiLXNlcnZpY2VdOiBTYW1lLgo+ICogZG9jL2d1aXgu dGV4aSAoQmFzZSBTZXJ2aWNlcylbdWRldi1jb25maWd1cmF0aW9uXTogRG9jdW1lbnQgdGhlCj4g bmF0aXZlLXVkZXYgZmllbGQuCj4gLS0tCj4gwqBkb2MvZ3VpeC50ZXhpwqDCoMKgwqDCoMKgwqDC oCB8wqAgNTIgKysrKysrKysrKysrKysrKystLS0tCj4gwqBnbnUvc2VydmljZXMvYmFzZS5zY20g fCAxMDMgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLQo+IC0tCj4gwqAy IGZpbGVzIGNoYW5nZWQsIDEyMyBpbnNlcnRpb25zKCspLCAzMiBkZWxldGlvbnMoLSkKPiAKPiBk aWZmIC0tZ2l0IGEvZG9jL2d1aXgudGV4aSBiL2RvYy9ndWl4LnRleGkKPiBpbmRleCA0NjU5MWIy ZjY0Li4zMzEwMjcxZWM4IDEwMDY0NAo+IC0tLSBhL2RvYy9ndWl4LnRleGkKPiArKysgYi9kb2Mv Z3VpeC50ZXhpCj4gQEAgLTE5MzIyLDkgKzE5MzIyLDIzIEBAIEJhc2UgU2VydmljZXMKPiDCoEBm aWxley9kZXZ9IGRpcmVjdG9yeSBkeW5hbWljYWxseSwgd2hvc2UgdmFsdWUgaXMgYQo+IMKgQGNv ZGV7PHVkZXYtY29uZmlndXJhdGlvbj59IG9iamVjdC4KPiDCoAo+IC1UaGlzIHNlcnZpY2UgdHlw ZSBjYW4gYmUgQGVtcGh7ZXh0ZW5kZWR9IHVzaW5nIHByb2NlZHVyZXMKPiAtQGNvZGV7dWRldi1y dWxlcy1zZXJ2aWNlfSBhbG9uZyB3aXRoIEBjb2Rle2ZpbGUtPnVkZXYtcnVsZX0gb3IKPiAtQGNv ZGV7dWRldi1ydWxlfSB3aGljaCBzaW1wbGlmeSB0aGUgcHJvY2VzcyBvZiB3cml0aW5nIHVkZXYg cnVsZXMuCj4gK1NpbmNlIHRoZSBmaWxlIG5hbWVzIGZvciB1ZGV2IHJ1bGVzIGFuZCBod2RiIGZp bGVzIG1hdHRlcnMsIHRoZQo+ICtjb25maWd1cmF0aW9uIGl0ZW1zIGZvciBydWxlcyBhbmQgaHdk YiBjYW5ub3Qgc2ltcGx5IGJlIHBsYWluIGZpbGUtCj4gbGlrZQo+ICtvYmplY3RzIHdpdGggdGhl IHJ1bGVzIGNvbnRlbnQsIGJlY2F1c2UgdGhlIG5hbWUgd291bGQgYmUKPiAraWdub3JlZC4gSW5z dGVhZCwgdGhleSBhcmUgZGlyZWN0b3J5IGZpbGUtbGlrZSBvYmplY3RzIHRoYXQgY29udGFpbgo+ ICtvcHRpb25hbCBydWxlcyBpbiBAY29kZXtsaWIvdWRldi9ydWxlcy5kfSBhbmQgb3B0aW9uYWwg aHdkYiBmaWxlcyBpbgo+ICtAY29kZXtsaWIvdWRldi9od2RiLmR9LiBUaGlzIHdheSwgdGhlIHNl cnZpY2UgY2FuIGJlIGNvbmZpZ3VyZWQgd2l0aAo+ICt3aG9sZSBwYWNrYWdlcyBmcm9tIHdoaWNo IHRvIHRha2UgcnVsZXMgYW5kIGh3ZGIgZmlsZXMuCj4gKwo+ICtUaGUgQGNvZGV7dWRldi1zZXJ2 aWNlLXR5cGV9IGNhbiBiZSBAZW1waHtleHRlbmRlZH0gd2l0aCBmaWxlLWxpa2UKPiArZGlyZWN0 b3JpZXMgdGhhdCByZXNwZWN0IHRoaXMgaGllcmFyY2h5LiBIb3dldmVyLCB0byBnZW5lcmF0ZSBh Cj4gK2NvbmZpZ3VyYXRpb24gb3IgYW4gZXh0ZW5zaW9uLCBpdCBpcyBhZHZpc2VkIHRvIHVzZSBA Y29kZXt1ZGV2LXJ1bGV9Cj4gYW5kCj4gK0Bjb2Rle2ZpbGUtPnVkZXYtcnVsZX0gZm9yIHJ1bGVz LCBhbmQgQGNvZGV7dWRldi1od2RifSBhbmQKPiArQGNvZGV7ZmlsZS0+dWRldi1od2RifSBmb3Ig aHdkYiBmaWxlcy4KPiArCj4gK0luIGFuIG9wZXJhdGluZy1zeXN0ZW0gZGVjbGFyYXRpb24sIHRo aXMgc2VydmljZSB0eXBlIGNhbiBiZQo+ICtAZW1waHtleHRlbmRlZH0gdXNpbmcgcHJvY2VkdXJl cyBAY29kZXt1ZGV2LXJ1bGVzLXNlcnZpY2V9IGFuZAo+ICtAY29kZXt1ZGV2LWh3ZGItc2Vydmlj ZX0uCj4gwqBAZW5kIGRlZnZhcgo+IMKgCj4gwqBAZGVmdHAge0RhdGEgVHlwZX0gdWRldi1jb25m aWd1cmF0aW9uCj4gQEAgLTE5MzM0LDggKzE5MzQ4LDE4IEBAIEJhc2UgU2VydmljZXMKPiDCoEBp dGVtIEBjb2Rle3VkZXZ9IChkZWZhdWx0OiBAY29kZXtldWRldn0pICh0eXBlOiBmaWxlLWxpa2Up Cj4gwqBQYWNrYWdlIG9iamVjdCBvZiB0aGUgdWRldiBzZXJ2aWNlLgo+IMKgCj4gK0BpdGVtIEBj b2Rle25hdGl2ZS11ZGV2fSAoZGVmYXVsdDogQGNvZGV7ZXVkZXZ9KSAodHlwZTogZmlsZS1saWtl KQo+ICtOYXRpdmUgdWRldiBwYWNrYWdlIHRvIGNvbXBpbGUgQGNvZGV7aHdkYi5iaW59LiBUaGUg dHJpZSBmb3JtYXQgdXNlZAo+IGZvcgo+ICtAY29kZXtod2RiLmJpbn0gbXVzdCBiZSBjb21wYXRp YmxlIHdpdGggdGhlIEBjb2Rle3VkZXZ9IGFuZAo+ICtAY29kZXtuYXRpdmUtdWRldn0gZmllbGRz IG9mIHRoZSB1ZGV2IGNvbmZpZ3VyYXRpb24uIFRvIGF2b2lkCj4gZ2VuZXJhdGluZwo+ICtAY29k ZXtod2RiLmJpbn0sIHBhc3MgQGNvZGV7I2Z9IGFzIHRoZSBAY29kZXtuYXRpdmUtdWRldn0gZmll bGQuCj4gKwo+ICtJbiBhbnkgY2FzZSwgaWYgdGhlIHBhY2thZ2UgdmVyc2lvbiBzdHJpbmcgZGlm ZmVycyBiZXR3ZWVuCj4gQGNvZGV7dWRldn0KPiArYW5kIEBjb2Rle25hdGl2ZS11ZGV2fSwgQGNv ZGV7aHdkYi5iaW59IGlzIEBzdHJvbmd7bm90fSBjcmVhdGVkLgo+ICsKPiDCoEBpdGVtIEBjb2Rl e3J1bGVzfSAoZGVmYXVsdDogQHZhcnsnKCl9KSAodHlwZTogbGlzdC1vZi1maWxlLWxpa2UpCj4g LUxpc3Qgb2YgZmlsZS1saWtlIG9iamVjdHMgZGVub3RpbmcgdWRldi1ydWxlIGZpbGVzLgo+ICtM aXN0IG9mIGZpbGUtbGlrZSBvYmplY3RzIGRlbm90aW5nIHVkZXYtcnVsZSBvciB1ZGV2LWh3ZGIg ZmlsZXMKPiB1bmRlciBhCj4gK3N1Yi1kaXJlY3RvcnkuCj4gwqAKPiDCoEBlbmQgdGFibGUKPiDC oEBlbmQgZGVmdHAKPiBAQCAtMTkzNTgsNiArMTkzODIsMTEgQEAgQmFzZSBTZXJ2aWNlcwo+IMKg QGVuZCBsaXNwCj4gwqBAZW5kIGRlZmZuCj4gwqAKPiArQGRlZmZuIHtQcm9jZWR1cmV9IHVkZXYt aHdkYiBAdmFye2ZpbGUtbmFtZX0gQHZhcntjb250ZW50c30KPiArUmV0dXJuIGEgdWRldi1od2Ri IGZpbGUgbmFtZWQgQHZhcntmaWxlLW5hbWV9IGNvbnRhaW5pbmcgdGhlCj4gaGFyZHdhcmUKPiAr aW5mb3JtYXRpb24gQHZhcntjb250ZW50c30uCj4gK0BlbmQgZGVmZm4KPiArCj4gwqBAZGVmZm4g e1Byb2NlZHVyZX0gdWRldi1ydWxlcy1zZXJ2aWNlIEB2YXJ7bmFtZX0gQHZhcntydWxlc30KPiBb Izpncm91cHMgJygpXQo+IMKgUmV0dXJuIGEgc2VydmljZSB0aGF0IGV4dGVuZHMgQGNvZGV7dWRl di1zZXJ2aWNlLXR5cGV9IHdpdGgKPiBAdmFye3J1bGVzfQo+IMKgYW5kIEBjb2Rle2FjY291bnQt c2VydmljZS10eXBlfSB3aXRoIEB2YXJ7Z3JvdXBzfSBhcyBzeXN0ZW0gZ3JvdXBzLgo+IEBAIC0x OTM3Nyw2ICsxOTQwNiwxMSBAQCBCYXNlIFNlcnZpY2VzCj4gwqBAZW5kIGxpc3AKPiDCoEBlbmQg ZGVmZm4KPiDCoAo+ICtAZGVmZm4ge1Byb2NlZHVyZX0gdWRldi1od2RiLXNlcnZpY2UgQHZhcntu YW1lfSBAdmFye2h3ZGJ9Cj4gK1JldHVybiBhIHNlcnZpY2UgdGhhdCBleHRlbmRzIEBjb2Rle3Vk ZXYtc2VydmljZS10eXBlfSB3aXRoCj4gK0B2YXJ7aHdkYn0uIFRoZSBzZXJ2aWNlIG5hbWUgaXMg QGNvZGV7QHZhcntuYW1lfS11ZGV2LWh3ZGJ9Lgo+ICtAZW5kIGRlZmZuCj4gKwo+IMKgQGRlZmZu IHtQcm9jZWR1cmV9IGZpbGUtPnVkZXYtcnVsZSBAdmFye2ZpbGUtbmFtZX0gQHZhcntmaWxlfQo+ IMKgUmV0dXJuIGEgdWRldi1ydWxlIGZpbGUgbmFtZWQgQHZhcntmaWxlLW5hbWV9IGNvbnRhaW5p bmcgdGhlIHJ1bGVzCj4gwqBkZWZpbmVkIHdpdGhpbiBAdmFye2ZpbGV9LCBhIGZpbGUtbGlrZSBv YmplY3QuCj4gQEAgLTE5NDAxLDEyICsxOTQzNSwxMCBAQCBCYXNlIFNlcnZpY2VzCj4gwqBAZW5k IGxpc3AKPiDCoEBlbmQgZGVmZm4KPiDCoAo+IC1BZGRpdGlvbmFsbHksIEd1aXggcGFja2FnZSBk ZWZpbml0aW9ucyBjYW4gYmUgaW5jbHVkZWQgaW4KPiBAdmFye3J1bGVzfSBpbgo+IC1vcmRlciB0 byBleHRlbmQgdGhlIHVkZXYgcnVsZXMgd2l0aCB0aGUgZGVmaW5pdGlvbnMgZm91bmQgdW5kZXIK PiB0aGVpcgo+IC1AZmlsZXtsaWIvdWRldi9ydWxlcy5kfSBzdWItZGlyZWN0b3J5LsKgIEluIGxp ZXUgb2YgdGhlIHByZXZpb3VzCj4gLUB2YXJ7ZmlsZS0+dWRldi1ydWxlfSBleGFtcGxlLCB3ZSBj b3VsZCBoYXZlIHVzZWQgdGhlCj4gLUB2YXJ7YW5kcm9pZC11ZGV2LXJ1bGVzfSBwYWNrYWdlIHdo aWNoIGV4aXN0cyBpbiBHdWl4IGluIHRoZQo+IEBjb2RleyhnbnUKPiAtcGFja2FnZXMgYW5kcm9p ZCl9IG1vZHVsZS4KPiArQGRlZmZuIHtQcm9jZWR1cmV9IGZpbGUtPnVkZXYtaHdkYiBAdmFye2Zp bGUtbmFtZX0gQHZhcntmaWxlfQo+ICtSZXR1cm4gYSB1ZGV2LWh3ZGIgZmlsZSBuYW1lZCBAdmFy e2ZpbGUtbmFtZX0gY29udGFpbmluZyB0aGUgcnVsZXMKPiArZGVmaW5lZCB3aXRoaW4gQHZhcntm aWxlfSwgYSBmaWxlLWxpa2Ugb2JqZWN0Lgo+ICtAZW5kIGRlZmZuCj4gwqAKPiDCoFRoZSBmb2xs b3dpbmcgZXhhbXBsZSBzaG93cyBob3cgdG8gdXNlIHRoZSBAdmFye2FuZHJvaWQtdWRldi1ydWxl c30KPiDCoHBhY2thZ2Ugc28gdGhhdCB0aGUgQW5kcm9pZCB0b29sIEBjb21tYW5ke2FkYn0gY2Fu IGRldGVjdCBkZXZpY2VzCj4gZGlmZiAtLWdpdCBhL2dudS9zZXJ2aWNlcy9iYXNlLnNjbSBiL2du dS9zZXJ2aWNlcy9iYXNlLnNjbQo+IGluZGV4IGIzZjJkMmU4YjguLmM4MTMyOTM2OTcgMTAwNjQ0 Cj4gLS0tIGEvZ251L3NlcnZpY2VzL2Jhc2Uuc2NtCj4gKysrIGIvZ251L3NlcnZpY2VzL2Jhc2Uu c2NtCj4gQEAgLTgxLDYgKzgxLDcgQEAgKGRlZmluZS1tb2R1bGUgKGdudSBzZXJ2aWNlcyBiYXNl KQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICM6c2VsZWN0IChtb3VudC1mbGFn cy0+Yml0LW1hc2sKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgIHN3YXAtc3BhY2UtPmZsYWdzLWJpdC1tYXNrKSkKPiDCoMKgICM6dXNlLW1vZHVs ZSAoZ3VpeCBnZXhwKQo+ICvCoCAjOnVzZS1tb2R1bGUgKChndWl4IHBhY2thZ2VzKSAjOnNlbGVj dCAocGFja2FnZS12ZXJzaW9uKSkKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ3VpeCByZWNvcmRzKQo+ IMKgwqAgIzp1c2UtbW9kdWxlIChndWl4IG1vZHVsZXMpCj4gwqDCoCAjOnVzZS1tb2R1bGUgKGd1 aXggcGtpKQo+IEBAIC0xNTMsOCArMTU0LDExIEBAIChkZWZpbmUtbW9kdWxlIChnbnUgc2Vydmlj ZXMgYmFzZSkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgdWRldi1zZXJ2aWNlLXR5cGUKPiDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgdWRldi1zZXJ2aWNlwqAgOyBkZXByZWNhdGVkCj4gwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgIHVkZXYtcnVsZQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKg IHVkZXYtaHdkYgo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBmaWxlLT51ZGV2LXJ1bGUKPiAr wqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBmaWxlLT51ZGV2LWh3ZGIKPiDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgdWRldi1ydWxlcy1zZXJ2aWNlCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqAgdWRl di1od2RiLXNlcnZpY2UKPiDCoAo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBsb2dpbi1jb25m aWd1cmF0aW9uCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGxvZ2luLWNvbmZpZ3VyYXRpb24/ Cj4gQEAgLTIxODEsMTEgKzIxODUsMTQgQEAgKGRlZmluZS1yZWNvcmQtdHlwZSogPHVkZXYtY29u ZmlndXJhdGlvbj4KPiDCoMKgIHVkZXYtY29uZmlndXJhdGlvbj8KPiDCoMKgICh1ZGV2wqDCoCB1 ZGV2LWNvbmZpZ3VyYXRpb24tdWRldsKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDtm aWxlLWxpa2UKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoZGVmYXVsdCBldWRldikpCj4gLcKgIChy dWxlc8KgIHVkZXYtY29uZmlndXJhdGlvbi1ydWxlc8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoCA7bGlzdCBvZiBmaWxlLWxpa2UKPiArwqAgKG5hdGl2ZS11ZGV2IHVkZXYtY29uZmlndXJh dGlvbi1uYXRpdmUtdWRldgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChkZWZhdWx0 IGV1ZGV2KSkKPiArwqAgKHJ1bGVzwqAgdWRldi1jb25maWd1cmF0aW9uLXJ1bGVzwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgIDtsaXN0IG9mIHJ1bGUtIGFuZAo+ICvCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7aHdkYi1wcm92aWRpbmcKPiBwYWNrYWdlcwo+ IMKgwqDCoMKgwqDCoMKgwqDCoMKgIChkZWZhdWx0ICcoKSkpKQo+IMKgCj4gLShkZWZpbmUgKHVk ZXYtcnVsZXMtdW5pb24gcGFja2FnZXMpCj4gLcKgICJSZXR1cm4gdGhlIHVuaW9uIG9mIHRoZSBA Y29kZXtsaWIvdWRldi9ydWxlcy5kfSBkaXJlY3RvcmllcyBmb3VuZAo+IGluIGVhY2gKPiArKGRl ZmluZSAodWRldi10aGluZ3MtdW5pb24gd2hhdCBwYWNrYWdlcykKPiArwqAgIlJldHVybiB0aGUg dW5pb24gb2YgdGhlIEBjb2Rle2xpYi91ZGV2L0B2YXJ7d2hhdH0uZH0gZGlyZWN0b3JpZXMKPiBm b3VuZCBpbiBlYWNoCj4gwqBpdGVtIG9mIEB2YXJ7cGFja2FnZXN9LiIKPiDCoMKgIChkZWZpbmUg YnVpbGQKPiDCoMKgwqDCoCAod2l0aC1pbXBvcnRlZC1tb2R1bGVzICcoKGd1aXggYnVpbGQgdW5p b24pCj4gQEAgLTIxOTcsNyArMjIwNCw4IEBAIChkZWZpbmUgKHVkZXYtcnVsZXMtdW5pb24gcGFj a2FnZXMpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAo c3JmaSBzcmZpLTI2KSkKPiDCoAo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgIChkZWZpbmUgJXN0YW5k YXJkLWxvY2F0aW9ucwo+IC3CoMKgwqDCoMKgwqDCoMKgwqDCoMKgICcoIi9saWIvdWRldi9ydWxl cy5kIiAiL2xpYmV4ZWMvdWRldi9ydWxlcy5kIikpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqAg JygjJChzdHJpbmctYXBwZW5kICIvbGliL3VkZXYvIiB3aGF0ICIuZCIpCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAjJChzdHJpbmctYXBwZW5kICIvbGliZXhlYy91ZGV2LyIgd2hh dCAiLmQiKSkpCj4gwqAKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoZGVmaW5lIChydWxlcy1zdWIt ZGlyZWN0b3J5IGRpcmVjdG9yeSkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgUmV0dXJu IHRoZSBzdWItZGlyZWN0b3J5IG9mIERJUkVDVE9SWSBjb250YWluaW5nIHVkZXYKPiBydWxlcywg b3IKPiBAQCAtMjIwOCwxMCArMjIxNiwyNyBAQCAoZGVmaW5lICh1ZGV2LXJ1bGVzLXVuaW9uIHBh Y2thZ2VzKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgICh1bmlvbi1idWlsZCAjJG91dHB1dAo+IMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGZpbHRlci1tYXAg cnVsZXMtc3ViLWRpcmVjdG9yeQo+ICcjJHBhY2thZ2VzKSkpKSkKPiDCoAo+IC3CoCAoY29tcHV0 ZWQtZmlsZSAidWRldi1ydWxlcyIgYnVpbGQpKQo+ICvCoCAoY29tcHV0ZWQtZmlsZSAoc3RyaW5n LWFwcGVuZCAidWRldi0iIHdoYXQpIGJ1aWxkKSkKPiArCj4gKyhkZWZpbmUgKHVkZXYtcnVsZXMt dW5pb24gcGFja2FnZXMpCj4gK8KgICh1ZGV2LXRoaW5ncy11bmlvbiAicnVsZXMiIHBhY2thZ2Vz KSkKPiArCj4gKyhkZWZpbmUgKHVkZXYtaHdkYi11bmlvbiBwYWNrYWdlcykKPiArwqAgKHVkZXYt dGhpbmdzLXVuaW9uICJod2RiIiBwYWNrYWdlcykpCj4gwqAKPiDCoChkZWZpbmUgKHVkZXYtcnVs ZSBmaWxlLW5hbWUgY29udGVudHMpCj4gLcKgICJSZXR1cm4gYSBkaXJlY3Rvcnkgd2l0aCBhIHVk ZXYgcnVsZSBmaWxlIEZJTEUtTkFNRSBjb250YWluaW5nCj4gQ09OVEVOVFMuIgo+ICvCoCAiUmV0 dXJuIGEgZGlyZWN0b3J5IHdpdGggYSB1ZGV2IHJ1bGUgZmlsZSBAdmFye2ZpbGUtbmFtZX0KPiBj b250YWluaW5nCj4gK0B2YXJ7Y29udGVudHN9LiIKPiArwqAgKGZpbGUtPnVkZXYtcnVsZSBmaWxl LW5hbWUgKHBsYWluLWZpbGUgZmlsZS1uYW1lIGNvbnRlbnRzKSkpCj4gKwo+ICsoZGVmaW5lICh1 ZGV2LWh3ZGIgZmlsZS1uYW1lIGNvbnRlbnRzKQo+ICvCoCAiUmV0dXJuIGEgZGlyZWN0b3J5IHdp dGggYSB1ZGV2IGh3ZGIgZmlsZSBAdmFye2ZpbGUtbmFtZX0KPiBjb250YWluaW5nCj4gK0B2YXJ7 Y29udGVudHN9LiIKPiArwqAgKGZpbGUtPnVkZXYtaHdkYiBmaWxlLW5hbWUgKHBsYWluLWZpbGUg ZmlsZS1uYW1lIGNvbnRlbnRzKSkpCj4gKwo+ICsoZGVmaW5lIChmaWxlLT51ZGV2LXJ1bGUgZmls ZS1uYW1lIGZpbGUpCj4gK8KgICJSZXR1cm4gYSBkaXJlY3Rvcnkgd2l0aCBhIHVkZXYgcnVsZSBm aWxlIEB2YXJ7ZmlsZS1uYW1lfSB3aGljaCBpcwo+IGEgY29weSBvZgo+ICtAdmFye2ZpbGV9LiIK PiDCoMKgIChjb21wdXRlZC1maWxlIGZpbGUtbmFtZQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqAgKHdpdGgtaW1wb3J0ZWQtbW9kdWxlcyAnKChndWl4IGJ1aWxkIHV0aWxzKSkK PiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAjfihiZWdpbgo+IEBAIC0y MjIwLDI2ICsyMjQ1LDI3IEBAIChkZWZpbmUgKHVkZXYtcnVsZSBmaWxlLW5hbWUgY29udGVudHMp Cj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoZGVmaW5l IHJ1bGVzLmQKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoCAoc3RyaW5nLWFwcGVuZCAjJG91dHB1dAo+ICIvbGliL3VkZXYvcnVsZXMuZCIpKQo+IMKg Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChkZWZpbmUg ZmlsZS1jb3B5LWRlc3QKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgIChzdHJpbmctYXBwZW5kIHJ1bGVzLmQgIi8iICMkZmlsZS1uYW1lKSkKPiArCj4g wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobWtkaXItcCBy dWxlcy5kKQo+IC3CoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAo Y2FsbC13aXRoLW91dHB1dC1maWxlCj4gLcKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgKHN0cmluZy1hcHBlbmQgcnVsZXMuZCAiLyIgIyRmaWxlLW5h bWUpCj4gLcKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAo bGFtYmRhIChwb3J0KQo+IC3CoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgIChkaXNwbGF5ICMkY29udGVudHMgcG9ydCkpKSkpKSkKPiArwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGNvcHktZmlsZSAjJGZpbGUgZmls ZS1jb3B5LWRlc3QpKSkpKQo+IMKgCj4gLShkZWZpbmUgKGZpbGUtPnVkZXYtcnVsZSBmaWxlLW5h bWUgZmlsZSkKPiAtwqAgIlJldHVybiBhIGRpcmVjdG9yeSB3aXRoIGEgdWRldiBydWxlIGZpbGUg RklMRS1OQU1FIHdoaWNoIGlzIGEKPiBjb3B5IG9mIEZJTEUuIgo+ICsoZGVmaW5lIChmaWxlLT51 ZGV2LWh3ZGIgZmlsZS1uYW1lIGZpbGUpCj4gK8KgICJSZXR1cm4gYSBkaXJlY3Rvcnkgd2l0aCBh IHVkZXYgaHdkYiBmaWxlIEB2YXJ7ZmlsZS1uYW1lfSB3aGljaCBpcwo+IGEgY29weSBvZgo+ICtA dmFye2ZpbGV9LiIKPiDCoMKgIChjb21wdXRlZC1maWxlIGZpbGUtbmFtZQo+IMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHdpdGgtaW1wb3J0ZWQtbW9kdWxlcyAnKChndWl4IGJ1 aWxkIHV0aWxzKSkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAjfihi ZWdpbgo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHVz ZS1tb2R1bGVzIChndWl4IGJ1aWxkIHV0aWxzKSkKPiDCoAo+IC3CoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoZGVmaW5lIHJ1bGVzLmQKPiAtwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdHJpbmctYXBwZW5kICMkb3V0 cHV0Cj4gIi9saWIvdWRldi9ydWxlcy5kIikpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgIChkZWZpbmUgaHdkYi5kCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc3RyaW5nLWFwcGVuZCAjJG91dHB1dAo+ICIv bGliL3VkZXYvaHdkYi5kIikpCj4gwqAKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgIChkZWZpbmUgZmlsZS1jb3B5LWRlc3QKPiAtwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdHJpbmctYXBwZW5kIHJ1bGVzLmQg Ii8iICMkZmlsZS1uYW1lKSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgIChzdHJpbmctYXBwZW5kIGh3ZGIuZCAiLyIgIyRmaWxlLW5hbWUpKQo+IMKg Cj4gLcKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChta2Rpci1w IHJ1bGVzLmQpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg IChta2Rpci1wIGh3ZGIuZCkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgIChjb3B5LWZpbGUgIyRmaWxlIGZpbGUtY29weS1kZXN0KSkpKSkKPiDCoAo+IMKg KGRlZmluZSBrdm0tdWRldi1ydWxlCj4gQEAgLTIzNDksMTMgKzIzNzUsMzMgQEAgKGRlZmluZSB1 ZGV2LmNvbmYKPiDCoAo+IMKgKGRlZmluZSAodWRldi1ldGMgY29uZmlnKQo+IMKgwqAgKG1hdGNo LXJlY29yZCBjb25maWcgPHVkZXYtY29uZmlndXJhdGlvbj4KPiAtwqDCoMKgICh1ZGV2IHJ1bGVz KQo+ICvCoMKgwqAgKHVkZXYgbmF0aXZlLXVkZXYgcnVsZXMpCj4gK8KgwqDCoCAobGV0KiAoKGh3 ZGIuZAo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICh1ZGV2LWh3ZGItdW5pb24gKGNvbnMqIHVk ZXYgcnVsZXMpKSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGh3ZGIuYmluCj4gK8KgwqDCoMKg wqDCoMKgwqDCoMKgwqAgKGFuZCBuYXRpdmUtdWRldgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCAoZXF1YWw/IChwYWNrYWdlLXZlcnNpb24gdWRldikKPiArwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChwYWNrYWdlLXZlcnNpb24gbmF0 aXZlLXVkZXYpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoY29tcHV0ZWQt ZmlsZQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJod2RiLmJpbiIKPiAr wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAod2l0aC1pbXBvcnRlZC1tb2R1bGVz ICcoKGd1aXggYnVpbGQgdXRpbHMpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCAjfihiZWdpbgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgICh1c2UtbW9kdWxlcyAoZ3VpeCBidWlsZCB1dGlscykpCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHNldGVudiAiVURFVl9IV0RCX1BB VEgiICMkaHdkYi5kKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgIChpbnZva2UgIysoZmlsZS1hcHBlbmQgbmF0aXZlLXVkZXYKPiAiL2Jpbi91ZGV2YWRt IikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqAgImh3ZGIiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICItLXVwZGF0ZSIKPiArwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgIi1vIiAjJG91 dHB1dCkpKSkpKSkKPiDCoMKgwqDCoCBgKCgidWRldiIKPiDCoMKgwqDCoMKgwqDCoCAsKGZpbGUt dW5pb24gInVkZXYiCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBg KCgidWRldi5jb25mIiAsdWRldi5jb25mKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgICgicnVsZXMuZCIKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgICwodWRldi1ydWxlcy11bmlvbiAoY29ucyogdWRldiBrdm0tdWRl di1ydWxlCj4gLcKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBydWxlcykp KSkpKSkpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgcnVsZXMp KSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICgiaHdkYi5k IiAsaHdkYi5kKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg LEAoaWYgaHdkYi5iaW4KPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgIGAoKCJod2RiLmJpbiIgLGh3ZGIuYmluKSkKPiArwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICcoKSkpKSkpKSkpCj4g wqAKPiDCoChkZWZpbmUgdWRldi1zZXJ2aWNlLXR5cGUKPiDCoMKgIChzZXJ2aWNlLXR5cGUgKG5h bWUgJ3VkZXYpCj4gQEAgLTIzODQsMTAgKzI0MzAsMTAgQEAgKGRlZmluZS1kZXByZWNhdGVkICh1 ZGV2LXNlcnZpY2UgIzprZXkgKHVkZXYKPiBldWRldikgKHJ1bGVzICcoKSkpCj4gwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCAodWRldi1jb25maWd1cmF0aW9uICh1ZGV2IHVkZXYpIChydWxlcyBydWxl cykpKSkKPiDCoAo+IMKgKGRlZmluZSogKHVkZXYtcnVsZXMtc2VydmljZSBuYW1lIHJ1bGVzICM6 a2V5IChncm91cHMgJygpKSkKPiAtwqAgIlJldHVybiBhIHNlcnZpY2UgdGhhdCBleHRlbmRzIHVk ZXYtc2VydmljZS10eXBlIHdpdGggUlVMRVMgYW5kCj4gLWFjY291bnQtc2VydmljZS10eXBlIHdp dGggR1JPVVBTIGFzIHN5c3RlbSBncm91cHMuwqAgVGhpcyB3b3JrcyBieQo+IGNyZWF0aW5nIGEK PiAtc2luZ2xldG9uIHNlcnZpY2UgdHlwZSBOQU1FLXVkZXYtcnVsZXMsIG9mIHdoaWNoIHRoZSBy ZXR1cm5lZAo+IHNlcnZpY2UgaXMgYW4KPiAtaW5zdGFuY2UuIgo+ICvCoCAiUmV0dXJuIGEgc2Vy dmljZSB0aGF0IGV4dGVuZHMgdWRldi1zZXJ2aWNlLXR5cGUgd2l0aCBAdmFye3J1bGVzfQo+IGFu ZAo+ICtAY29kZXthY2NvdW50LXNlcnZpY2UtdHlwZX0gd2l0aCBAdmFye2dyb3Vwc30gYXMgc3lz dGVtIGdyb3Vwcy7CoAo+IFRoaXMgd29ya3MgYnkKPiArY3JlYXRpbmcgYSBzaW5nbGV0b24gc2Vy dmljZSB0eXBlIEBjb2Rle0B2YXJ7bmFtZX0tdWRldi1ydWxlc30sIG9mCj4gd2hpY2ggdGhlCj4g K3JldHVybmVkIHNlcnZpY2UgaXMgYW4gaW5zdGFuY2UuIgo+IMKgwqAgKGxldCogKChuYW1lIChz eW1ib2wtYXBwZW5kIG5hbWUgJy11ZGV2LXJ1bGVzKSkKPiDCoMKgwqDCoMKgwqDCoMKgwqAgKGFj Y291bnQtZXh0ZW5zaW9uCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGNvbnN0IChtYXAgKGxhbWJk YSAoZ3JvdXApCj4gQEAgLTI0MDQsNiArMjQ1MCwxOSBAQCAoZGVmaW5lKiAodWRldi1ydWxlcy1z ZXJ2aWNlIG5hbWUgcnVsZXMgIzprZXkKPiAoZ3JvdXBzICcoKSkpCj4gwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgKGRlc2NyaXB0aW9uICJUaGlzIHNlcnZpY2UgYWRkcyB1ZGV2IHJ1 bGVzLiIpKSkpCj4gwqDCoMKgwqAgKHNlcnZpY2UgdHlwZSAjZikpKQo+IMKgCj4gKyhkZWZpbmUg KHVkZXYtaHdkYi1zZXJ2aWNlIG5hbWUgaHdkYi1maWxlcykKPiArwqAgIlJldHVybiBhIHNlcnZp Y2UgdGhhdCBleHRlbmRzIHVkZXYtc2VydmljZS10eXBlIHdpdGggQHZhcntod2RiLQo+IGZpbGVz fSwgbmFtZWQKPiArQGNvZGV7QHZhcntuYW1lfS11ZGV2LWh3ZGJ9LiIKPiArwqAgKGxldCogKChu YW1lIChzeW1ib2wtYXBwZW5kIG5hbWUgJy11ZGV2LWh3ZGIpKQo+ICvCoMKgwqDCoMKgwqDCoMKg ICh1ZGV2LWV4dGVuc2lvbiAoY29uc3QgKGxpc3QgaHdkYi1maWxlcykpKQo+ICvCoMKgwqDCoMKg wqDCoMKgICh0eXBlIChzZXJ2aWNlLXR5cGUKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgIChuYW1lIG5hbWUpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoZXh0ZW5z aW9ucyAobGlzdAo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCAoc2VydmljZS1leHRlbnNpb24KPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCB1ZGV2LXNlcnZpY2UtdHlwZSB1 ZGV2LWV4dGVuc2lvbikpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGRlc2Ny aXB0aW9uICJUaGlzIHNlcnZpY2UgYWRkcyB1ZGV2IGh3ZGIKPiBmaWxlcy4iKSkpKQo+ICvCoMKg wqAgKHNlcnZpY2UgdHlwZSAjZikpKQo+ICsKPiDCoChkZWZpbmUgKHN3YXAtc3BhY2UtPnNoZXBo ZXJkLXNlcnZpY2UtbmFtZSBzcGFjZSkKPiDCoMKgIChsZXQgKCh0YXJnZXQgKHN3YXAtc3BhY2Ut dGFyZ2V0IHNwYWNlKSkpCj4gwqDCoMKgwqAgKHN5bWJvbC1hcHBlbmQgJ3N3YXAtCk90aGVyd2lz ZSBMR1RNLgoKQ2hlZXJzCg== From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 04 17:44:50 2023 Received: (at 66099) by debbugs.gnu.org; 4 Oct 2023 21:44:50 +0000 Received: from localhost ([127.0.0.1]:45486 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo9fm-00056l-E8 for submit@debbugs.gnu.org; Wed, 04 Oct 2023 17:44:50 -0400 Received: from planete-kraus.eu ([89.234.140.182]:32950) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo9fk-00056b-JS for 66099@debbugs.gnu.org; Wed, 04 Oct 2023 17:44:49 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 384862d9; Wed, 4 Oct 2023 21:44:28 +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:mime-version :content-type:content-transfer-encoding:to:cc; s=albinoniB; bh=4 wn9kvRS7cYkyT+zzTkLJWwn9yY=; b=HkyN8CKW/CqJuIATuiYVTTBz8q5bER+vU aFgd+k3O/fDwxmaWOVTOJAChxEs5InNlj0XBYgT/sQbkKEO9HCdxRB4yl70OW0MF Ba+7bSsqh+sBVa9z0EO5z6sCQe/YPEjQMHkyWwb7I/hZ8ZC+L5yvF7kFVmHDuUF1 9dJT8V/V3nLB+U7Py6PpRz0Ds/2luARkExeH6CCFz9uIPGbPla1ieibm6F1ftRfx UORcNdfDkFdGI4v8e8tjI7GFaeDA3Bm91VS6vK4czmKBBMGa9hFnnZcnjvinxVqD Zz0JItNP45LY9R1AI/f/cJbPo+0ePtBeTELiAaxwgmRQW4BzEv9EA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 450b09e5 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 4 Oct 2023 21:44:28 +0000 (UTC) Message-ID: In-Reply-To: <42e4b490bce80a94f1afb7f5843d77823058150a.camel@gmail.com> References: <42e4b490bce80a94f1afb7f5843d77823058150a.camel@gmail.com> From: Vivien Kraus Date: Wed, 4 Oct 2023 23:37:02 +0200 Subject: [PATCH gnome-team v6 0/5] Update eudev, udev-service-type, upower MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: Liliana Marie Prikler ,maxim.cournoyer@gmail.com,66099@debbugs.gnu.org User-Agent: Evolution 3.46.4 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Dear guix, Le mercredi 04 octobre 2023 à 18:52 +0200, Liliana Marie Prikler a écrit : > Am Montag, dem 02.10.2023 um 21:08 +0200 schrieb Vivien Kraus: > > The "rules" field in the udev-configuration record can now hold both rules > > and hwdb files. > > > > The udev-rules-union has been made generic, so that it works with either > > rules or hwdb files. > Maybe we should rename this to udev-configuration-union and deprecate the > former in favor of the latter (if it can be used outside of the module)? Yes, we should, "things" is ugly in a function name. However, the udev-*-union are not accessed from outside of the module, so we can just drop them. > > Some udev-related auxiliary functions in (gnu services base) had non- > > texinfo variable references in their docstrings ("FILE-NAME" instead of > > "@var{file-name}"). > > > > udev-rule and file->udev-rule have very similar effects. file->udev-rule > > operates on a file-like, and udev-rule on plain string contents. Now > > udev-rule calls file->udev-rule with a plain-file file-like object. > I think the patch would be a little easier to read if you did this > refactoring in a separate one. The commit log would read something like: > > "services: udev: unify udev-rule and fine->udev-rule. > > * gnu/services/base.scm (udev-rule): Implement in terms of > file->udev-rule. Use texinfo in docstring." You are right, it is way better! Best regards, Vivien Vivien Kraus (5): gnu: eudev: Update libudev version to 251. services: udev: unify udev-rule and file->udev-rule. gnu: udev-service-type: accept hwdb file extensions. gnu: libgudev: Update to 238. gnu: upower: Update to 1.90.2. doc/guix.texi | 52 +++++++-- gnu/local.mk | 1 + gnu/packages/gnome.scm | 43 +++++--- gnu/packages/linux.scm | 55 +++++++--- .../patches/eudev-rules-directory.patch | 9 +- .../patches/eudev-set-version-to-3.2.12.patch | 25 +++++ gnu/services/base.scm | 103 ++++++++++++++---- 7 files changed, 215 insertions(+), 73 deletions(-) create mode 100644 gnu/packages/patches/eudev-set-version-to-3.2.12.patch base-commit: b18b2d13488f2a92331ccad2dc8cbb54ee15582f -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 04 17:45:28 2023 Received: (at 66099) by debbugs.gnu.org; 4 Oct 2023 21:45:28 +0000 Received: from localhost ([127.0.0.1]:45490 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo9gK-00058P-Tz for submit@debbugs.gnu.org; Wed, 04 Oct 2023 17:45:28 -0400 Received: from planete-kraus.eu ([89.234.140.182]:45438) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo9gE-000588-VS for 66099@debbugs.gnu.org; Wed, 04 Oct 2023 17:45:22 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id e70f1efe; Wed, 4 Oct 2023 21:45:00 +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:mime-version :content-type:content-transfer-encoding:to:cc; s=albinoniB; bh=h 2+Q5ja6OZF2TbkPqAMhSW+hyfw=; b=CeXsBUkpb4Z0GqjqdeTp7dFNLG6AJANQv vaadGXma+nmBMrN5ClNEw9paHcEOZpvnaE/fAtoHnGjR/3jTGGeV2NQCCBPAnrIf 1bZknu6r/ZCFfbMvx+pUzu7tUXci7c7PYdl8S2mPQdgdV4Ble4u9bijqvBl7K2Ln LgTbigj39Q8VCqlyNtymY33YwPiO12yWoilVfztdpLtZAWe2H6Qk4goYBKhvk4mi babp/JJXzIGbdHvw9t3kmruXxkYcSAOmMd/UKECTx2QZs2TxQnWV1WmjJpAZsNz3 GJY2nYAi4YJ6/rgm6rh2P1xvLk8BshpU8jWdts3SBJi0BZBCbfvNw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id a6593bf9 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 4 Oct 2023 21:44:59 +0000 (UTC) Message-ID: <1ed2985a00d92f2c274fcd473fd99c6f6881f689.1696455422.git.vivien@planete-kraus.eu> In-Reply-To: References: <42e4b490bce80a94f1afb7f5843d77823058150a.camel@gmail.com> From: Vivien Kraus Date: Tue, 19 Sep 2023 13:23:22 +0200 Subject: [PATCH gnome-team v6 1/5] gnu: eudev: Update libudev version to 251. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: Liliana Marie Prikler ,maxim.cournoyer@gmail.com,66099@debbugs.gnu.org User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Eudev has significant improvements from 3.2.12, but they are not released yet. The package version number has already been bumped to 3.2.14, but since it is not released yet, the version number is dow [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Eudev has significant improvements from 3.2.12, but they are not released yet. The package version number has already been bumped to 3.2.14, but since it is not released yet, the version number is dow [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Eudev has significant improvements from 3.2.12, but they are not released yet. The package version number has already been bumped to 3.2.14, but since it is not released yet, the version number is downgraded to 3.2.12. Everything that eudev searches in "sysconf" (/etc/udev/*) is actually searched under its installation prefix. The udev-service-type however prepares every file in /etc/udev, without a prefix. Eudev has a hardware database that installs descriptions of hardware in /etc, but they should go to /lib prior to being used. The build system can’t install to /etc, and should not, because this directory is owned by the udev-service-type. So they are installed directly in /lib. Another file, an empty /etc/udev.conf, is simply ignored. The hwdb.bin file used to be generated in /etc/udev/hwdb.bin, but since the sysconf dir is now directly /etc, the hwdb.bin index will not be found under /etc/udev/hwdb.bin. * gnu/packages/linux.scm (eudev): Update to a post-v3.2.12 commit. [#:phases] : New phase. : New phase. : Remove phase. [#:configure-flags]: Set sysconfdir to avoid a prefix. [native-search-paths]: Add UDEV_HWDB_PATH. * gnu/packages/patches/eudev-set-version-to-3.2.12.patch: New file. * gnu/packages/linux.scm (eudev): Use it here. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/patches/eudev-rules-directory.patch: Rebase it. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 55 +++++++++++++------ .../patches/eudev-rules-directory.patch | 9 +-- .../patches/eudev-set-version-to-3.2.12.patch | 25 +++++++++ 4 files changed, 69 insertions(+), 21 deletions(-) create mode 100644 gnu/packages/patches/eudev-set-version-to-3.2.12.patch diff --git a/gnu/local.mk b/gnu/local.mk index 72c9954492..73beb8daff 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1127,6 +1127,7 @@ dist_patch_DATA = \ %D%/packages/patches/esmini-use-pkgconfig.patch \ %D%/packages/patches/esmtp-add-lesmtp.patch \ %D%/packages/patches/eudev-rules-directory.patch \ + %D%/packages/patches/eudev-set-version-to-3.2.12.patch \ %D%/packages/patches/exercism-disable-self-update.patch \ %D%/packages/patches/extempore-unbundle-external-dependencies.patch \ %D%/packages/patches/extundelete-e2fsprogs-1.44.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 85e3d9845d..e1959fde3d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4263,18 +4263,22 @@ (define-public earlyoom (define-public eudev ;; The post-systemd fork, maintained by Gentoo. + (define commit + "c5bae0b656513463f92808f324f8fcbe34a0b401") + (define revision "1") (package (name "eudev") - (version "3.2.11") + (version (git-version "3.2.12" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/gentoo/eudev") - (commit (string-append "v" version)))) + (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "0dzaqwjnl55f69ird57wb6skahc6l7zs1slsrzqqfhww33icp6av")) - (patches (search-patches "eudev-rules-directory.patch")))) + "0rqyzmp8kcnxiy1hq13pr2syp4krnf6q97xwlr0bwcd6x4grbak4")) + (patches (search-patches "eudev-rules-directory.patch" + "eudev-set-version-to-3.2.12.patch")))) (build-system gnu-build-system) (arguments (list @@ -4285,6 +4289,28 @@ (define-public eudev (substitute* "man/make.sh" (("/usr/bin/xsltproc") (search-input-file (or native-inputs inputs) "/bin/xsltproc"))))) + (add-before 'bootstrap 'install-in-lib + (lambda _ + ;; eudev wants to install its provided hwdb files in /etc, but + ;; we want them in udevlibexecdir. + (copy-file "hwdb/Makefile.am" "hwdb/files.am") + (call-with-output-file "hwdb/Makefile.am" + (lambda (port) + (format port "udevhwdblibdir = $(udevlibexecdir)/hwdb.d\n") + (format port "include ./files.am"))) + (substitute* "hwdb/files.am" + (("dist_udevhwdb_DATA =") + "dist_udevhwdblib_DATA =")) + ;; eudev wants to install a template udev.conf into /etc, but we + ;; do not care. + (substitute* "src/udev/Makefile.am" + (("dist_udevconf_DATA =") + "dist_noinst_DATA =")) + ;; eudev thinks we want to make sure /etc/udev/rules.d exists + ;; when installing - we do not. + (substitute* "rules/Makefile.am" + (("\\$\\(MKDIR_P\\) \\$\\(DESTDIR\\)\\$\\(udevconfdir\\)/rules\\.d") + "true")))) (add-after 'install 'move-static-library (lambda _ (let ((source (string-append #$output "/lib/libudev.a")) @@ -4296,19 +4322,14 @@ (define-public eudev ;; such that Libtool looks for it in the usual places. (substitute* (string-append #$output "/lib/libudev.la") (("old_library=.*") - "old_library=''\n"))))) - (add-after 'install 'build-hwdb - (lambda _ - ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and - ;; similar tools to display product names. - ;; - ;; XXX: This can't be done when cross-compiling. Find another way - ;; to generate hwdb.bin for cross-built systems. - #$@(if (%current-target-system) - #~(#t) - #~((invoke (string-append #$output "/bin/udevadm") - "hwdb" "--update")))))) - #:configure-flags #~(list "--enable-manpages"))) + "old_library=''\n")))))) + #:configure-flags + #~(list "--enable-manpages" + "--sysconfdir=/etc"))) + (native-search-paths + (list (search-path-specification + (variable "UDEV_HWDB_PATH") + (files '("lib/udev/hwdb.d"))))) (native-inputs (list autoconf automake diff --git a/gnu/packages/patches/eudev-rules-directory.patch b/gnu/packages/patches/eudev-rules-directory.patch index 54fc01c6d5..c4b1cfae39 100644 --- a/gnu/packages/patches/eudev-rules-directory.patch +++ b/gnu/packages/patches/eudev-rules-directory.patch @@ -4,9 +4,9 @@ The old udev 182 supported $UDEV_CONFIG_FILE, which in turn allowed the search path to be customized, but eudev no longer has this, hence this hack. ---- eudev-3.1.5/src/udev/udev-rules.c 2015-10-13 06:22:14.000000000 +0800 -+++ eudev-3.1.5/src/udev/udev-rules.c 2015-10-16 20:45:38.491934336 +0800 -@@ -47,15 +47,11 @@ +--- a/src/udev/udev-rules.c ++++ b/src/udev/udev-rules.c +@@ -48,16 +48,11 @@ struct uid_gid { }; }; @@ -20,11 +20,12 @@ this hack. - "/lib/udev/rules.d", - "/usr/lib/udev/rules.d", -#endif +- "/usr/local/lib/udev/rules.d", + NULL, /* placeholder for $EUDEV_RULES_DIRECTORY */ NULL}; struct udev_rules { -@@ -1704,6 +1700,9 @@ +@@ -1718,6 +1713,9 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) { udev_rules_check_timestamp(rules); diff --git a/gnu/packages/patches/eudev-set-version-to-3.2.12.patch b/gnu/packages/patches/eudev-set-version-to-3.2.12.patch new file mode 100644 index 0000000000..9221269e08 --- /dev/null +++ b/gnu/packages/patches/eudev-set-version-to-3.2.12.patch @@ -0,0 +1,25 @@ +From 6a8fdb8a14dc9e0480c68426edcf3f4b55e9cfe3 Mon Sep 17 00:00:00 2001 +Message-ID: <6a8fdb8a14dc9e0480c68426edcf3f4b55e9cfe3.1696356960.git.vivien@planete-kraus.eu> +From: Vivien Kraus +Date: Tue, 3 Oct 2023 20:15:48 +0200 +Subject: [PATCH] Revert "bump version to 3.2.14" + +This reverts commit df220edbc585d2e7a08ed8ad90770fefd0e60bb5. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 0d9a135bc..069fdfb87 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,5 +1,5 @@ + AC_PREREQ([2.68]) +-AC_INIT([eudev],[3.2.14],[https://github.com/gentoo/eudev/issues]) ++AC_INIT([eudev],[3.2.12],[https://github.com/gentoo/eudev/issues]) + AC_SUBST(UDEV_VERSION, 251) + AC_CONFIG_SRCDIR([src/udev/udevd.c]) + +-- +2.41.0 + -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 04 17:46:19 2023 Received: (at 66099) by debbugs.gnu.org; 4 Oct 2023 21:46:19 +0000 Received: from localhost ([127.0.0.1]:45494 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo9hC-0005AL-MP for submit@debbugs.gnu.org; Wed, 04 Oct 2023 17:46:18 -0400 Received: from planete-kraus.eu ([89.234.140.182]:51252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo9hA-0005AC-Ta for 66099@debbugs.gnu.org; Wed, 04 Oct 2023 17:46:17 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 081b11e5; Wed, 4 Oct 2023 21:45:58 +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=z/GLnF0Jh9PFfGO+K1XBvxIS2mQ=; b=s 50F1ZcKbSft92UFpyoeUCxHU/k3ARSksCWDil0FJCeZyIWUOutM27UC3jSCukeer 5FrtHuQis/OQ4G972aGMfRtrIgucDL2L3xaBFVgyOMNSHJEGfLzsRJ5LPEQKOJAR q/RspntCDImU4Dax5DBeTY+o4c1vSDDwPi+c60KsOPkN+yen4kSQWje9hq+Ilnx/ W9AYzy8oQgh4CmsOxOPDxiTQx5NM+R8OjA/bkz0is2sAEgQSqaYTeCZeUTrTBhjl dDSymjoJ3d6++PbsttVABL1o0P2hLUAEqiRBVPiyd02NaU5pjRCu4qMi6QtV1ogF M+HH3hPiQtdhLhWG+hbWA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id b2cfacbd (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 4 Oct 2023 21:45:57 +0000 (UTC) Message-ID: <7f63dfc3b0cc8321212f024bddc1c4625fadfe45.1696455423.git.vivien@planete-kraus.eu> In-Reply-To: References: <42e4b490bce80a94f1afb7f5843d77823058150a.camel@gmail.com> From: Vivien Kraus Date: Wed, 4 Oct 2023 23:05:19 +0200 Subject: [PATCH gnome-team v6 2/5] services: udev: unify udev-rule and file->udev-rule. To: Liliana Marie Prikler ,maxim.cournoyer@gmail.com,66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/services/base.scm (udev-rule): Implement in terms of file->udev-rule. Use texinfo in docstring. --- gnu/services/base.scm | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index b3f2d2e8b8..190803b780 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2211,20 +2211,9 @@ (define (udev-rules-union packages) (computed-file "udev-rules" build)) (define (udev-rule file-name contents) - "Return a directory with a udev rule file FILE-NAME containing CONTENTS." - (computed-file file-name - (with-imported-modules '((guix build utils)) - #~(begin - (use-modules (guix build utils)) - - (define rules.d - (string-append #$output "/lib/udev/rules.d")) - - (mkdir-p rules.d) - (call-with-output-file - (string-append rules.d "/" #$file-name) - (lambda (port) - (display #$contents port))))))) + "Return a directory with a udev rule file @var{file-name} containing +@var{contents}." + (file->udev-rule file-name (plain-file file-name contents))) (define (file->udev-rule file-name file) "Return a directory with a udev rule file FILE-NAME which is a copy of FILE." -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 04 17:47:10 2023 Received: (at 66099) by debbugs.gnu.org; 4 Oct 2023 21:47:11 +0000 Received: from localhost ([127.0.0.1]:45498 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo9i2-0005CP-25 for submit@debbugs.gnu.org; Wed, 04 Oct 2023 17:47:10 -0400 Received: from planete-kraus.eu ([89.234.140.182]:37796) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo9i0-0005CH-7b for 66099@debbugs.gnu.org; Wed, 04 Oct 2023 17:47:09 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 34e49650; Wed, 4 Oct 2023 21:46:49 +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=g00As9j+mbB2gC+pBiwBRbAQaCs=; b=g QFNizIeUkb8uXQnfn9SY4N6NfoKsrKyDvTQiG+o/h8doaHg5A61UEjiXjOf5D+9h DEvSr2I14AWrXWTYu/9XegfaoRdINACQ/ew6NkRaf9oeZWpux0xRW04sqg6cZh5v PNKhX5aH3Su1EwilRzKX+oLddsScKSTnkn6AzmXDnSd0E64RZxspx+4eNVh+bQ8A Kv2I/yqpB1JQDnrX/6eDwLZu5lPjAaP3hM542O+vqxRCIukXQ7tr98by3FnaFvUS UQLhJbRyixuohk9g+OmeMjosXUVAqEjJHpd+B+bAlLwqRMkGn0ltT/vUumdoJFOm OfWmZlptgk4xP4xHoCH0g== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 65f24201 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 4 Oct 2023 21:46:49 +0000 (UTC) Message-ID: In-Reply-To: References: <42e4b490bce80a94f1afb7f5843d77823058150a.camel@gmail.com> From: Vivien Kraus Date: Mon, 2 Oct 2023 21:08:49 +0200 Subject: [PATCH gnome-team v6 3/5] gnu: udev-service-type: accept hwdb file extensions. To: Liliana Marie Prikler ,maxim.cournoyer@gmail.com,66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) The "rules" field in the udev-configuration record can now hold both rules and hwdb files. The udev-rules-union has been made generic, and renamed to udev-configuration-union, so that it works with either rules or hwdb files. Some udev-related auxiliary functions in (gnu services base) had non-texinfo variable references in their docstrings ("FILE-NAME" instead of "@var{file-name}"). The contents of the /etc directory now includes hwdb.d and hwdb.bin, which is computed immediately. The documentation has been reworked so as to explain why creating udev rules or hwdb needs helper functions for configuration or extension. The hwdb.bin file is conditionally computed by a native version of eudev, that may be configured in the udev-service-type configuration. The condition is that both target and native eudev have the same version. If so, we can reasonably expect that the hwdb.bin file created by native eudev can later be read by target eudev. * gnu/services/base.scm (udev-configuration-union): Make udev-rules-union generic. (udev-hwdb): New function. (file->udev-rule): Fix docstring. (file->udev-hwdb): New function. (udev-rules-service): Fix docstring. (udev-hwdb-service): New function. (udev-etc): Add hwdb.d and hwdb.bin. (module): Export udev-hwdb, file->udev-hwdb, and udev-hwdb-service. (): Add the native-udev field. * doc/guix.texi (Base Services)[udev-service-type]: Explain configuration and extension values. * doc/guix.texi (Base Services)[udev-hwdb]: Document it. [udev-hwdb-service]: Same. * doc/guix.texi (Base Services)[udev-configuration]: Document the native-udev field. --- doc/guix.texi | 52 +++++++++++++++++++----- gnu/services/base.scm | 94 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 122 insertions(+), 24 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 46591b2f64..3310271ec8 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -19322,9 +19322,23 @@ Base Services @file{/dev} directory dynamically, whose value is a @code{} object. -This service type can be @emph{extended} using procedures -@code{udev-rules-service} along with @code{file->udev-rule} or -@code{udev-rule} which simplify the process of writing udev rules. +Since the file names for udev rules and hwdb files matters, the +configuration items for rules and hwdb cannot simply be plain file-like +objects with the rules content, because the name would be +ignored. Instead, they are directory file-like objects that contain +optional rules in @code{lib/udev/rules.d} and optional hwdb files in +@code{lib/udev/hwdb.d}. This way, the service can be configured with +whole packages from which to take rules and hwdb files. + +The @code{udev-service-type} can be @emph{extended} with file-like +directories that respect this hierarchy. However, to generate a +configuration or an extension, it is advised to use @code{udev-rule} and +@code{file->udev-rule} for rules, and @code{udev-hwdb} and +@code{file->udev-hwdb} for hwdb files. + +In an operating-system declaration, this service type can be +@emph{extended} using procedures @code{udev-rules-service} and +@code{udev-hwdb-service}. @end defvar @deftp {Data Type} udev-configuration @@ -19334,8 +19348,18 @@ Base Services @item @code{udev} (default: @code{eudev}) (type: file-like) Package object of the udev service. +@item @code{native-udev} (default: @code{eudev}) (type: file-like) +Native udev package to compile @code{hwdb.bin}. The trie format used for +@code{hwdb.bin} must be compatible with the @code{udev} and +@code{native-udev} fields of the udev configuration. To avoid generating +@code{hwdb.bin}, pass @code{#f} as the @code{native-udev} field. + +In any case, if the package version string differs between @code{udev} +and @code{native-udev}, @code{hwdb.bin} is @strong{not} created. + @item @code{rules} (default: @var{'()}) (type: list-of-file-like) -List of file-like objects denoting udev-rule files. +List of file-like objects denoting udev-rule or udev-hwdb files under a +sub-directory. @end table @end deftp @@ -19358,6 +19382,11 @@ Base Services @end lisp @end deffn +@deffn {Procedure} udev-hwdb @var{file-name} @var{contents} +Return a udev-hwdb file named @var{file-name} containing the hardware +information @var{contents}. +@end deffn + @deffn {Procedure} udev-rules-service @var{name} @var{rules} [#:groups '()] Return a service that extends @code{udev-service-type} with @var{rules} and @code{account-service-type} with @var{groups} as system groups. @@ -19377,6 +19406,11 @@ Base Services @end lisp @end deffn +@deffn {Procedure} udev-hwdb-service @var{name} @var{hwdb} +Return a service that extends @code{udev-service-type} with +@var{hwdb}. The service name is @code{@var{name}-udev-hwdb}. +@end deffn + @deffn {Procedure} file->udev-rule @var{file-name} @var{file} Return a udev-rule file named @var{file-name} containing the rules defined within @var{file}, a file-like object. @@ -19401,12 +19435,10 @@ Base Services @end lisp @end deffn -Additionally, Guix package definitions can be included in @var{rules} in -order to extend the udev rules with the definitions found under their -@file{lib/udev/rules.d} sub-directory. In lieu of the previous -@var{file->udev-rule} example, we could have used the -@var{android-udev-rules} package which exists in Guix in the @code{(gnu -packages android)} module. +@deffn {Procedure} file->udev-hwdb @var{file-name} @var{file} +Return a udev-hwdb file named @var{file-name} containing the rules +defined within @var{file}, a file-like object. +@end deffn The following example shows how to use the @var{android-udev-rules} package so that the Android tool @command{adb} can detect devices diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 190803b780..00916a35e4 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -81,6 +81,7 @@ (define-module (gnu services base) #:select (mount-flags->bit-mask swap-space->flags-bit-mask)) #:use-module (guix gexp) + #:use-module ((guix packages) #:select (package-version)) #:use-module (guix records) #:use-module (guix modules) #:use-module (guix pki) @@ -153,8 +154,11 @@ (define-module (gnu services base) udev-service-type udev-service ; deprecated udev-rule + udev-hwdb file->udev-rule + file->udev-hwdb udev-rules-service + udev-hwdb-service login-configuration login-configuration? @@ -2181,12 +2185,15 @@ (define-record-type* udev-configuration? (udev udev-configuration-udev ;file-like (default eudev)) - (rules udev-configuration-rules ;list of file-like + (native-udev udev-configuration-native-udev + (default eudev)) + (rules udev-configuration-rules ;list of rule- and + ;hwdb-providing packages (default '()))) -(define (udev-rules-union packages) - "Return the union of the @code{lib/udev/rules.d} directories found in each -item of @var{packages}." +(define (udev-configuration-union subdirectory packages) + "Return the union of the @code{lib/udev/@var{subdirectory}.d} directories found +in each item of @var{packages}." (define build (with-imported-modules '((guix build union) (guix build utils)) @@ -2197,7 +2204,8 @@ (define (udev-rules-union packages) (srfi srfi-26)) (define %standard-locations - '("/lib/udev/rules.d" "/libexec/udev/rules.d")) + '(#$(string-append "/lib/udev/" subdirectory ".d") + #$(string-append "/libexec/udev/" subdirectory ".d"))) (define (rules-sub-directory directory) ;; Return the sub-directory of DIRECTORY containing udev rules, or @@ -2208,15 +2216,21 @@ (define (udev-rules-union packages) (union-build #$output (filter-map rules-sub-directory '#$packages))))) - (computed-file "udev-rules" build)) + (computed-file (string-append "udev-" subdirectory) build)) (define (udev-rule file-name contents) "Return a directory with a udev rule file @var{file-name} containing @var{contents}." (file->udev-rule file-name (plain-file file-name contents))) +(define (udev-hwdb file-name contents) + "Return a directory with a udev hwdb file @var{file-name} containing +@var{contents}." + (file->udev-hwdb file-name (plain-file file-name contents))) + (define (file->udev-rule file-name file) - "Return a directory with a udev rule file FILE-NAME which is a copy of FILE." + "Return a directory with a udev rule file @var{file-name} which is a copy of +@var{file}." (computed-file file-name (with-imported-modules '((guix build utils)) #~(begin @@ -2231,6 +2245,23 @@ (define (file->udev-rule file-name file) (mkdir-p rules.d) (copy-file #$file file-copy-dest))))) +(define (file->udev-hwdb file-name file) + "Return a directory with a udev hwdb file @var{file-name} which is a copy of +@var{file}." + (computed-file file-name + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + + (define hwdb.d + (string-append #$output "/lib/udev/hwdb.d")) + + (define file-copy-dest + (string-append hwdb.d "/" #$file-name)) + + (mkdir-p hwdb.d) + (copy-file #$file file-copy-dest))))) + (define kvm-udev-rule ;; Return a directory with a udev rule that changes the group of /dev/kvm to ;; "kvm" and makes it #o660. Apparently QEMU-KVM used to ship this rule, @@ -2338,13 +2369,35 @@ (define udev.conf (define (udev-etc config) (match-record config - (udev rules) + (udev native-udev rules) + (let* ((hwdb.d + (udev-configuration-union "hwdb" (cons* udev rules))) + (hwdb.bin + (and native-udev + (equal? (package-version udev) + (package-version native-udev)) + (computed-file + "hwdb.bin" + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + (setenv "UDEV_HWDB_PATH" #$hwdb.d) + (invoke #+(file-append native-udev "/bin/udevadm") + "hwdb" + "--update" + "-o" #$output))))))) `(("udev" ,(file-union "udev" `(("udev.conf" ,udev.conf) ("rules.d" - ,(udev-rules-union (cons* udev kvm-udev-rule - rules))))))))) + ,(udev-configuration-union + "rules" + (cons* udev kvm-udev-rule + rules))) + ("hwdb.d" ,hwdb.d) + ,@(if hwdb.bin + `(("hwdb.bin" ,hwdb.bin)) + '())))))))) (define udev-service-type (service-type (name 'udev) @@ -2373,10 +2426,10 @@ (define-deprecated (udev-service #:key (udev eudev) (rules '())) (udev-configuration (udev udev) (rules rules)))) (define* (udev-rules-service name rules #:key (groups '())) - "Return a service that extends udev-service-type with RULES and -account-service-type with GROUPS as system groups. This works by creating a -singleton service type NAME-udev-rules, of which the returned service is an -instance." + "Return a service that extends udev-service-type with @var{rules} and +@code{account-service-type} with @var{groups} as system groups. This works by +creating a singleton service type @code{@var{name}-udev-rules}, of which the +returned service is an instance." (let* ((name (symbol-append name '-udev-rules)) (account-extension (const (map (lambda (group) @@ -2393,6 +2446,19 @@ (define* (udev-rules-service name rules #:key (groups '())) (description "This service adds udev rules.")))) (service type #f))) +(define (udev-hwdb-service name hwdb-files) + "Return a service that extends udev-service-type with @var{hwdb-files}, named +@code{@var{name}-udev-hwdb}." + (let* ((name (symbol-append name '-udev-hwdb)) + (udev-extension (const (list hwdb-files))) + (type (service-type + (name name) + (extensions (list + (service-extension + udev-service-type udev-extension))) + (description "This service adds udev hwdb files.")))) + (service type #f))) + (define (swap-space->shepherd-service-name space) (let ((target (swap-space-target space))) (symbol-append 'swap- -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 04 17:47:17 2023 Received: (at 66099) by debbugs.gnu.org; 4 Oct 2023 21:47:17 +0000 Received: from localhost ([127.0.0.1]:45501 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo9i8-0005Cn-Tg for submit@debbugs.gnu.org; Wed, 04 Oct 2023 17:47:17 -0400 Received: from planete-kraus.eu ([89.234.140.182]:37796) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo9i6-0005CH-Of for 66099@debbugs.gnu.org; Wed, 04 Oct 2023 17:47:15 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 4509cea5; Wed, 4 Oct 2023 21:46:55 +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=8IllG/iUYeuMh4Fe17WtACJeN8U=; b=k MGthhBnEEcf3IG4ysIRA1hUwaU39lGG6/C47fp2iNx0lilesXd8RcfTKVretQP9e IFRvfA+A/O5vxBZ+jD1Fq9eL5yiEHn+yM2qWC/pLb6sCSCRuVLr1/y7qM+vAZ4hZ N6kxa0gQf2O4ELAUruCozsNMap9pzU39GfBUuCW6PmWlDy+ET9X9s6PCoZCyokUy jiKaAXyrTP3XlUA+27GD/MWv+46sPEnoarYC0Q7dBS3JeZ918peVM+Jf7HCCg8L2 aukJq8ElakPwOd5S4ScE9nf3FAo39TjwyNNuSAoXZ3gsWhvFz8s79q75o5Htz7oi aL7c8Jle7NxX0fsJwBILg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 83da440b (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 4 Oct 2023 21:46:55 +0000 (UTC) Message-ID: <3482b977166652b2c8bd04c6cb21b7c40190c0ed.1696455423.git.vivien@planete-kraus.eu> In-Reply-To: References: <42e4b490bce80a94f1afb7f5843d77823058150a.camel@gmail.com> From: Vivien Kraus Date: Tue, 19 Sep 2023 13:32:26 +0200 Subject: [PATCH gnome-team v6 4/5] gnu: libgudev: Update to 238. To: Liliana Marie Prikler ,maxim.cournoyer@gmail.com,66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ea3dc455a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-pl [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ea3dc455a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-pl [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ea3dc455a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-plugins (define-public libgudev (package (name "libgudev") - (version "236") + (version "238") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "094mgjmwgsgqrr1i0vd20ynvlkihvs3vgbmpbrhswjsrdp86j0z5")))) + "1laxgdkgmr30aw44sm4rgpsdybwxx5rszcm8c2y3vmy9myqnl9k1")))) (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 04 17:47:30 2023 Received: (at 66099) by debbugs.gnu.org; 4 Oct 2023 21:47:30 +0000 Received: from localhost ([127.0.0.1]:45504 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo9iM-0005DH-86 for submit@debbugs.gnu.org; Wed, 04 Oct 2023 17:47:30 -0400 Received: from planete-kraus.eu ([89.234.140.182]:57424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo9iJ-0005D8-U7 for 66099@debbugs.gnu.org; Wed, 04 Oct 2023 17:47:28 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 9ba36648; Wed, 4 Oct 2023 21:47:09 +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:mime-version :content-type:content-transfer-encoding:to:cc; s=albinoniB; bh=U 4Q95r5OzDlerBhawFCb592wjQg=; b=x8OVLcWTg0kk942fWgbBfeVz8VtwgkPtw QDaFaGv2uNf9NnjRxCVEe3OZypTslL5xzQ2/tLxdtTUSVOcGx1dVJMM+q7GyPIyX A+DNWQ6mZB28iUChd6r96k65j3se7PHXs0HepeRVPc8KjhHm0s8uy7/ZaZmt6pA4 /IMlKWs59khhLN0FvWiXZpqQYs1Y2Ik0fU3Uaa2wywkD0oCjf8ANzfmv18/O40Jq Y7uUADWKk7iLmisIBDvLs2cvUoB+HjLgYOQuVyPCp882vNY+hY+x1GUeSK6T3ue8 bO/fK+n6meVvDd+dfDPcvaCpfllQH3uHncyRx7hoSxCSKXtNUey4w== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id dfd99cc3 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 4 Oct 2023 21:47:09 +0000 (UTC) Message-ID: <462502fb5334412e329a91c6e906bd09571b650f.1696455423.git.vivien@planete-kraus.eu> In-Reply-To: References: <42e4b490bce80a94f1afb7f5843d77823058150a.camel@gmail.com> From: Vivien Kraus Date: Tue, 19 Sep 2023 13:32:46 +0200 Subject: [PATCH gnome-team v6 5/5] gnu: upower: Update to 1.90.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: Liliana Marie Prikler ,maxim.cournoyer@gmail.com,66099@debbugs.gnu.org User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The new eudev now can install hwdb files. Upower has some, but they should get installed in upower’s output, not eudev’s. The phases needed a rework. Now the 32-bit-specific test fix is always there, except it may be empty. Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The new eudev now can install hwdb files. Upower has some, but they should get installed in upower’s output, not eudev’s. The phases needed a rework. Now the 32-bit-specific test fix is always there, except it may be empty. Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager The new eudev now can install hwdb files. Upower has some, but they should get installed in upower’s output, not eudev’s. The phases needed a rework. Now the 32-bit-specific test fix is always there, except it may be empty. test_bluetooth_hidpp_mouse fails, after calling into a bluez dbus method. * gnu/packages/gnome.scm (upower): Update to 1.90.2. [#:configure-flags]: Set udevhwdbdir. [#:phases] : Add this phase unconditionnally : Disable test_bluetooth_hidpp_mouse. [inputs]: Remove dbus-glib. [native-inputs]: Add dbus. --- gnu/packages/gnome.scm | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4ea3dc455a..3f773aae8a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5727,7 +5727,7 @@ (define-public geocode-glib-with-libsoup2 (define-public upower (package (name "upower") - (version "1.90.0") + (version "1.90.2") (source (origin (method git-fetch) @@ -5736,7 +5736,7 @@ (define-public upower (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1g17rm91p8vfpjyb0k2shylrs55nccn3fa890vlk4n9s71sghbzq")) + (base32 "13xp423ycv8imf2cmgf6lii9f01p7x2v19cny7acrmczkc0cqv7d")) (modules '((guix build utils))) (snippet ;; Upstream commit . - (substitute* "src/linux/integration-test.py" - (("assertEqual(.*)40\\.0" _ middle) - (string-append - "assertAlmostEqual" middle "40.0")))))) - #~%standard-phases))) + (string-append "-Dudevrulesdir=" #$output "/bin/udev/rules.d") + (string-append "-Dudevhwdbdir=" #$output "/lib/udev/hwdb.d")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'adjust-test-suite + (lambda _ + ;; This test calls an unimplemented bluez dbus method. + (substitute* "src/linux/integration-test.py" + (("test_bluetooth_hidpp_mouse") + "disabled_test_bluetooth_hidpp_mouse")) + #$@(if (target-x86-32?) + ;; Address test failure caused by excess precision + ;; on i686: + ;; . + '((substitute* "src/linux/integration-test.py" + (("assertEqual(.*)40\\.0" _ middle) + (string-append + "assertAlmostEqual" middle "40.0")))) + '())))))) (native-inputs (list `(,glib "bin") ; for gdbus-codegen gobject-introspection @@ -5785,12 +5791,13 @@ (define-public upower python-packaging python-pygobject umockdev + dbus ;; For man pages. docbook-xsl libxslt ; for 'xsltproc' libxml2)) ; for 'XML_CATALOG_FILES' (inputs - (list dbus-glib libgudev libusb)) + (list libgudev libusb)) (propagated-inputs ;; In Requires of upower-glib.pc. (list glib)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 05 00:50:46 2023 Received: (at 66099) by debbugs.gnu.org; 5 Oct 2023 04:50:46 +0000 Received: from localhost ([127.0.0.1]:45713 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoGJy-0000bP-Bb for submit@debbugs.gnu.org; Thu, 05 Oct 2023 00:50:46 -0400 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]:46560) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoGJw-0000bA-0a for 66099@debbugs.gnu.org; Thu, 05 Oct 2023 00:50:45 -0400 Received: by mail-ej1-x641.google.com with SMTP id a640c23a62f3a-99bdcade7fbso95107266b.1 for <66099@debbugs.gnu.org>; Wed, 04 Oct 2023 21:50:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696481420; x=1697086220; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=K5KGfYDzv5IM3DjZLIZjLcuUTDjg6X5ybozVuiFmC+c=; b=mD0w2OHmTrHyC8q1XKIDOv1+L9Hq3QrI/5U95iHBMYoq7lwUDt3A1nU04oWCuS32Kh HSXi63eJxEtY3lrbkQx/cmJzg8N0upIGbEQU4hL2JNwi8A/gcKDvqIbFotdnNQBbRnil eE8DgWlQ0l9QiXYVvCeqQ8KksqZGiqQIWRwMVy6m5xEvb5DyEsHP6qpA2T/cIBN+1rJz h614egoK/XxNitFj6bOBLq7kKbKW4JOIjPDYwpAdFGtTknBLdYYVdCQpJPhTcUpnba6q qS0BjMiOaIr5pfi/dhY5EuUXANH9Qma2y54vCoyEVuc0ugT9qn8dqPwbNoXaoHJbFzBZ jglg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696481420; x=1697086220; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=K5KGfYDzv5IM3DjZLIZjLcuUTDjg6X5ybozVuiFmC+c=; b=GbGlPnIWsbsRGbSlfSedr2S8yzN5Li9iMSDS6o92uhR/AhaCncm0kKqKgFIjwtc0Gd vOPn8l+3LK3iBYig8I7EV+hxHDU8cMKGA9ftCfdokSP5X6ouX+240U30pLo7bingel+P hAqkGrXKe93kzSD2htQax9WHXrw/Wr2ZssbOv7sBqcEbwlbq0K62OxxgFFyavkkS10qQ 4NvSOVhp4yOokV3zsHQySIsrinOYSbnldLFNqYlc8dB4499U7pcMECzQB4pqP4R7tuuk SvZEQ3ZEbdIRpudWJzoB5DjkdCf2cReYKQ8RmZ/57aTOYinyNK7jwfX1MiE1Kc9oZ4sg loNA== X-Gm-Message-State: AOJu0Yx8ZB3dHg2zGXkHOYink6rCSQVzAXM4b5jVtVkdGynRloMy7fQf BdwbRAM+Wlph4OdlPxH2sC8= X-Google-Smtp-Source: AGHT+IEl1ktH4GcmqHwBqZxjSGeDRBf9205TWGs2EVM8uaR8CPOBEnQaTEAShzIXO25bEBKiyp88nA== X-Received: by 2002:a17:906:535e:b0:9ae:42da:803c with SMTP id j30-20020a170906535e00b009ae42da803cmr3352335ejo.48.1696481419746; Wed, 04 Oct 2023 21:50:19 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id gz19-20020a170906f2d300b009b2ca104988sm470389ejb.98.2023.10.04.21.50.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 21:50:18 -0700 (PDT) Message-ID: <69e084520f189ab5f8a80afc7011a9b1ae911d2a.camel@gmail.com> Subject: Re: [PATCH gnome-team v6 1/5] gnu: eudev: Update libudev version to 251. From: Liliana Marie Prikler To: Vivien Kraus , maxim.cournoyer@gmail.com, 66099@debbugs.gnu.org Date: Thu, 05 Oct 2023 06:50:16 +0200 In-Reply-To: <1ed2985a00d92f2c274fcd473fd99c6f6881f689.1696455422.git.vivien@planete-kraus.eu> References: <42e4b490bce80a94f1afb7f5843d77823058150a.camel@gmail.com> <1ed2985a00d92f2c274fcd473fd99c6f6881f689.1696455422.git.vivien@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Dienstag, dem 19.09.2023 um 13:23 +0200 schrieb Vivien Kraus: > Eudev has significant improvements from 3.2.12, but they are not > released yet. The package version number has already been bumped to > 3.2.14, but since it is not released yet, the version number is > downgraded to 3.2.12. Smaller nitpick: I think "we still advertise it as 3.2.12" is better wording here. Downgrade would imho imply a removal of functionality which is not happening here. > [...] > * gnu/packages/linux.scm (eudev): Update to a post-v3.2.12 commit. > [#:phases] : New phase. > : New phase. > : Remove phase. > [#:configure-flags]: Set sysconfdir to avoid a prefix. > [native-search-paths]: Add UDEV_HWDB_PATH. > * gnu/packages/patches/eudev-set-version-to-3.2.12.patch: New file. You might want to express this one with a snippet and an explicit comment to remove it once a release version is used. > * gnu/packages/linux.scm (eudev): Use it here. > * gnu/local.mk (dist_patch_DATA): Register it here. > * gnu/packages/patches/eudev-rules-directory.patch: Rebase it. > --- Cheers From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 05 01:08:53 2023 Received: (at 66099) by debbugs.gnu.org; 5 Oct 2023 05:08:54 +0000 Received: from localhost ([127.0.0.1]:45721 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoGbV-0001D9-Ik for submit@debbugs.gnu.org; Thu, 05 Oct 2023 01:08:53 -0400 Received: from planete-kraus.eu ([89.234.140.182]:36986) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoGbQ-0001Cy-T9 for 66099@debbugs.gnu.org; Thu, 05 Oct 2023 01:08:52 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id d58dcc63; Thu, 5 Oct 2023 05:08:28 +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:mime-version :content-type:content-transfer-encoding:to:cc; s=albinoniB; bh=I U7UhrSWURw05iFzvgy0J9NCJD4=; b=ut7r+1C+SobLnf3pyeFq2MR42E0Bosm19 5sd/V5TxOlFPma9WrHG62Bzyj3CvtUuxeHYM6W6bqjHAmTc/vok+p9Qi+XUwqnSs IkH+orfOreR6zoMsjJeXRC9WusXrqnEheRL7H//CQQvtRWHqrlu5bbWmh+oHrrZy smjxf2AZF+xFEZMKom755y1+fCxgiR60oI2yd68bNPLL3HC27D2IZ4R6e9QF7Pfq zRVm3JQd6Zv907KOkbtZICvIVXLP+sf+79sSZLI/AKd2c8xI/jPKi3V4TeqYafwm MQ4fZw35Dqbxms21aruh52JvN//5V7MQBL1KPlL1yTmKJnzW+LWzw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 02cc0347 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 5 Oct 2023 05:08:28 +0000 (UTC) Message-ID: In-Reply-To: <69e084520f189ab5f8a80afc7011a9b1ae911d2a.camel@gmail.com> References: <69e084520f189ab5f8a80afc7011a9b1ae911d2a.camel@gmail.com> From: Vivien Kraus Date: Thu, 5 Oct 2023 07:04:03 +0200 Subject: [PATCH gnome-team v7 0/5] Update eudev with a snippet, udev-service-type, upower MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: Liliana Marie Prikler , maxim.cournoyer@gmail.com, 66099@debbugs.gnu.org User-Agent: Evolution 3.46.4 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le jeudi 05 octobre 2023 à 06:50 +0200, Liliana Marie Prikler a écrit : > Am Dienstag, dem 19.09.2023 um 13:23 +0200 schrieb Vivien Kraus: > > Eudev has significant improvements from 3.2.12, but they are not > > released yet. The package version number has already been bumped to > > 3.2.14, but since it is not released yet, the version number is > > downgraded to 3.2.12. > Smaller nitpick: I think "we still advertise it as 3.2.12" is better wording > here. Downgrade would imho imply a removal of functionality which is not > happening here. OK. > > * gnu/packages/linux.scm (eudev): Update to a post-v3.2.12 commit. > > [#:phases] : New phase. > > : New phase. > > : Remove phase. > > [#:configure-flags]: Set sysconfdir to avoid a prefix. > > [native-search-paths]: Add UDEV_HWDB_PATH. > > * gnu/packages/patches/eudev-set-version-to-3.2.12.patch: New file. > You might want to express this one with a snippet and an explicit comment to > remove it once a release version is used. I thougḥt the patch would be more useful as it would then fail to apply, but I understand the updater could be unsure whether to remove or rebase the patch. A snippet + comment is more explicit. Vivien Kraus (5): gnu: eudev: Update libudev version to 251. services: udev: unify udev-rule and file->udev-rule. gnu: udev-service-type: accept hwdb file extensions. gnu: libgudev: Update to 238. gnu: upower: Update to 1.90.2. doc/guix.texi | 52 +++++++-- gnu/packages/gnome.scm | 43 +++++--- gnu/packages/linux.scm | 64 ++++++++--- .../patches/eudev-rules-directory.patch | 9 +- gnu/services/base.scm | 103 ++++++++++++++---- 5 files changed, 198 insertions(+), 73 deletions(-) base-commit: b18b2d13488f2a92331ccad2dc8cbb54ee15582f -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 05 01:09:19 2023 Received: (at 66099) by debbugs.gnu.org; 5 Oct 2023 05:09:19 +0000 Received: from localhost ([127.0.0.1]:45725 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoGbs-0001E8-1Q for submit@debbugs.gnu.org; Thu, 05 Oct 2023 01:09:19 -0400 Received: from planete-kraus.eu ([89.234.140.182]:42922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoGbm-0001Dv-Mj for 66099@debbugs.gnu.org; Thu, 05 Oct 2023 01:09:14 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 70335266; Thu, 5 Oct 2023 05:08:51 +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:mime-version :content-type:content-transfer-encoding:to:cc; s=albinoniB; bh=p m5CsLOVtOGpO9S73OY7H5XS2yQ=; b=tDOjmRme5XmtIAv0kje9Wq5/orO+Elmj8 8iCUNA5/bGhqiT3TYfcvID020GkYzP7ZYC6gPPmAI+NaOhp7mZXtuINWKkGbhTf1 vJ3fkvi9ou8BYNtSvCRchSMwux51SLUv7E5Nwlt1Je8pbVbINeJWOOVLsf4csXY/ a8O49Kj6A3lfyEX+I67Q+j9GuWNbAWTaWnzad0SOPdrgUvXtDW0Di/g4c/WvP4oJ D9UoUVwwsz7QBfu/r1thp9iQ8GeVZEPwZLyXvqKxdPsUds/er2Dt5GbsqzxZWgOT JUxb5A9YCrQvpqU/sVYF8UJ57KXEIBKbKAzLsURdwe58k7gYJYxYQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 502a1814 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 5 Oct 2023 05:08:51 +0000 (UTC) Message-ID: <5336473ade7d12a8c96f7212dad22c9fb3d18524.1696482243.git.vivien@planete-kraus.eu> In-Reply-To: References: <69e084520f189ab5f8a80afc7011a9b1ae911d2a.camel@gmail.com> From: Vivien Kraus Date: Tue, 19 Sep 2023 13:23:22 +0200 Subject: [PATCH gnome-team v7 1/5] gnu: eudev: Update libudev version to 251. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: Liliana Marie Prikler , maxim.cournoyer@gmail.com, 66099@debbugs.gnu.org User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Eudev has significant improvements from 3.2.12, but they are not released yet. The package version number has already been bumped to 3.2.14, but since it is not released yet, we still advertise it as [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Eudev has significant improvements from 3.2.12, but they are not released yet. The package version number has already been bumped to 3.2.14, but since it is not released yet, we still advertise it as [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Eudev has significant improvements from 3.2.12, but they are not released yet. The package version number has already been bumped to 3.2.14, but since it is not released yet, we still advertise it as 3.2.12. Everything that eudev searches in "sysconf" (/etc/udev/*) is actually searched under its installation prefix. The udev-service-type however prepares every file in /etc/udev, without a prefix. Eudev has a hardware database that installs descriptions of hardware in /etc, but they should go to /lib prior to being used. The build system can’t install to /etc, and should not, because this directory is owned by the udev-service-type. So they are installed directly in /lib. Another file, an empty /etc/udev.conf, is simply ignored. The hwdb.bin file used to be generated in /etc/udev/hwdb.bin, but since the sysconf dir is now directly /etc, the hwdb.bin index will not be found under /etc/udev/hwdb.bin. * gnu/packages/linux.scm (eudev): Update to a post-v3.2.12 commit. [snippet]: New snippet to override the version number. [modules]: Import (guix build utils). [#:phases] : New phase. : New phase. : Remove phase. [#:configure-flags]: Set sysconfdir to avoid a prefix. [native-search-paths]: Add UDEV_HWDB_PATH. * gnu/packages/patches/eudev-rules-directory.patch: Rebase it. --- gnu/packages/linux.scm | 64 ++++++++++++++----- .../patches/eudev-rules-directory.patch | 9 +-- 2 files changed, 52 insertions(+), 21 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 85e3d9845d..e75ed0b233 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4263,18 +4263,31 @@ (define-public earlyoom (define-public eudev ;; The post-systemd fork, maintained by Gentoo. + (define commit + "c5bae0b656513463f92808f324f8fcbe34a0b401") + (define revision "1") (package (name "eudev") - (version "3.2.11") + ;; Remove the snippet when upgrading to a released version + (version (git-version "3.2.12" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/gentoo/eudev") - (commit (string-append "v" version)))) + (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "0dzaqwjnl55f69ird57wb6skahc6l7zs1slsrzqqfhww33icp6av")) - (patches (search-patches "eudev-rules-directory.patch")))) + "0rqyzmp8kcnxiy1hq13pr2syp4krnf6q97xwlr0bwcd6x4grbak4")) + (patches (search-patches "eudev-rules-directory.patch")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; configure.ac uses 3.2.14 as the version number, but it + ;; is not released yet. Remove the snippet once a later + ;; version is released. + (substitute* "configure.ac" + (("AC_INIT\\(\\[eudev\\],\\[3.2.14\\]") + "AC_INIT([eudev],[3.2.12]")))))) (build-system gnu-build-system) (arguments (list @@ -4285,6 +4298,28 @@ (define-public eudev (substitute* "man/make.sh" (("/usr/bin/xsltproc") (search-input-file (or native-inputs inputs) "/bin/xsltproc"))))) + (add-before 'bootstrap 'install-in-lib + (lambda _ + ;; eudev wants to install its provided hwdb files in /etc, but + ;; we want them in udevlibexecdir. + (copy-file "hwdb/Makefile.am" "hwdb/files.am") + (call-with-output-file "hwdb/Makefile.am" + (lambda (port) + (format port "udevhwdblibdir = $(udevlibexecdir)/hwdb.d\n") + (format port "include ./files.am"))) + (substitute* "hwdb/files.am" + (("dist_udevhwdb_DATA =") + "dist_udevhwdblib_DATA =")) + ;; eudev wants to install a template udev.conf into /etc, but we + ;; do not care. + (substitute* "src/udev/Makefile.am" + (("dist_udevconf_DATA =") + "dist_noinst_DATA =")) + ;; eudev thinks we want to make sure /etc/udev/rules.d exists + ;; when installing - we do not. + (substitute* "rules/Makefile.am" + (("\\$\\(MKDIR_P\\) \\$\\(DESTDIR\\)\\$\\(udevconfdir\\)/rules\\.d") + "true")))) (add-after 'install 'move-static-library (lambda _ (let ((source (string-append #$output "/lib/libudev.a")) @@ -4296,19 +4331,14 @@ (define-public eudev ;; such that Libtool looks for it in the usual places. (substitute* (string-append #$output "/lib/libudev.la") (("old_library=.*") - "old_library=''\n"))))) - (add-after 'install 'build-hwdb - (lambda _ - ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and - ;; similar tools to display product names. - ;; - ;; XXX: This can't be done when cross-compiling. Find another way - ;; to generate hwdb.bin for cross-built systems. - #$@(if (%current-target-system) - #~(#t) - #~((invoke (string-append #$output "/bin/udevadm") - "hwdb" "--update")))))) - #:configure-flags #~(list "--enable-manpages"))) + "old_library=''\n")))))) + #:configure-flags + #~(list "--enable-manpages" + "--sysconfdir=/etc"))) + (native-search-paths + (list (search-path-specification + (variable "UDEV_HWDB_PATH") + (files '("lib/udev/hwdb.d"))))) (native-inputs (list autoconf automake diff --git a/gnu/packages/patches/eudev-rules-directory.patch b/gnu/packages/patches/eudev-rules-directory.patch index 54fc01c6d5..c4b1cfae39 100644 --- a/gnu/packages/patches/eudev-rules-directory.patch +++ b/gnu/packages/patches/eudev-rules-directory.patch @@ -4,9 +4,9 @@ The old udev 182 supported $UDEV_CONFIG_FILE, which in turn allowed the search path to be customized, but eudev no longer has this, hence this hack. ---- eudev-3.1.5/src/udev/udev-rules.c 2015-10-13 06:22:14.000000000 +0800 -+++ eudev-3.1.5/src/udev/udev-rules.c 2015-10-16 20:45:38.491934336 +0800 -@@ -47,15 +47,11 @@ +--- a/src/udev/udev-rules.c ++++ b/src/udev/udev-rules.c +@@ -48,16 +48,11 @@ struct uid_gid { }; }; @@ -20,11 +20,12 @@ this hack. - "/lib/udev/rules.d", - "/usr/lib/udev/rules.d", -#endif +- "/usr/local/lib/udev/rules.d", + NULL, /* placeholder for $EUDEV_RULES_DIRECTORY */ NULL}; struct udev_rules { -@@ -1704,6 +1700,9 @@ +@@ -1718,6 +1713,9 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) { udev_rules_check_timestamp(rules); -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 05 01:09:27 2023 Received: (at 66099) by debbugs.gnu.org; 5 Oct 2023 05:09:27 +0000 Received: from localhost ([127.0.0.1]:45728 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoGc2-0001EY-Pk for submit@debbugs.gnu.org; Thu, 05 Oct 2023 01:09:27 -0400 Received: from planete-kraus.eu ([89.234.140.182]:42922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoGc1-0001Dv-82 for 66099@debbugs.gnu.org; Thu, 05 Oct 2023 01:09:25 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id dbbd25e5; Thu, 5 Oct 2023 05:09:05 +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=+jfvvqfw0rbioHPFn5mlbydGaJ4=; b=B rV9jjb0Py0mcRhIkdDHLqTOaW95fJqbkZcmPtFdPFcSQ54ZshiKMs60izX2OMxVQ BMZhE24qZ13PtVPciVGBr0hkRDiOnGFll0GsFoiUsXczjBa2cz0KfI6Fxoeob3v7 DHB6l5DWtL2rYpj46I9YCAbIF19XeZt8p74jU8OwrMpoOXYfYZFvHwWBeatzWweZ yZ+sEVbPAHiYwwLRpLKOv9j6ljd5NMg5fkUGAYgPaKAqQGPDBkZij8FsuWTuHyM1 jwNTIKx/PZBDhBQVsgXLahpwZTmed9nWJ5OSfVNkMgaW0quDUD0gEPK88dFyefgo mTszDgzBC7XFkU2AICc2Q== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 4037f9c4 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 5 Oct 2023 05:09:05 +0000 (UTC) Message-ID: <77c5be1f9c3b50fdd4f61cf2e4f80b6900b89a65.1696482243.git.vivien@planete-kraus.eu> In-Reply-To: References: <69e084520f189ab5f8a80afc7011a9b1ae911d2a.camel@gmail.com> From: Vivien Kraus Date: Wed, 4 Oct 2023 23:05:19 +0200 Subject: [PATCH gnome-team v7 2/5] services: udev: unify udev-rule and file->udev-rule. To: Liliana Marie Prikler , maxim.cournoyer@gmail.com, 66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/services/base.scm (udev-rule): Implements in terms of file->udev-rule. Use texinfo in docstring. --- gnu/services/base.scm | 17 +++ 1 file changed, 3 insertions(+), 14 deletions(-) Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.1 (/) * gnu/services/base.scm (udev-rule): Implements in terms of file->udev-rule. Use texinfo in docstring. --- gnu/services/base.scm | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index b3f2d2e8b8..190803b780 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2211,20 +2211,9 @@ (define (udev-rules-union packages) (computed-file "udev-rules" build)) (define (udev-rule file-name contents) - "Return a directory with a udev rule file FILE-NAME containing CONTENTS." - (computed-file file-name - (with-imported-modules '((guix build utils)) - #~(begin - (use-modules (guix build utils)) - - (define rules.d - (string-append #$output "/lib/udev/rules.d")) - - (mkdir-p rules.d) - (call-with-output-file - (string-append rules.d "/" #$file-name) - (lambda (port) - (display #$contents port))))))) + "Return a directory with a udev rule file @var{file-name} containing +@var{contents}." + (file->udev-rule file-name (plain-file file-name contents))) (define (file->udev-rule file-name file) "Return a directory with a udev rule file FILE-NAME which is a copy of FILE." -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 05 01:09:39 2023 Received: (at 66099) by debbugs.gnu.org; 5 Oct 2023 05:09:39 +0000 Received: from localhost ([127.0.0.1]:45731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoGcE-0001F0-3a for submit@debbugs.gnu.org; Thu, 05 Oct 2023 01:09:38 -0400 Received: from planete-kraus.eu ([89.234.140.182]:42922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoGcC-0001Dv-8o for 66099@debbugs.gnu.org; Thu, 05 Oct 2023 01:09:37 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id ce81c2cb; Thu, 5 Oct 2023 05:09:16 +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=g00As9j+mbB2gC+pBiwBRbAQaCs=; b=j +7qbMSVlGtQ/74A/XwKYCfYKC0CnYVsSfcOAd+X1f898Pyzbe2EqoZXEdk0JJiqL gC6RtF1pgKKyOdJmqOHT8sCA4vXMgSSA43gNQV1GY9mHReCF4Nt2yS+R0YJzQ4dW paE83yDTu2S242JugLHrsX/5xRzPSr+CtuUZZs2UOo72/rl3/jX/tvFbV9UJGzm7 2QYBR1adWXX35vJsR3Vofjxxc1bL1wohOaJRGw4IHNvRIuHiosKXimitk43e13yh BA0tXO533Vo3bqVQCMlRJnsRZQpOmQ9MnjFp3EBcnypmmXYpAvoPkfIYFJxRnP7y bAWXW5E6fcPL62GoLBTRA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 12fb4c15 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 5 Oct 2023 05:09:15 +0000 (UTC) Message-ID: <53b29725dbfa2210a4b29105828c611550a8eab7.1696482243.git.vivien@planete-kraus.eu> In-Reply-To: References: <69e084520f189ab5f8a80afc7011a9b1ae911d2a.camel@gmail.com> From: Vivien Kraus Date: Mon, 2 Oct 2023 21:08:49 +0200 Subject: [PATCH gnome-team v7 3/5] gnu: udev-service-type: accept hwdb file extensions. To: Liliana Marie Prikler , maxim.cournoyer@gmail.com, 66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) The "rules" field in the udev-configuration record can now hold both rules and hwdb files. The udev-rules-union has been made generic, and renamed to udev-configuration-union, so that it works with either rules or hwdb files. Some udev-related auxiliary functions in (gnu services base) had non-texinfo variable references in their docstrings ("FILE-NAME" instead of "@var{file-name}"). The contents of the /etc directory now includes hwdb.d and hwdb.bin, which is computed immediately. The documentation has been reworked so as to explain why creating udev rules or hwdb needs helper functions for configuration or extension. The hwdb.bin file is conditionally computed by a native version of eudev, that may be configured in the udev-service-type configuration. The condition is that both target and native eudev have the same version. If so, we can reasonably expect that the hwdb.bin file created by native eudev can later be read by target eudev. * gnu/services/base.scm (udev-configuration-union): Make udev-rules-union generic. (udev-hwdb): New function. (file->udev-rule): Fix docstring. (file->udev-hwdb): New function. (udev-rules-service): Fix docstring. (udev-hwdb-service): New function. (udev-etc): Add hwdb.d and hwdb.bin. (module): Export udev-hwdb, file->udev-hwdb, and udev-hwdb-service. (): Add the native-udev field. * doc/guix.texi (Base Services)[udev-service-type]: Explain configuration and extension values. * doc/guix.texi (Base Services)[udev-hwdb]: Document it. [udev-hwdb-service]: Same. * doc/guix.texi (Base Services)[udev-configuration]: Document the native-udev field. --- doc/guix.texi | 52 +++++++++++++++++++----- gnu/services/base.scm | 94 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 122 insertions(+), 24 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 46591b2f64..3310271ec8 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -19322,9 +19322,23 @@ Base Services @file{/dev} directory dynamically, whose value is a @code{} object. -This service type can be @emph{extended} using procedures -@code{udev-rules-service} along with @code{file->udev-rule} or -@code{udev-rule} which simplify the process of writing udev rules. +Since the file names for udev rules and hwdb files matters, the +configuration items for rules and hwdb cannot simply be plain file-like +objects with the rules content, because the name would be +ignored. Instead, they are directory file-like objects that contain +optional rules in @code{lib/udev/rules.d} and optional hwdb files in +@code{lib/udev/hwdb.d}. This way, the service can be configured with +whole packages from which to take rules and hwdb files. + +The @code{udev-service-type} can be @emph{extended} with file-like +directories that respect this hierarchy. However, to generate a +configuration or an extension, it is advised to use @code{udev-rule} and +@code{file->udev-rule} for rules, and @code{udev-hwdb} and +@code{file->udev-hwdb} for hwdb files. + +In an operating-system declaration, this service type can be +@emph{extended} using procedures @code{udev-rules-service} and +@code{udev-hwdb-service}. @end defvar @deftp {Data Type} udev-configuration @@ -19334,8 +19348,18 @@ Base Services @item @code{udev} (default: @code{eudev}) (type: file-like) Package object of the udev service. +@item @code{native-udev} (default: @code{eudev}) (type: file-like) +Native udev package to compile @code{hwdb.bin}. The trie format used for +@code{hwdb.bin} must be compatible with the @code{udev} and +@code{native-udev} fields of the udev configuration. To avoid generating +@code{hwdb.bin}, pass @code{#f} as the @code{native-udev} field. + +In any case, if the package version string differs between @code{udev} +and @code{native-udev}, @code{hwdb.bin} is @strong{not} created. + @item @code{rules} (default: @var{'()}) (type: list-of-file-like) -List of file-like objects denoting udev-rule files. +List of file-like objects denoting udev-rule or udev-hwdb files under a +sub-directory. @end table @end deftp @@ -19358,6 +19382,11 @@ Base Services @end lisp @end deffn +@deffn {Procedure} udev-hwdb @var{file-name} @var{contents} +Return a udev-hwdb file named @var{file-name} containing the hardware +information @var{contents}. +@end deffn + @deffn {Procedure} udev-rules-service @var{name} @var{rules} [#:groups '()] Return a service that extends @code{udev-service-type} with @var{rules} and @code{account-service-type} with @var{groups} as system groups. @@ -19377,6 +19406,11 @@ Base Services @end lisp @end deffn +@deffn {Procedure} udev-hwdb-service @var{name} @var{hwdb} +Return a service that extends @code{udev-service-type} with +@var{hwdb}. The service name is @code{@var{name}-udev-hwdb}. +@end deffn + @deffn {Procedure} file->udev-rule @var{file-name} @var{file} Return a udev-rule file named @var{file-name} containing the rules defined within @var{file}, a file-like object. @@ -19401,12 +19435,10 @@ Base Services @end lisp @end deffn -Additionally, Guix package definitions can be included in @var{rules} in -order to extend the udev rules with the definitions found under their -@file{lib/udev/rules.d} sub-directory. In lieu of the previous -@var{file->udev-rule} example, we could have used the -@var{android-udev-rules} package which exists in Guix in the @code{(gnu -packages android)} module. +@deffn {Procedure} file->udev-hwdb @var{file-name} @var{file} +Return a udev-hwdb file named @var{file-name} containing the rules +defined within @var{file}, a file-like object. +@end deffn The following example shows how to use the @var{android-udev-rules} package so that the Android tool @command{adb} can detect devices diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 190803b780..00916a35e4 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -81,6 +81,7 @@ (define-module (gnu services base) #:select (mount-flags->bit-mask swap-space->flags-bit-mask)) #:use-module (guix gexp) + #:use-module ((guix packages) #:select (package-version)) #:use-module (guix records) #:use-module (guix modules) #:use-module (guix pki) @@ -153,8 +154,11 @@ (define-module (gnu services base) udev-service-type udev-service ; deprecated udev-rule + udev-hwdb file->udev-rule + file->udev-hwdb udev-rules-service + udev-hwdb-service login-configuration login-configuration? @@ -2181,12 +2185,15 @@ (define-record-type* udev-configuration? (udev udev-configuration-udev ;file-like (default eudev)) - (rules udev-configuration-rules ;list of file-like + (native-udev udev-configuration-native-udev + (default eudev)) + (rules udev-configuration-rules ;list of rule- and + ;hwdb-providing packages (default '()))) -(define (udev-rules-union packages) - "Return the union of the @code{lib/udev/rules.d} directories found in each -item of @var{packages}." +(define (udev-configuration-union subdirectory packages) + "Return the union of the @code{lib/udev/@var{subdirectory}.d} directories found +in each item of @var{packages}." (define build (with-imported-modules '((guix build union) (guix build utils)) @@ -2197,7 +2204,8 @@ (define (udev-rules-union packages) (srfi srfi-26)) (define %standard-locations - '("/lib/udev/rules.d" "/libexec/udev/rules.d")) + '(#$(string-append "/lib/udev/" subdirectory ".d") + #$(string-append "/libexec/udev/" subdirectory ".d"))) (define (rules-sub-directory directory) ;; Return the sub-directory of DIRECTORY containing udev rules, or @@ -2208,15 +2216,21 @@ (define (udev-rules-union packages) (union-build #$output (filter-map rules-sub-directory '#$packages))))) - (computed-file "udev-rules" build)) + (computed-file (string-append "udev-" subdirectory) build)) (define (udev-rule file-name contents) "Return a directory with a udev rule file @var{file-name} containing @var{contents}." (file->udev-rule file-name (plain-file file-name contents))) +(define (udev-hwdb file-name contents) + "Return a directory with a udev hwdb file @var{file-name} containing +@var{contents}." + (file->udev-hwdb file-name (plain-file file-name contents))) + (define (file->udev-rule file-name file) - "Return a directory with a udev rule file FILE-NAME which is a copy of FILE." + "Return a directory with a udev rule file @var{file-name} which is a copy of +@var{file}." (computed-file file-name (with-imported-modules '((guix build utils)) #~(begin @@ -2231,6 +2245,23 @@ (define (file->udev-rule file-name file) (mkdir-p rules.d) (copy-file #$file file-copy-dest))))) +(define (file->udev-hwdb file-name file) + "Return a directory with a udev hwdb file @var{file-name} which is a copy of +@var{file}." + (computed-file file-name + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + + (define hwdb.d + (string-append #$output "/lib/udev/hwdb.d")) + + (define file-copy-dest + (string-append hwdb.d "/" #$file-name)) + + (mkdir-p hwdb.d) + (copy-file #$file file-copy-dest))))) + (define kvm-udev-rule ;; Return a directory with a udev rule that changes the group of /dev/kvm to ;; "kvm" and makes it #o660. Apparently QEMU-KVM used to ship this rule, @@ -2338,13 +2369,35 @@ (define udev.conf (define (udev-etc config) (match-record config - (udev rules) + (udev native-udev rules) + (let* ((hwdb.d + (udev-configuration-union "hwdb" (cons* udev rules))) + (hwdb.bin + (and native-udev + (equal? (package-version udev) + (package-version native-udev)) + (computed-file + "hwdb.bin" + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + (setenv "UDEV_HWDB_PATH" #$hwdb.d) + (invoke #+(file-append native-udev "/bin/udevadm") + "hwdb" + "--update" + "-o" #$output))))))) `(("udev" ,(file-union "udev" `(("udev.conf" ,udev.conf) ("rules.d" - ,(udev-rules-union (cons* udev kvm-udev-rule - rules))))))))) + ,(udev-configuration-union + "rules" + (cons* udev kvm-udev-rule + rules))) + ("hwdb.d" ,hwdb.d) + ,@(if hwdb.bin + `(("hwdb.bin" ,hwdb.bin)) + '())))))))) (define udev-service-type (service-type (name 'udev) @@ -2373,10 +2426,10 @@ (define-deprecated (udev-service #:key (udev eudev) (rules '())) (udev-configuration (udev udev) (rules rules)))) (define* (udev-rules-service name rules #:key (groups '())) - "Return a service that extends udev-service-type with RULES and -account-service-type with GROUPS as system groups. This works by creating a -singleton service type NAME-udev-rules, of which the returned service is an -instance." + "Return a service that extends udev-service-type with @var{rules} and +@code{account-service-type} with @var{groups} as system groups. This works by +creating a singleton service type @code{@var{name}-udev-rules}, of which the +returned service is an instance." (let* ((name (symbol-append name '-udev-rules)) (account-extension (const (map (lambda (group) @@ -2393,6 +2446,19 @@ (define* (udev-rules-service name rules #:key (groups '())) (description "This service adds udev rules.")))) (service type #f))) +(define (udev-hwdb-service name hwdb-files) + "Return a service that extends udev-service-type with @var{hwdb-files}, named +@code{@var{name}-udev-hwdb}." + (let* ((name (symbol-append name '-udev-hwdb)) + (udev-extension (const (list hwdb-files))) + (type (service-type + (name name) + (extensions (list + (service-extension + udev-service-type udev-extension))) + (description "This service adds udev hwdb files.")))) + (service type #f))) + (define (swap-space->shepherd-service-name space) (let ((target (swap-space-target space))) (symbol-append 'swap- -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 05 01:09:47 2023 Received: (at 66099) by debbugs.gnu.org; 5 Oct 2023 05:09:47 +0000 Received: from localhost ([127.0.0.1]:45734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoGcN-0001FP-12 for submit@debbugs.gnu.org; Thu, 05 Oct 2023 01:09:47 -0400 Received: from planete-kraus.eu ([89.234.140.182]:42922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoGcL-0001Dv-9U for 66099@debbugs.gnu.org; Thu, 05 Oct 2023 01:09:45 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id d85f705b; Thu, 5 Oct 2023 05:09:25 +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=8IllG/iUYeuMh4Fe17WtACJeN8U=; b=V E8RAFBC9qf8jEe3gv7lKATdwrOXwLuzyHzfu/kMxmrZbXMZgWdwnTjn7cSmozwwI gmXtcMWeTE3Z3Pwrew2IbiOLWVqNdBGDBZmiA/TB/qagLWdmV43s/nQtb4lLB1ob pzXRvSVoYbg7HhBcZaugr7qia6e6q539HmmH8JuXOCQLO5ZQuI9cdm3NuKX1t0Cs GMe6Ss187p6S0slHr3jXhFTsAgPOXf/lAeQzBQalZbN1eY5WUNBLXyTDsLN3Y5zy tR676+Na8QOi7zTmoS/3JPVPx2iHcxlDTnNIUFfs+LZ/BRQ38wCsLpf1XqZGVqyy DAJe0Hm1eerxC4gg0arhA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 456d86a0 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 5 Oct 2023 05:09:25 +0000 (UTC) Message-ID: In-Reply-To: References: <69e084520f189ab5f8a80afc7011a9b1ae911d2a.camel@gmail.com> From: Vivien Kraus Date: Tue, 19 Sep 2023 13:32:26 +0200 Subject: [PATCH gnome-team v7 4/5] gnu: libgudev: Update to 238. To: Liliana Marie Prikler , maxim.cournoyer@gmail.com, 66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ea3dc455a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-pl [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ea3dc455a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-pl [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ea3dc455a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-plugins (define-public libgudev (package (name "libgudev") - (version "236") + (version "238") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "094mgjmwgsgqrr1i0vd20ynvlkihvs3vgbmpbrhswjsrdp86j0z5")))) + "1laxgdkgmr30aw44sm4rgpsdybwxx5rszcm8c2y3vmy9myqnl9k1")))) (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 05 01:09:56 2023 Received: (at 66099) by debbugs.gnu.org; 5 Oct 2023 05:09:56 +0000 Received: from localhost ([127.0.0.1]:45737 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoGcW-0001Fk-AN for submit@debbugs.gnu.org; Thu, 05 Oct 2023 01:09:56 -0400 Received: from planete-kraus.eu ([89.234.140.182]:42922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoGcT-0001Dv-9w for 66099@debbugs.gnu.org; Thu, 05 Oct 2023 01:09:54 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 5405c536; Thu, 5 Oct 2023 05:09:33 +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:mime-version :content-type:content-transfer-encoding:to:cc; s=albinoniB; bh=U 4Q95r5OzDlerBhawFCb592wjQg=; b=lLwGFu+tVIobrOx8XoBdMi4DLKMlVyQz0 k2AQi/TaSDg0CFzTPmS2dANA/sZhP5u/jZiMk1sBfWPm1jMXy17I27QaE0TEZFEV tAaSyVbERpUJ8KVC8H/60ygNJiEiLz3QC80vfhUx+p8GtQbD0jN7Ldqc4qgEymK0 uJhx9n+dPUcawdcP3w2nkBCoDFlqP4/T0X4JmTJRnfcgdvs4cuv4GAmv5WACqXeR 0tOMp5h7K4uYTdwLzBFqCQaVbNZlTB6QewzNJLAn1Bcm4g0Gjk8bGc0PYJ4W4Gay lJgCLlTGDpnUJSgaxLUcNPcjm5mlRb2FT0jkbqqLt1IutBwka5vHg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 5f4c8abe (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 5 Oct 2023 05:09:33 +0000 (UTC) Message-ID: <1d1ca103f706928cdf7c9008fa00e67af66a6a91.1696482243.git.vivien@planete-kraus.eu> In-Reply-To: References: <69e084520f189ab5f8a80afc7011a9b1ae911d2a.camel@gmail.com> From: Vivien Kraus Date: Tue, 19 Sep 2023 13:32:46 +0200 Subject: [PATCH gnome-team v7 5/5] gnu: upower: Update to 1.90.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: Liliana Marie Prikler , maxim.cournoyer@gmail.com, 66099@debbugs.gnu.org User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The new eudev now can install hwdb files. Upower has some, but they should get installed in upower’s output, not eudev’s. The phases needed a rework. Now the 32-bit-specific test fix is always there, except it may be empty. Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The new eudev now can install hwdb files. Upower has some, but they should get installed in upower’s output, not eudev’s. The phases needed a rework. Now the 32-bit-specific test fix is always there, except it may be empty. Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager The new eudev now can install hwdb files. Upower has some, but they should get installed in upower’s output, not eudev’s. The phases needed a rework. Now the 32-bit-specific test fix is always there, except it may be empty. test_bluetooth_hidpp_mouse fails, after calling into a bluez dbus method. * gnu/packages/gnome.scm (upower): Update to 1.90.2. [#:configure-flags]: Set udevhwdbdir. [#:phases] : Add this phase unconditionnally : Disable test_bluetooth_hidpp_mouse. [inputs]: Remove dbus-glib. [native-inputs]: Add dbus. --- gnu/packages/gnome.scm | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4ea3dc455a..3f773aae8a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5727,7 +5727,7 @@ (define-public geocode-glib-with-libsoup2 (define-public upower (package (name "upower") - (version "1.90.0") + (version "1.90.2") (source (origin (method git-fetch) @@ -5736,7 +5736,7 @@ (define-public upower (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1g17rm91p8vfpjyb0k2shylrs55nccn3fa890vlk4n9s71sghbzq")) + (base32 "13xp423ycv8imf2cmgf6lii9f01p7x2v19cny7acrmczkc0cqv7d")) (modules '((guix build utils))) (snippet ;; Upstream commit . - (substitute* "src/linux/integration-test.py" - (("assertEqual(.*)40\\.0" _ middle) - (string-append - "assertAlmostEqual" middle "40.0")))))) - #~%standard-phases))) + (string-append "-Dudevrulesdir=" #$output "/bin/udev/rules.d") + (string-append "-Dudevhwdbdir=" #$output "/lib/udev/hwdb.d")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'adjust-test-suite + (lambda _ + ;; This test calls an unimplemented bluez dbus method. + (substitute* "src/linux/integration-test.py" + (("test_bluetooth_hidpp_mouse") + "disabled_test_bluetooth_hidpp_mouse")) + #$@(if (target-x86-32?) + ;; Address test failure caused by excess precision + ;; on i686: + ;; . + '((substitute* "src/linux/integration-test.py" + (("assertEqual(.*)40\\.0" _ middle) + (string-append + "assertAlmostEqual" middle "40.0")))) + '())))))) (native-inputs (list `(,glib "bin") ; for gdbus-codegen gobject-introspection @@ -5785,12 +5791,13 @@ (define-public upower python-packaging python-pygobject umockdev + dbus ;; For man pages. docbook-xsl libxslt ; for 'xsltproc' libxml2)) ; for 'XML_CATALOG_FILES' (inputs - (list dbus-glib libgudev libusb)) + (list libgudev libusb)) (propagated-inputs ;; In Requires of upower-glib.pc. (list glib)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 05 01:43:25 2023 Received: (at 66099) by debbugs.gnu.org; 5 Oct 2023 05:43:25 +0000 Received: from localhost ([127.0.0.1]:45788 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoH8u-0002Is-Vs for submit@debbugs.gnu.org; Thu, 05 Oct 2023 01:43:25 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:58472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoH8t-0002If-40 for 66099@debbugs.gnu.org; Thu, 05 Oct 2023 01:43:23 -0400 Received: by mail-wm1-x344.google.com with SMTP id 5b1f17b1804b1-4064876e8b8so5693185e9.0 for <66099@debbugs.gnu.org>; Wed, 04 Oct 2023 22:43:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696484579; x=1697089379; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=1LX/RONePIRiU1FdHwTKWvdIm0N6hGA8ZM0CJD12oEA=; b=DiiOV6quQ4GKHWptdAuyAw8GT5XSOsZHlO/ueCQ/pnJkW52rrsSjoBBNJqS/ZECLYp b5v0JpWKBujpeAwkekT12Kz0gj5oWsXLs0/2HtZDrYePDthRPpBiGqhx2nvpan//6ZQ/ sezShiiZcuA/kpN7dCjCpbQ8lMGU91N0N+UDd0IFddIHORN8rEcB1RmJuSjcrNT6ZFz6 i8PPyyADxNc4yLURSxbdxdEY9n7C/P571oBR9nM52az4dyhbqWlnKzaYpGbtUO84FatH cCJehL+/eQ0BOpnybDaSFCj83MaF1Qxuke+fCPMUQOCJsHw41h0NgPpn2RIg1Trbi2fK 3r+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696484579; x=1697089379; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=1LX/RONePIRiU1FdHwTKWvdIm0N6hGA8ZM0CJD12oEA=; b=dEX5+bXgU7knpZYhMmAlYpSK3c3t8FPOORZQfSOopeYD4/Jhhg9E6c+bEQCTUk8RD7 illKfvlKDezX7noc8WLNSj/9qf2onaXHiXpfSFlVNxPnvSuPu3zo7GlXXSoJ3FfCXiAC ljb77Be12BZzxmTKTVKLZ2D7MTSV6LvirRAMqVJamk8Hw8eGhop8HKmxp9ajxqhZPO+I DVF2vfJntB4Us+CwkMWl858cl8fw53Kmp79e+FDkVw74fk6dhoHkN4mss7Mf4i250VZP hFa1ipHMsJyErXFE/ebVv6QSzDo4aADVuAVrtQ/lMYPpofD8iU137hq+BHEpVGT1dTWi Etxw== X-Gm-Message-State: AOJu0YxkPJSbuqxB/DOtaCNk1Gxd6J4INRLmvU0hx9EMXU74toF3PIbO xwoDwJaWbfCqYqQXXBy4yqo= X-Google-Smtp-Source: AGHT+IFPgtGdDbCL1/rAAcwbS90hs2U17NHyFA1c5hFBy1inoBgEvUcxoDilXA0ErW5t1ASdOMO7Xg== X-Received: by 2002:a05:600c:2242:b0:401:2fab:43e8 with SMTP id a2-20020a05600c224200b004012fab43e8mr3844296wmm.15.1696484578859; Wed, 04 Oct 2023 22:42:58 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id n26-20020a05600c3b9a00b004068def185asm519990wms.28.2023.10.04.22.42.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 22:42:57 -0700 (PDT) Message-ID: <0825bf42daa34ee464c5237b04ad6bf90942e489.camel@gmail.com> Subject: Re: [PATCH gnome-team v6 3/5] gnu: udev-service-type: accept hwdb file extensions. From: Liliana Marie Prikler To: Vivien Kraus , maxim.cournoyer@gmail.com, 66099@debbugs.gnu.org Date: Thu, 05 Oct 2023 07:42:55 +0200 In-Reply-To: References: <42e4b490bce80a94f1afb7f5843d77823058150a.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Montag, dem 02.10.2023 um 21:08 +0200 schrieb Vivien Kraus: > The "rules" field in the udev-configuration record can now hold both > rules and hwdb files. Yeah, how about we instead have separate fields =E2=80=93 one named "rules"= and one named "hardware". We're already breaking ABI stability anyway, so we might as well. Speaking of which, we might want to rename "hwdb.d" to "hardware" in udev itself to make that name readable, but keep /etc/udev/hwdb.bin as- is. Cheers From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 05 01:55:05 2023 Received: (at 66099) by debbugs.gnu.org; 5 Oct 2023 05:55:05 +0000 Received: from localhost ([127.0.0.1]:45819 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoHKD-0002iE-44 for submit@debbugs.gnu.org; Thu, 05 Oct 2023 01:55:05 -0400 Received: from mail-lj1-x236.google.com ([2a00:1450:4864:20::236]:59549) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoHKB-0002hh-QZ for 66099@debbugs.gnu.org; Thu, 05 Oct 2023 01:55:04 -0400 Received: by mail-lj1-x236.google.com with SMTP id 38308e7fff4ca-2bffc55af02so6834711fa.2 for <66099@debbugs.gnu.org>; Wed, 04 Oct 2023 22:54:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696485280; x=1697090080; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=5BCDfOdw0UiHPqKRE7lgq9gE6p7Gr0PeIgwR3gBFx60=; b=ESc3+VH5h6w4ZMPEa+5hqZY+gEzazZF5rRldLhln8tyT/dCXqd/Oq8RgCrg0p0bq2c dRkaw3LDVQS5JEold+Y9NbwKqazauxn82JuxJsASvGfntMnPn5HlrRz0vDcjfFof/QZb UhJTTQwtzF8uRvgvotbGOXL6SVWVxn90+ORTEcK3PrX1GX3oIBjvZ67dpeYMivQEb1Mm RVtTnb9BLbyaG3SF8CIE8j6kRneXQfMq3EeVGEWeq18yimMSV9KqVJk8mTOy/hMiNmCB a+h7Qu8mkAw5KxeF5+8CO3U864ciHcJO/mEq1Kr8NehS0A+IZLEpkmtg1ElCZhV971vx FcBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696485280; x=1697090080; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=5BCDfOdw0UiHPqKRE7lgq9gE6p7Gr0PeIgwR3gBFx60=; b=ZCbBDt+9CIwZrgy+iwYSnjo+HGlh1zCBEcvhDBHy6GUFEBJLm0iZBIlW5oOrNhwHqg mUeKAGVH/d6dkDrYAvyeVvt5GhF2I00tado5CdxC/wBK3grO0jfL0MwWavLR3Cd4rBLn sb1as15tD/F/I5MJ2bd1D5cLctfb+WqSl56YiBmrH/b6vhiQQEaNdMWIfXk7V3tu8IAY /67GyHiEPtrD3yhwxrlo7XiS2qJW6h8kzTmLdkzvMDJwDTGD5MrAq8H9sHQQN10i4DsC 7aJvAnFh+3pJKNAOUbOx4rdGjrPv9VdMewbjS2+sOv8w/xYIx5Of5sNQmALMQezXYG+m dMgQ== X-Gm-Message-State: AOJu0YxmoPaWfqiFwfPzkznhmgOAlqGNlTdReIygLju7cjiRuugjed9r UDMB2N19Zu1ieMRGK+gxFlw= X-Google-Smtp-Source: AGHT+IHryyG+yK8uhGXuVufWyG6QBGTCLJRtdnA5u5TNCVWEd9dI4waNFeSSDhxV4alL8oxgbYVmBQ== X-Received: by 2002:a2e:8097:0:b0:2bb:aaec:abad with SMTP id i23-20020a2e8097000000b002bbaaecabadmr4419298ljg.30.1696485279476; Wed, 04 Oct 2023 22:54:39 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id l12-20020a170906078c00b00992b510089asm560647ejc.84.2023.10.04.22.54.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 22:54:38 -0700 (PDT) Message-ID: Subject: Re: [PATCH gnome-team v7 0/5] Update eudev with a snippet, udev-service-type, upower From: Liliana Marie Prikler To: Vivien Kraus , maxim.cournoyer@gmail.com, 66099@debbugs.gnu.org Date: Thu, 05 Oct 2023 07:54:37 +0200 In-Reply-To: References: <69e084520f189ab5f8a80afc7011a9b1ae911d2a.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Donnerstag, dem 05.10.2023 um 07:04 +0200 schrieb Vivien Kraus: > Le jeudi 05 octobre 2023 =C3=A0 06:50 +0200, Liliana Marie Prikler a =C3= =A9crit > : > > Am Dienstag, dem 19.09.2023 um 13:23 +0200 schrieb Vivien Kraus: > > > Eudev has significant improvements from 3.2.12, but they are not > > > released yet. The package version number has already been bumped > > > to > > > 3.2.14, but since it is not released yet, the version number is > > > downgraded to 3.2.12. > > Smaller nitpick: I think "we still advertise it as 3.2.12" is > > better wording here.=C2=A0 Downgrade would imho imply a removal of > > functionality which is not happening here. >=20 > OK. >=20 > > > * gnu/packages/linux.scm (eudev): Update to a post-v3.2.12 > > > commit. > > > [#:phases] : New phase. > > > : New phase. > > > : Remove phase. > > > [#:configure-flags]: Set sysconfdir to avoid a prefix. > > > [native-search-paths]: Add UDEV_HWDB_PATH. > > > * gnu/packages/patches/eudev-set-version-to-3.2.12.patch: New > > > file. > > You might want to express this one with a snippet and an explicit > > comment to remove it once a release version is used. >=20 > I thoug=E1=B8=A5t the patch would be more useful as it would then fail to > apply, but I understand the updater could be unsure whether to remove > or rebase the patch. A snippet + comment is more explicit. Sorry for taking my time on the 3/5, had breakfast :( > Everything that eudev searches in "sysconf" (/etc/udev/*) is actually > searched under its installation prefix. The udev-service-type however > prepares every file in /etc/udev, without a prefix. Is this a correct statement? I would assume not. Cheers From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 05 01:55:47 2023 Received: (at 66099) by debbugs.gnu.org; 5 Oct 2023 05:55:47 +0000 Received: from localhost ([127.0.0.1]:45822 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoHKt-0002jT-Hu for submit@debbugs.gnu.org; Thu, 05 Oct 2023 01:55:47 -0400 Received: from planete-kraus.eu ([89.234.140.182]:51666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoHKq-0002jE-Ja for 66099@debbugs.gnu.org; Thu, 05 Oct 2023 01:55:46 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 8f162d61; Thu, 5 Oct 2023 05:55:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:cc:date:in-reply-to:references :content-type:content-transfer-encoding:mime-version; s= albinoniB; bh=o+Z2VLCiXnz9elbGNLGFVbJms2U=; b=EB1x874Rfi7AyX8bD0 NKf5oTcVNPf8LK9hq+pRm/q5pRPIELfR0egPpLgl7TeTOJAzUzZjNwsnLw2Lr7aD +PDYyEYH05hMc8tdQpFiNk+2NQ3PMHhXoQDnAjCFh1UujYgmF2/Z19rXyc2gQpWB OddUuBpFOxfTew9BiU3FvByeDPvEY67+0ZKIZUXfoGKZCA36gurB0tcPjQS4n6cf qs6eGdm6/3uNSKUhL+aL65pAk71HaLLI8hXflqM75KWq3g17Z69LTfW2xD+QTbVa zruAIbExsm1vENRcqHXIFTRBaACzLXR35ETlSgCyHi4joPwRXvoAdhLfDRfLg1tM XGfA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 41363cb5 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 5 Oct 2023 05:55:24 +0000 (UTC) Message-ID: <8d515c3de9de879e3dba0e1f5dec1e40983b8560.camel@planete-kraus.eu> Subject: Re: [PATCH gnome-team v6 3/5] gnu: udev-service-type: accept hwdb file extensions. From: Vivien Kraus To: Liliana Marie Prikler , maxim.cournoyer@gmail.com, 66099@debbugs.gnu.org Date: Thu, 05 Oct 2023 07:55:20 +0200 In-Reply-To: <0825bf42daa34ee464c5237b04ad6bf90942e489.camel@gmail.com> References: <42e4b490bce80a94f1afb7f5843d77823058150a.camel@gmail.com> <0825bf42daa34ee464c5237b04ad6bf90942e489.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le jeudi 05 octobre 2023 =C3=A0 07:42 +0200, Liliana Marie Prikler a =C3=A9= crit=C2=A0: > Am Montag, dem 02.10.2023 um 21:08 +0200 schrieb Vivien Kraus: > > The "rules" field in the udev-configuration record can now hold > > both > > rules and hwdb files. > Yeah, how about we instead have separate fields =E2=80=93 one named "rule= s" > and > one named "hardware". Since the extensions are untyped anyway, I thought we would not care in the configuration record itself. Should we also introduce types for the extension values? Vivien From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 05 02:54:03 2023 Received: (at 66099) by debbugs.gnu.org; 5 Oct 2023 06:54:03 +0000 Received: from localhost ([127.0.0.1]:45863 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoIFG-0004It-SZ for submit@debbugs.gnu.org; Thu, 05 Oct 2023 02:54:03 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:60466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoIFE-0004IP-Ua for 66099@debbugs.gnu.org; Thu, 05 Oct 2023 02:54:01 -0400 Received: by mail-wm1-x341.google.com with SMTP id 5b1f17b1804b1-405361bb94eso5937795e9.0 for <66099@debbugs.gnu.org>; Wed, 04 Oct 2023 23:53:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696488816; x=1697093616; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=5PetJfcO6bwa6/NeyWQJirZI6+xodbrgupzrreGHLOw=; b=agknOTCBippJZK1w7Jd2l4/sSHkLXy/hsUVBrDMq8cljiW3JmFSEJypMzrZYl+iz52 EsNq9/4dtie9CewZcqLCUPg0qvIXibVQfhpH0fuDKKAZj6AuCFzh9DEG2Ii3fDwsVM9Z K7+04wzX/At9EqiRTTHGOFsHPPDGczyGOsWf3i07WcmQo0f/iSi4IBYVQByFfw6k6Q4E geCWz2W63N65Ew4Mv86Zv+xuYJ2HhRJnlHn91mjzgK3+CyJw08vWqPyi3H3H8OR0B5Du YSGInXHLHQg2x1QEXXtb5CSR/ocAYhA1YiGh8muanktkhRQ1FZmuoQS6sU+EnmNQbQyf Aq6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696488816; x=1697093616; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=5PetJfcO6bwa6/NeyWQJirZI6+xodbrgupzrreGHLOw=; b=tsez+OKICW/mNUlTdU+C44+majgS5GATLPijiivOxcfhNYF61SvsvVBiOPBXfudcBY SSWG/fv66RXSt/7peMFNo6OydDPeU9RgTEBz0KxzKRMcLvyPM/mzWAKaJtBaoWQbUcZJ WomIHO3UyXvvd5bjOfX+AgVPEotf/9eW+yuVpylG7ZFi1r7hLPv47IcOYlX17KqEH5Gy 8Fy5VoGMMtu6aoMXtU5E4YDWB6KZOL5fiE+OxQzL4cDv726OeJ0PQAKOiujYwixavmG7 wQdGYTqSFMHB1ujMeiyemugqGAnWhzW0A4h9vTOXiqB1g7+ynhp8bbW5vmot6dlFbInj kEvQ== X-Gm-Message-State: AOJu0Yy0P34jlE5lcLkrL3/k+ke+9RiHSx+AKirxo2ZEJI+NwRBHJG44 7yLL/Kb5mqRr8LpZPJddh0U= X-Google-Smtp-Source: AGHT+IF1h8gxpeoh7nXdCo0USj2qb8Lli3VcnQkTNAGUvkubirhN+3OK9Ex2DhD0BNDUaClehWVJGg== X-Received: by 2002:a05:600c:220b:b0:406:7029:c4f2 with SMTP id z11-20020a05600c220b00b004067029c4f2mr3909049wml.26.1696488816175; Wed, 04 Oct 2023 23:53:36 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id u22-20020a05600c00d600b00405ee9dc69esm3040535wmm.18.2023.10.04.23.53.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 23:53:35 -0700 (PDT) Message-ID: <1a1089275d13e02b4485c5de6e908ece88f5d2b6.camel@gmail.com> Subject: Re: [PATCH gnome-team v6 3/5] gnu: udev-service-type: accept hwdb file extensions. From: Liliana Marie Prikler To: Vivien Kraus , maxim.cournoyer@gmail.com, 66099@debbugs.gnu.org Date: Thu, 05 Oct 2023 08:53:34 +0200 In-Reply-To: <8d515c3de9de879e3dba0e1f5dec1e40983b8560.camel@planete-kraus.eu> References: <42e4b490bce80a94f1afb7f5843d77823058150a.camel@gmail.com> <0825bf42daa34ee464c5237b04ad6bf90942e489.camel@gmail.com> <8d515c3de9de879e3dba0e1f5dec1e40983b8560.camel@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Donnerstag, dem 05.10.2023 um 07:55 +0200 schrieb Vivien Kraus: > Le jeudi 05 octobre 2023 =C3=A0 07:42 +0200, Liliana Marie Prikler a > =C3=A9crit=C2=A0: > > Am Montag, dem 02.10.2023 um 21:08 +0200 schrieb Vivien Kraus: > > > The "rules" field in the udev-configuration record can now hold > > > both rules and hwdb files. > > Yeah, how about we instead have separate fields =E2=80=93 one named "ru= les" > > and one named "hardware". >=20 > Since the extensions are untyped anyway, I thought we would not care > in the configuration record itself. Should we also introduce types > for the extension values? This is about field semantics rather than type theory, but if you prefer, I think we can use list-of file-like? or similar for both. Cheers From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 05 09:29:25 2023 Received: (at 66099) by debbugs.gnu.org; 5 Oct 2023 13:29:25 +0000 Received: from localhost ([127.0.0.1]:46287 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoOPq-0003jN-74 for submit@debbugs.gnu.org; Thu, 05 Oct 2023 09:29:25 -0400 Received: from mail-ot1-x336.google.com ([2607:f8b0:4864:20::336]:56680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoOPk-0003j6-Ot for 66099@debbugs.gnu.org; Thu, 05 Oct 2023 09:29:20 -0400 Received: by mail-ot1-x336.google.com with SMTP id 46e09a7af769-6c615df24c0so628590a34.1 for <66099@debbugs.gnu.org>; Thu, 05 Oct 2023 06:28:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696512533; x=1697117333; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=V6xm5NYwAiO38i+C5VmJB/m8ILk6q0ytAaS6G971VoQ=; b=mi5QDjZybT9Ws0+oIaxnJbJhYJHoWc3vDGxQ5NVmb3NTPQFd1zyLTTEKzadEUum3QN OtX4jNnWovRFamstOPKfDmfkYP09ySgm2ER00ssrsQ5OltmG7gWXedpa4Zm2wqy899aq Rp++UJ/9bAKLM5msMw0Aj+KJuSMSpPAkRZTqFkioOX+K1vhhXlodAW9B+GHI/IaDHikF ywdAnijm4XVjc/pDYBZp2wJKYN11u2vlC3+5Wy2eJYak8cIytBKshzAzEGoUaUGot3/w /cpJnXiIpE0vB4uK7du9SnzualwS9qtnVI2XuLgv+soi7RPbruYYySTrEbSld3tJRS0Z DVRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696512533; x=1697117333; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=V6xm5NYwAiO38i+C5VmJB/m8ILk6q0ytAaS6G971VoQ=; b=hawdehZ7Z04loui13wTtF3lQQ08t7QEMeFuM1Q6nX4mwe5wNUCPbF9PXGhFJoKHja4 fDEvlRYj4IcdjIVJURXBooQOdPikKqnueyy7nE7v9k9dkIoxPQ8J4FQ+f3rUrm2IFmFk BzH02J20Iv+fHgbsm+hSvbxp9jLkOCNC5E9hd2Kbylv/rm8T1QBOjjQrdirkRQ+Nhajs 1weqqlK0yh+X48EuJrnYNCPdETC1IhqYeb53+uv9w+m2SQVkOeujM+Agv8oiGj/t4woi hmy8os/g2XWw5ICEh7smB2r9YSFdP0M3J/ZhwNuDvsSZoM1XfgRK/LaDCOyhMj9CHEzg 3jUw== X-Gm-Message-State: AOJu0Yyq2pn/MiJWmwKtzhYDtIuKUIejpbmz498p5mhArb9+EaAIDI5k 0X4ghKu3kkVNXrBjRTegwdQ= X-Google-Smtp-Source: AGHT+IEZZAx8xH9FAnjfa3DLN5eoB6SdfGunGWd2puviiNTsO9QrDt6WIO37Vleteyb3Ew8bCVgiVQ== X-Received: by 2002:a05:6870:3921:b0:1d6:1755:825e with SMTP id b33-20020a056870392100b001d61755825emr5925451oap.25.1696512532661; Thu, 05 Oct 2023 06:28:52 -0700 (PDT) Received: from hurd (dsl-151-116.b2b2c.ca. [66.158.151.116]) by smtp.gmail.com with ESMTPSA id o13-20020ae9f50d000000b007742ad3047asm479550qkg.54.2023.10.05.06.28.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 06:28:52 -0700 (PDT) From: Maxim Cournoyer To: Vivien Kraus Subject: Re: [PATCH gnome-team v7 1/5] gnu: eudev: Update libudev version to 251. In-Reply-To: <5336473ade7d12a8c96f7212dad22c9fb3d18524.1696482243.git.vivien@planete-kraus.eu> (Vivien Kraus's message of "Tue, 19 Sep 2023 13:23:22 +0200") References: <69e084520f189ab5f8a80afc7011a9b1ae911d2a.camel@gmail.com> <5336473ade7d12a8c96f7212dad22c9fb3d18524.1696482243.git.vivien@planete-kraus.eu> Date: Thu, 05 Oct 2023 09:28:50 -0400 Message-ID: <87y1ghryel.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: 66099@debbugs.gnu.org, Liliana Marie Prikler , rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Vivien Kraus writes: > Eudev has significant improvements from 3.2.12, but they are not released > yet. The package version number has already been bumped to 3.2.14, but si= nce > it is not released yet, we still advertise it as 3.2.12. > > Everything that eudev searches in "sysconf" (/etc/udev/*) is actually sea= rched > under its installation prefix. The udev-service-type however prepares eve= ry > file in /etc/udev, without a prefix. > > Eudev has a hardware database that installs descriptions of hardware in /= etc, > but they should go to /lib prior to being used. The build system = can=E2=80=99t > install to /etc, and should not, because this directory is owned by the > udev-service-type. So they are installed directly in /lib. Another > file, an empty /etc/udev.conf, is simply ignored. This sounds more like a limitation/bug in our udev-service-type than in eudev? If eudev wants its files installed to /etc, they should be left there I think. Going against this is more maintenance down the road, and surprise from users. > The hwdb.bin file used to be generated in /etc/udev/hwdb.bin, but > since the sysconf dir is now directly /etc, the hwdb.bin index will not be > found under /etc/udev/hwdb.bin. > > * gnu/packages/linux.scm (eudev): Update to a post-v3.2.12 commit. > [snippet]: New snippet to override the version number. > [modules]: Import (guix build utils). > [#:phases] : New phase. > : New phase. > : Remove phase. > [#:configure-flags]: Set sysconfdir to avoid a prefix. The above should be commented in the code. What prefix? sysconfdir typically defaults to /etc, if I recall correctly. > [native-search-paths]: Add UDEV_HWDB_PATH. > * gnu/packages/patches/eudev-rules-directory.patch: Rebase it. > --- > gnu/packages/linux.scm | 64 ++++++++++++++----- > .../patches/eudev-rules-directory.patch | 9 +-- > 2 files changed, 52 insertions(+), 21 deletions(-) > > diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm > index 85e3d9845d..e75ed0b233 100644 > --- a/gnu/packages/linux.scm > +++ b/gnu/packages/linux.scm > @@ -4263,18 +4263,31 @@ (define-public earlyoom >=20=20 > (define-public eudev > ;; The post-systemd fork, maintained by Gentoo. > + (define commit > + "c5bae0b656513463f92808f324f8fcbe34a0b401") > + (define revision "1") > (package > (name "eudev") > - (version "3.2.11") > + ;; Remove the snippet when upgrading to a released version > + (version (git-version "3.2.12" revision commit)) > (source (origin > (method git-fetch) > (uri (git-reference (url "https://github.com/gentoo/eudev") > - (commit (string-append "v" version)))) > + (commit commit))) > (file-name (git-file-name name version)) > (sha256 > (base32 > - "0dzaqwjnl55f69ird57wb6skahc6l7zs1slsrzqqfhww33icp6av")) > - (patches (search-patches "eudev-rules-directory.patch")))) > + "0rqyzmp8kcnxiy1hq13pr2syp4krnf6q97xwlr0bwcd6x4grbak4")) > + (patches (search-patches "eudev-rules-directory.patch")) > + (modules '((guix build utils))) > + (snippet > + #~(begin > + ;; configure.ac uses 3.2.14 as the version number, bu= t it > + ;; is not released yet. Remove the snippet once a lat= er > + ;; version is released. > + (substitute* "configure.ac" > + (("AC_INIT\\(\\[eudev\\],\\[3.2.14\\]") > + "AC_INIT([eudev],[3.2.12]")))))) > (build-system gnu-build-system) > (arguments > (list > @@ -4285,6 +4298,28 @@ (define-public eudev > (substitute* "man/make.sh" > (("/usr/bin/xsltproc") > (search-input-file (or native-inputs inputs) "/bin/xslt= proc"))))) > + (add-before 'bootstrap 'install-in-lib > + (lambda _ > + ;; eudev wants to install its provided hwdb files in /etc,= but > + ;; we want them in udevlibexecdir. > + (copy-file "hwdb/Makefile.am" "hwdb/files.am") > + (call-with-output-file "hwdb/Makefile.am" > + (lambda (port) > + (format port "udevhwdblibdir =3D $(udevlibexecdir)/hwd= b.d\n") > + (format port "include ./files.am"))) > + (substitute* "hwdb/files.am" > + (("dist_udevhwdb_DATA =3D") > + "dist_udevhwdblib_DATA =3D")) > + ;; eudev wants to install a template udev.conf into /etc, = but we > + ;; do not care. > + (substitute* "src/udev/Makefile.am" > + (("dist_udevconf_DATA =3D") > + "dist_noinst_DATA =3D")) > + ;; eudev thinks we want to make sure /etc/udev/rules.d exi= sts > + ;; when installing - we do not. > + (substitute* "rules/Makefile.am" > + (("\\$\\(MKDIR_P\\) \\$\\(DESTDIR\\)\\$\\(udevconfdir\\)= /rules\\.d") > + "true")))) That's rather complex. Could we instead modify udev-service-type to only union what it needs under /etc/udev and not the undesired files from this package? > (add-after 'install 'move-static-library > (lambda _ > (let ((source (string-append #$output "/lib/libudev.a")) > @@ -4296,19 +4331,14 @@ (define-public eudev > ;; such that Libtool looks for it in the usual places. > (substitute* (string-append #$output "/lib/libudev.la") > (("old_library=3D.*") > - "old_library=3D''\n"))))) > - (add-after 'install 'build-hwdb > - (lambda _ > - ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and > - ;; similar tools to display product names. > - ;; > - ;; XXX: This can't be done when cross-compiling. Find anot= her way > - ;; to generate hwdb.bin for cross-built systems. > - #$@(if (%current-target-system) > - #~(#t) > - #~((invoke (string-append #$output "/bin/udevadm") > - "hwdb" "--update")))))) > - #:configure-flags #~(list "--enable-manpages"))) > + "old_library=3D''\n")))))) > + #:configure-flags > + #~(list "--enable-manpages" > + "--sysconfdir=3D/etc"))) See comment above about justifying this flag. > + (native-search-paths > + (list (search-path-specification > + (variable "UDEV_HWDB_PATH") > + (files '("lib/udev/hwdb.d"))))) > (native-inputs > (list autoconf > automake > diff --git a/gnu/packages/patches/eudev-rules-directory.patch b/gnu/packa= ges/patches/eudev-rules-directory.patch > index 54fc01c6d5..c4b1cfae39 100644 > --- a/gnu/packages/patches/eudev-rules-directory.patch > +++ b/gnu/packages/patches/eudev-rules-directory.patch > @@ -4,9 +4,9 @@ The old udev 182 supported $UDEV_CONFIG_FILE, which in tu= rn allowed > the search path to be customized, but eudev no longer has this, hence > this hack. >=20=20 > ---- eudev-3.1.5/src/udev/udev-rules.c 2015-10-13 06:22:14.000000000 +0800 > -+++ eudev-3.1.5/src/udev/udev-rules.c 2015-10-16 20:45:38.491934336 +0800 > -@@ -47,15 +47,11 @@ > +--- a/src/udev/udev-rules.c > ++++ b/src/udev/udev-rules.c > +@@ -48,16 +48,11 @@ struct uid_gid { > }; > }; >=20=20=20 > @@ -20,11 +20,12 @@ this hack. > - "/lib/udev/rules.d", > - "/usr/lib/udev/rules.d", > -#endif > +- "/usr/local/lib/udev/rules.d", > + NULL, /* placeholder for $EUDEV_RULES_DIRECTORY */ > NULL}; >=20=20=20 > struct udev_rules { > -@@ -1704,6 +1700,9 @@ > +@@ -1718,6 +1713,9 @@ struct udev_rules *udev_rules_new(struct udev *ude= v, int resolve_names) { >=20=20=20 > udev_rules_check_timestamp(rules); It'd be nicer if eudev's build system allowed to configure the above without patches hard coding things. --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 05 09:31:17 2023 Received: (at 66099) by debbugs.gnu.org; 5 Oct 2023 13:31:17 +0000 Received: from localhost ([127.0.0.1]:46295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoORg-0006Nf-9R for submit@debbugs.gnu.org; Thu, 05 Oct 2023 09:31:17 -0400 Received: from mail-ot1-x330.google.com ([2607:f8b0:4864:20::330]:44424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoORQ-0006CN-MI for 66099@debbugs.gnu.org; Thu, 05 Oct 2023 09:31:15 -0400 Received: by mail-ot1-x330.google.com with SMTP id 46e09a7af769-6c4d625da40so681448a34.1 for <66099@debbugs.gnu.org>; Thu, 05 Oct 2023 06:30:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696512636; x=1697117436; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=Vegcrj0UCx0w2KVCbUMyWvF2//ju4iMkO4MoIBEBCww=; b=NyaWGmjaQcPiUWY9HuNWLRX6tgE8kXHAYGjxLcn1RdvdCJ4LkcjzZiifHxFYqkLKxY 2D8bJKLrLOaO/5U/mS8/eO8ch6HOhcT5O5x5Tuxidjq3pbS2H1mDjQYyJofAEZ+2RDcn KopUlRFpQj20fGNrZ3G8L7lFUd2RMHjg6TMI+IxDNQ9XKKxrQuFYwDknXnVKyl/hZ7M+ WeAVEhnOceOAQfrQJqmWiDHSSnRo5QxgpdV5p1NTXDYZPeSO0lH17HrBpPT35FqviNXp BQaD+SaB4EJ1GAocp5pFtfpyQrBaqdK+4Shm35fzs54S22XprnkUNNnFYqDs6KgnC9vc sTYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696512637; x=1697117437; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Vegcrj0UCx0w2KVCbUMyWvF2//ju4iMkO4MoIBEBCww=; b=s8XR9fSBBMNe88zLiScXrwypF6qN3wP1R3hOKVP3BBMaacfvSzjDH+dJnbE41zNRgB +9LT/wVKTOFdjUJyjzJs45SyYnE4JpVpodlxru8ZlvtXerMak1W4gra+1Qak9SjF2SWC jyJiYHTrgLHNlDrKz0qTDmaITaCWgr2kvnNTOBoA9HXkrRE45XsqYETrvu0cBRDIOv7D VSeCXU4j47tkzgP3NiG7h++WwpcwSbkS2W+M9gDjgILghD4PizMCqvUvdKzgFVFgr+AG z+bFpJP+Dc/pXg0Z+j1ZYRZpzZuuZO36zHm1z8OFjiNvIR5vTU8Z6Jxa+sNo8GgN0ywz dP6w== X-Gm-Message-State: AOJu0Yx/qVB6V3gZYbT4DYrPn3OxmMXFeOqUfo+Q1eX3kqR0Z0S/kwI5 IfIajrEagAbglK6e3q+LNTQ= X-Google-Smtp-Source: AGHT+IGqdZQPTU9aeNeWJqJ5NRPsALgdD52DDWavMNOreJrNxxplI4kFuQx5/GQMqNnTb2/UEZVWdg== X-Received: by 2002:a05:6870:8301:b0:1d5:d8f0:7d7e with SMTP id p1-20020a056870830100b001d5d8f07d7emr5526577oae.53.1696512636694; Thu, 05 Oct 2023 06:30:36 -0700 (PDT) Received: from hurd (dsl-151-116.b2b2c.ca. [66.158.151.116]) by smtp.gmail.com with ESMTPSA id fh16-20020a0562141a1000b0065aff6b49afsm494391qvb.110.2023.10.05.06.30.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 06:30:36 -0700 (PDT) From: Maxim Cournoyer To: Vivien Kraus Subject: Re: [PATCH gnome-team v7 2/5] services: udev: unify udev-rule and file->udev-rule. In-Reply-To: <77c5be1f9c3b50fdd4f61cf2e4f80b6900b89a65.1696482243.git.vivien@planete-kraus.eu> (Vivien Kraus's message of "Wed, 4 Oct 2023 23:05:19 +0200") References: <69e084520f189ab5f8a80afc7011a9b1ae911d2a.camel@gmail.com> <77c5be1f9c3b50fdd4f61cf2e4f80b6900b89a65.1696482243.git.vivien@planete-kraus.eu> Date: Thu, 05 Oct 2023 09:30:35 -0400 Message-ID: <87ttr5rybo.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: 66099@debbugs.gnu.org, Liliana Marie Prikler , rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Vivien Kraus writes: > * gnu/services/base.scm (udev-rule): Implements in terms of file->udev-rule. > Use texinfo in docstring. > --- > gnu/services/base.scm | 17 +++-------------- > 1 file changed, 3 insertions(+), 14 deletions(-) > > diff --git a/gnu/services/base.scm b/gnu/services/base.scm > index b3f2d2e8b8..190803b780 100644 > --- a/gnu/services/base.scm > +++ b/gnu/services/base.scm > @@ -2211,20 +2211,9 @@ (define (udev-rules-union packages) > (computed-file "udev-rules" build)) > > (define (udev-rule file-name contents) > - "Return a directory with a udev rule file FILE-NAME containing CONTENTS." > - (computed-file file-name > - (with-imported-modules '((guix build utils)) > - #~(begin > - (use-modules (guix build utils)) > - > - (define rules.d > - (string-append #$output "/lib/udev/rules.d")) > - > - (mkdir-p rules.d) > - (call-with-output-file > - (string-append rules.d "/" #$file-name) > - (lambda (port) > - (display #$contents port))))))) > + "Return a directory with a udev rule file @var{file-name} containing > +@var{contents}." > + (file->udev-rule file-name (plain-file file-name contents))) That one LGTM! -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 05 09:34:00 2023 Received: (at 66099) by debbugs.gnu.org; 5 Oct 2023 13:34:00 +0000 Received: from localhost ([127.0.0.1]:46299 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoOUK-0006R1-Ep for submit@debbugs.gnu.org; Thu, 05 Oct 2023 09:34:00 -0400 Received: from mail-qt1-x82d.google.com ([2607:f8b0:4864:20::82d]:41996) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoOUI-0006Qp-IC for 66099@debbugs.gnu.org; Thu, 05 Oct 2023 09:33:59 -0400 Received: by mail-qt1-x82d.google.com with SMTP id d75a77b69052e-4195fddd6d7so8384171cf.0 for <66099@debbugs.gnu.org>; Thu, 05 Oct 2023 06:33:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696512814; x=1697117614; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=Oi5oZ6Vw/Uj+VZy9eMWCa/jqvkfJQzQMWthPQWZ35YM=; b=H1XTHPa+E54KrUDrXmoz6keQtK6s1Zh8maKIs/kNSZfTh5ON+SXiYXFgv1T0bSY7hL 9PP2RxKAXyGu4hGvUQ29Fqsk0jgDq1dltGXpnH0Jd4tIaKJjsMVZwbHO0PCWoh2O6k6W hgQmGjTFBFnGGbePEH3CN5nhmeoQqR0CmpvTQJZeEOKDE9HfUC392S6VN3FLxyCw6uhe icTQs8mfPXRzwsfe6EfUwVl7QaFh3uhSP6wHiWCzbsHnRSG/burLvtxTHvBnKuA9FXkJ PBZVUd582yU0zt83O10no5TFcPJJS7g3g7kfP37Q+KsINy7JuyfQfcTpHycfK6T1Eu7i 588Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696512814; x=1697117614; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Oi5oZ6Vw/Uj+VZy9eMWCa/jqvkfJQzQMWthPQWZ35YM=; b=AlsEOuUc6WU6qgc0vNc4uO61ys/cA0SQVmjJWCGQ6+gXjjJahG+QEVxenum/syVxm1 Pjcrh4QeswOhZDtYAPp2bFkwYziqQ2SzjQMBdBNC4qVV7yZco8E5uGlGlsyRDKp16G8t SKmPg/pyOEm05gbYq/x6anIWy30RxpIG/aRF1gqFopEHEsLSvxDqKEW1YB2cmOQt2ciV p46MzHQ7h1YzqkzA8XZ5odxGUWOEAlJ8ZWO8kVUfCBNb0CdyMoQagpBJ6PG7UaaGIQkY 8A6bDfwNd+EXSuk4o65bVmRzvTng0yxR3z2MMB49labeWQYF2IkrQCQKiRb+obhWH8hN 9x4g== X-Gm-Message-State: AOJu0YxvRnsKZe1yw7wm38DwxpRWkk1zSnckinQpbw/WPo3qIp42iBZP +gtaJsrLZXZCC1WXa4lTw9A= X-Google-Smtp-Source: AGHT+IElaja6nUR2rBaIt4PU+BdK3+nhutmeUPUlQukHxlU89uK75To4KljTEx/Hbhgahq491CEnrQ== X-Received: by 2002:a05:622a:1a1f:b0:412:1ae0:e127 with SMTP id f31-20020a05622a1a1f00b004121ae0e127mr1531593qtb.31.1696512814536; Thu, 05 Oct 2023 06:33:34 -0700 (PDT) Received: from hurd (dsl-151-116.b2b2c.ca. [66.158.151.116]) by smtp.gmail.com with ESMTPSA id cj20-20020a05622a259400b004197079f2f8sm480874qtb.64.2023.10.05.06.33.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 06:33:34 -0700 (PDT) From: Maxim Cournoyer To: Vivien Kraus Subject: Re: [PATCH gnome-team v7 2/5] services: udev: unify udev-rule and file->udev-rule. In-Reply-To: <77c5be1f9c3b50fdd4f61cf2e4f80b6900b89a65.1696482243.git.vivien@planete-kraus.eu> (Vivien Kraus's message of "Wed, 4 Oct 2023 23:05:19 +0200") References: <69e084520f189ab5f8a80afc7011a9b1ae911d2a.camel@gmail.com> <77c5be1f9c3b50fdd4f61cf2e4f80b6900b89a65.1696482243.git.vivien@planete-kraus.eu> Date: Thu, 05 Oct 2023 09:33:33 -0400 Message-ID: <87pm1try6q.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: 66099@debbugs.gnu.org, Liliana Marie Prikler , rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Oops, I just noted something: Vivien Kraus writes: > * gnu/services/base.scm (udev-rule): Implements in terms of file->udev-rule. > Use texinfo in docstring. > --- > gnu/services/base.scm | 17 +++-------------- > 1 file changed, 3 insertions(+), 14 deletions(-) > > diff --git a/gnu/services/base.scm b/gnu/services/base.scm > index b3f2d2e8b8..190803b780 100644 > --- a/gnu/services/base.scm > +++ b/gnu/services/base.scm > @@ -2211,20 +2211,9 @@ (define (udev-rules-union packages) > (computed-file "udev-rules" build)) > > (define (udev-rule file-name contents) > - "Return a directory with a udev rule file FILE-NAME containing CONTENTS." > - (computed-file file-name > - (with-imported-modules '((guix build utils)) > - #~(begin > - (use-modules (guix build utils)) > - > - (define rules.d > - (string-append #$output "/lib/udev/rules.d")) > - > - (mkdir-p rules.d) > - (call-with-output-file > - (string-append rules.d "/" #$file-name) > - (lambda (port) > - (display #$contents port))))))) > + "Return a directory with a udev rule file @var{file-name} containing > +@var{contents}." > + (file->udev-rule file-name (plain-file file-name contents))) I'm not sure using Texinfo in plain docstrings provides much; there's no tooling to render them and it's a convention to use FULL CAPS for variable names in Guile doc strings, at least in the Guix code base. I'd leave it as is. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 05 10:32:30 2023 Received: (at 66099) by debbugs.gnu.org; 5 Oct 2023 14:32:30 +0000 Received: from localhost ([127.0.0.1]:48066 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoPOv-0008QD-4M for submit@debbugs.gnu.org; Thu, 05 Oct 2023 10:32:29 -0400 Received: from mail-qv1-xf30.google.com ([2607:f8b0:4864:20::f30]:60807) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoPOh-0008Pl-Vm for 66099@debbugs.gnu.org; Thu, 05 Oct 2023 10:32:28 -0400 Received: by mail-qv1-xf30.google.com with SMTP id 6a1803df08f44-65cff6a6878so5354516d6.1 for <66099@debbugs.gnu.org>; Thu, 05 Oct 2023 07:31:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696516311; x=1697121111; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=Qzq7FHWiPXKStbNUX0imjH9I9zt1tzFByrAIb3/RiE0=; b=erceh9L/nm3joNRsdlvP9E9XJ76PIyqDMdv3rqE4osGMPAbq0SJNhDt5S6g3mAjYE7 4VvZ/R8idec4g6Wl2AciDhMNa3gMkFjm09vivP+zlyWQS+5c0q83SGpM9ojhhFHOtaJf VKL59eLwjJAvpLKU82fDj/DWBTm2DORMSSJVWuzEN6oLhXXeBA6CkjmJEf8vTFmlLgXJ I8sIJRoET35NuR2U0uRH8C5v5FZNTfg6B2Lc3YQ+/LD+L3fHglAGIIifi0fkuKoEqUaG zF4tcDddhNWQTc8nLdzAFF3DcF00sboVsw9+rVJa/SNhy63JrYBbCuAHDsFHqzH/nO/T MP/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696516311; x=1697121111; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Qzq7FHWiPXKStbNUX0imjH9I9zt1tzFByrAIb3/RiE0=; b=bSleJuEizkPUAQn34OkMqtIwKQR3Ss62RO7dpul2nATghRmx5kMm+1OwsvGfa0ffZz AcTNSiD9aXPz8I+90VuJNGFbnZyEAu66NX4nXzwRzUpnj3b9p6os9Q/mT2+BY/A8xrkJ +qB+8vK9WKbcEzILxjMhjrpm8nTRJQ3y+V8+mdQGW4iHXF20LEkwh3ZKq0pxjeBMvRHF 4WdPXU4pQcK5q4DLVxqSPKunF0/BH+S5+o42G24bFDoXC/G1HI3Yjp8jRbXEBd8H31CL Qji6tw9A0L2mLeCn49CpJ6R31u84arlEDaIH6OkUi4zMPGmKeYY4VLifAzN2BcsjEB+4 bB9w== X-Gm-Message-State: AOJu0YxhLep/lOITlmKEFRYv9HEgALIIomilAgUXR0/JVqZl49Zme0WK hgxV2tyNLNQ8z0Snn8mNCkM= X-Google-Smtp-Source: AGHT+IF32F5wEYaZjzfun5PFWlsiMYUMjXCciwsSujGf0Cb7aOhtBD6IdQFkey1uifpcftsyDODNew== X-Received: by 2002:a0c:e54f:0:b0:64a:92e9:10e4 with SMTP id n15-20020a0ce54f000000b0064a92e910e4mr4551849qvm.63.1696516311428; Thu, 05 Oct 2023 07:31:51 -0700 (PDT) Received: from hurd (dsl-151-116.b2b2c.ca. [66.158.151.116]) by smtp.gmail.com with ESMTPSA id a14-20020a0cca8e000000b00655e4f57732sm536453qvk.35.2023.10.05.07.31.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 07:31:51 -0700 (PDT) From: Maxim Cournoyer To: Vivien Kraus Subject: Re: [PATCH gnome-team v7 3/5] gnu: udev-service-type: accept hwdb file extensions. In-Reply-To: <53b29725dbfa2210a4b29105828c611550a8eab7.1696482243.git.vivien@planete-kraus.eu> (Vivien Kraus's message of "Mon, 2 Oct 2023 21:08:49 +0200") References: <69e084520f189ab5f8a80afc7011a9b1ae911d2a.camel@gmail.com> <53b29725dbfa2210a4b29105828c611550a8eab7.1696482243.git.vivien@planete-kraus.eu> Date: Thu, 05 Oct 2023 10:31:50 -0400 Message-ID: <87lechrvhl.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: 66099@debbugs.gnu.org, Liliana Marie Prikler , rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Vivien, Vivien Kraus writes: > The "rules" field in the udev-configuration record can now hold both rules and > hwdb files. > > The udev-rules-union has been made generic, and renamed to > udev-configuration-union, so that it works with either rules or hwdb files. > > Some udev-related auxiliary functions in (gnu services base) had non-texinfo > variable references in their docstrings ("FILE-NAME" instead of > "@var{file-name}"). That's fairly conventional. Texinfo is used in the manual documentation, package synopsis/descriptions and services documentation, not for every doc string in the code base. > The contents of the /etc directory now includes hwdb.d and hwdb.bin, which is > computed immediately. > > The documentation has been reworked so as to explain why creating udev rules > or hwdb needs helper functions for configuration or extension. > > The hwdb.bin file is conditionally computed by a native version of eudev, that > may be configured in the udev-service-type configuration. The condition is > that both target and native eudev have the same version. If so, we can > reasonably expect that the hwdb.bin file created by native eudev can later be > read by target eudev. > > * gnu/services/base.scm (udev-configuration-union): Make udev-rules-union generic. > (udev-hwdb): New function. > (file->udev-rule): Fix docstring. > (file->udev-hwdb): New function. > (udev-rules-service): Fix docstring. > (udev-hwdb-service): New function. > (udev-etc): Add hwdb.d and hwdb.bin. > (module): Export udev-hwdb, file->udev-hwdb, and udev-hwdb-service. > (): Add the native-udev field. > * doc/guix.texi (Base Services)[udev-service-type]: Explain configuration and > extension values. > * doc/guix.texi (Base Services)[udev-hwdb]: Document it. > [udev-hwdb-service]: Same. > * doc/guix.texi (Base Services)[udev-configuration]: Document the native-udev > field. > --- > doc/guix.texi | 52 +++++++++++++++++++----- > gnu/services/base.scm | 94 ++++++++++++++++++++++++++++++++++++------- > 2 files changed, 122 insertions(+), 24 deletions(-) > > diff --git a/doc/guix.texi b/doc/guix.texi > index 46591b2f64..3310271ec8 100644 > --- a/doc/guix.texi > +++ b/doc/guix.texi > @@ -19322,9 +19322,23 @@ Base Services > @file{/dev} directory dynamically, whose value is a > @code{} object. > > -This service type can be @emph{extended} using procedures > -@code{udev-rules-service} along with @code{file->udev-rule} or > -@code{udev-rule} which simplify the process of writing udev rules. > +Since the file names for udev rules and hwdb files matters, the s/matters/matter/ > +configuration items for rules and hwdb cannot simply be plain file-like > +objects with the rules content, because the name would be > +ignored. Instead, they are directory file-like objects that contain Please use double spaces to separate sentences (Guix convention). > +optional rules in @code{lib/udev/rules.d} and optional hwdb files in > +@code{lib/udev/hwdb.d}. This way, the service can be configured with s/@code/@file/ > +whole packages from which to take rules and hwdb files. > + > +The @code{udev-service-type} can be @emph{extended} with file-like > +directories that respect this hierarchy. However, to generate a > +configuration or an extension, it is advised to use @code{udev-rule} > and "However" sounds a bit strange to me. I'd rephrase the sentence to "For convenience, the @code{udev-rule} and @code{file->udev-rule} can be used to construct udev rules, while @code{udev-hwdb} and @code{file->udev-hwd} can be used to construct hwdb files." > +@code{file->udev-rule} for rules, and @code{udev-hwdb} and > +@code{file->udev-hwdb} for hwdb files. > + > +In an operating-system declaration, this service type can be @code{operating-system} > +@emph{extended} using procedures @code{udev-rules-service} and > +@code{udev-hwdb-service}. > @end defvar > > @deftp {Data Type} udev-configuration > @@ -19334,8 +19348,18 @@ Base Services > @item @code{udev} (default: @code{eudev}) (type: file-like) > Package object of the udev service. > > +@item @code{native-udev} (default: @code{eudev}) (type: file-like) > +Native udev package to compile @code{hwdb.bin}. The trie format used for > +@code{hwdb.bin} must be compatible with the @code{udev} and > +@code{native-udev} fields of the udev configuration. To avoid generating > +@code{hwdb.bin}, pass @code{#f} as the @code{native-udev} field. > + > +In any case, if the package version string differs between @code{udev} > +and @code{native-udev}, @code{hwdb.bin} is @strong{not} created. Shouldn't that raise an error with a useful error message? Then it doesn't need to be documented here. Thinking again, why is it necessary to have an explicite native-udev field? The gexps mechanism of the service could perhaps use #+udev instead of #$udev where needed, sharing the same 'udev' field for both purposes? > @item @code{rules} (default: @var{'()}) (type: list-of-file-like) > -List of file-like objects denoting udev-rule files. > +List of file-like objects denoting udev-rule or udev-hwdb files under a > +sub-directory. > > @end table > @end deftp > @@ -19358,6 +19382,11 @@ Base Services > @end lisp > @end deffn > > +@deffn {Procedure} udev-hwdb @var{file-name} @var{contents} > +Return a udev-hwdb file named @var{file-name} containing the hardware > +information @var{contents}. > +@end deffn > + > @deffn {Procedure} udev-rules-service @var{name} @var{rules} [#:groups '()] > Return a service that extends @code{udev-service-type} with @var{rules} > and @code{account-service-type} with @var{groups} as system groups. > @@ -19377,6 +19406,11 @@ Base Services > @end lisp > @end deffn > > +@deffn {Procedure} udev-hwdb-service @var{name} @var{hwdb} > +Return a service that extends @code{udev-service-type} with > +@var{hwdb}. The service name is @code{@var{name}-udev-hwdb}. > +@end deffn > + > @deffn {Procedure} file->udev-rule @var{file-name} @var{file} > Return a udev-rule file named @var{file-name} containing the rules > defined within @var{file}, a file-like object. > @@ -19401,12 +19435,10 @@ Base Services > @end lisp > @end deffn > > -Additionally, Guix package definitions can be included in @var{rules} in > -order to extend the udev rules with the definitions found under their > -@file{lib/udev/rules.d} sub-directory. In lieu of the previous > -@var{file->udev-rule} example, we could have used the > -@var{android-udev-rules} package which exists in Guix in the @code{(gnu > -packages android)} module. I'd preserve the disclaimer that for this example, it's wiser to simply use the @code{android-udev-rules} package. > +@deffn {Procedure} file->udev-hwdb @var{file-name} @var{file} > +Return a udev-hwdb file named @var{file-name} containing the rules > +defined within @var{file}, a file-like object. > +@end deffn > > The following example shows how to use the @var{android-udev-rules} > package so that the Android tool @command{adb} can detect devices > diff --git a/gnu/services/base.scm b/gnu/services/base.scm > index 190803b780..00916a35e4 100644 > --- a/gnu/services/base.scm > +++ b/gnu/services/base.scm > @@ -81,6 +81,7 @@ (define-module (gnu services base) > #:select (mount-flags->bit-mask > swap-space->flags-bit-mask)) > #:use-module (guix gexp) > + #:use-module ((guix packages) #:select (package-version)) > #:use-module (guix records) > #:use-module (guix modules) > #:use-module (guix pki) > @@ -153,8 +154,11 @@ (define-module (gnu services base) > udev-service-type > udev-service ; deprecated > udev-rule > + udev-hwdb > file->udev-rule > + file->udev-hwdb > udev-rules-service > + udev-hwdb-service > > login-configuration > login-configuration? > @@ -2181,12 +2185,15 @@ (define-record-type* > udev-configuration? > (udev udev-configuration-udev ;file-like > (default eudev)) > - (rules udev-configuration-rules ;list of file-like > + (native-udev udev-configuration-native-udev > + (default eudev)) As discussed earlier, I don't think that new field is needed. > + (rules udev-configuration-rules ;list of rule- and > + ;hwdb-providing packages > (default '()))) > > -(define (udev-rules-union packages) > - "Return the union of the @code{lib/udev/rules.d} directories found in each > -item of @var{packages}." > +(define (udev-configuration-union subdirectory packages) > + "Return the union of the @code{lib/udev/@var{subdirectory}.d} directories found > +in each item of @var{packages}." > (define build > (with-imported-modules '((guix build union) > (guix build utils)) > @@ -2197,7 +2204,8 @@ (define (udev-rules-union packages) > (srfi srfi-26)) > > (define %standard-locations > - '("/lib/udev/rules.d" "/libexec/udev/rules.d")) > + '(#$(string-append "/lib/udev/" subdirectory ".d") > + #$(string-append "/libexec/udev/" subdirectory ".d"))) > > (define (rules-sub-directory directory) > ;; Return the sub-directory of DIRECTORY containing udev rules, or > @@ -2208,15 +2216,21 @@ (define (udev-rules-union packages) > (union-build #$output > (filter-map rules-sub-directory '#$packages))))) > > - (computed-file "udev-rules" build)) > + (computed-file (string-append "udev-" subdirectory) build)) > (define (udev-rule file-name contents) > "Return a directory with a udev rule file @var{file-name} containing > @var{contents}." > (file->udev-rule file-name (plain-file file-name contents))) > > +(define (udev-hwdb file-name contents) > + "Return a directory with a udev hwdb file @var{file-name} containing > +@var{contents}." > + (file->udev-hwdb file-name (plain-file file-name contents))) > + > (define (file->udev-rule file-name file) > - "Return a directory with a udev rule file FILE-NAME which is a copy of FILE." > + "Return a directory with a udev rule file @var{file-name} which is a copy of > +@var{file}." As discussed above, I'm not convinced about changing dostrings to use Texinfo, but I see that was already the cases for some around. Hm. > (computed-file file-name > (with-imported-modules '((guix build utils)) > #~(begin > @@ -2231,6 +2245,23 @@ (define (file->udev-rule file-name file) > (mkdir-p rules.d) > (copy-file #$file file-copy-dest))))) > > +(define (file->udev-hwdb file-name file) > + "Return a directory with a udev hwdb file @var{file-name} which is a copy of > +@var{file}." > + (computed-file file-name > + (with-imported-modules '((guix build utils)) > + #~(begin > + (use-modules (guix build utils)) > + > + (define hwdb.d > + (string-append #$output "/lib/udev/hwdb.d")) > + > + (define file-copy-dest > + (string-append hwdb.d "/" #$file-name)) > + > + (mkdir-p hwdb.d) > + (copy-file #$file file-copy-dest))))) > + > (define kvm-udev-rule > ;; Return a directory with a udev rule that changes the group of /dev/kvm to > ;; "kvm" and makes it #o660. Apparently QEMU-KVM used to ship this rule, > @@ -2338,13 +2369,35 @@ (define udev.conf > > (define (udev-etc config) > (match-record config > - (udev rules) > + (udev native-udev rules) > + (let* ((hwdb.d > + (udev-configuration-union "hwdb" (cons* udev rules))) > + (hwdb.bin > + (and native-udev > + (equal? (package-version udev) > + (package-version native-udev)) > + (computed-file > + "hwdb.bin" > + (with-imported-modules '((guix build utils)) > + #~(begin > + (use-modules (guix build utils)) > + (setenv "UDEV_HWDB_PATH" #$hwdb.d) > + (invoke #+(file-append native-udev "/bin/udevadm") > + "hwdb" > + "--update" > + "-o" #$output))))))) > `(("udev" > ,(file-union "udev" > `(("udev.conf" ,udev.conf) > ("rules.d" > - ,(udev-rules-union (cons* udev kvm-udev-rule > - rules))))))))) > + ,(udev-configuration-union > + "rules" > + (cons* udev kvm-udev-rule > + rules))) > + ("hwdb.d" ,hwdb.d) > + ,@(if hwdb.bin > + `(("hwdb.bin" ,hwdb.bin)) > + '())))))))) As discussed above, this can probably be simplified by dropping native-udev. If it's truly needed, the pathological case where different versions are needed should be handled earliest and an error raised with a useful message. > (define udev-service-type > (service-type (name 'udev) > @@ -2373,10 +2426,10 @@ (define-deprecated (udev-service #:key (udev eudev) (rules '())) > (udev-configuration (udev udev) (rules rules)))) > > (define* (udev-rules-service name rules #:key (groups '())) > - "Return a service that extends udev-service-type with RULES and > -account-service-type with GROUPS as system groups. This works by creating a > -singleton service type NAME-udev-rules, of which the returned service is an > -instance." > + "Return a service that extends udev-service-type with @var{rules} and > +@code{account-service-type} with @var{groups} as system groups. This works by > +creating a singleton service type @code{@var{name}-udev-rules}, of which the > +returned service is an instance." I'd drop this change. Could you please send a v8 with changes along those suggested? -- Thanks Maxim From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 05 10:32:38 2023 Received: (at 66099) by debbugs.gnu.org; 5 Oct 2023 14:32:38 +0000 Received: from localhost ([127.0.0.1]:48069 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoPP4-0008QZ-2z for submit@debbugs.gnu.org; Thu, 05 Oct 2023 10:32:38 -0400 Received: from mail-qk1-x734.google.com ([2607:f8b0:4864:20::734]:60908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoPP1-0008QM-Ri for 66099@debbugs.gnu.org; Thu, 05 Oct 2023 10:32:36 -0400 Received: by mail-qk1-x734.google.com with SMTP id af79cd13be357-77574c076e4so67363485a.1 for <66099@debbugs.gnu.org>; Thu, 05 Oct 2023 07:32:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696516332; x=1697121132; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=G/K6ooCugtPfU0U1dmkvpTvjntajvK5qXaKjWO5TXgw=; b=BTu3AgOuoNuJj1YrpObX5wy6j2m78Ow3o2mbr+ym4oUEpi8y+2gDpg/OpEgIAcdE7f fxTABTyyQ11XUo43z8r+l6a3SpNCBaip2mHMlhAzOEM7bXDP71pg93odpQMspgW8DNsB PlvVm15E9O0DCQJsvY2KBlBHYlSgu8RKu63RkHD0AN4wDzjhmu83zBh8b10TG4aYtAui 8ma2Bf9cva1iFWN6BKj0tU9TfB1o4yQTHwMfXkCCGH1nXnAGFeGqgisrcd/mRL9EdZyd ZCt+pwCn0bE1AQMBV/YPeSQXfzm4DAF1QFm3aJblbdZGBjcd6J5ivPN1UKZ7/8IEnCBi V9sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696516332; x=1697121132; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=G/K6ooCugtPfU0U1dmkvpTvjntajvK5qXaKjWO5TXgw=; b=T2k4ZzvY++ct9NQA2zJQIDPAc5p9pinCpQ5Q/+MM4gksNszBuHoYjDNHo1wtkX+EQw volm7PEF4FUbmdJbzdiCyc0BQcMD1QwhFh/8pBY0WNRmv4AVLluhqznfQiZabaQsj85D VpKcBiDJg6zIhvET4L76iIapcNxk+1x6z2fMT7n9/LeLh3NnsyJarYmsmYJJBwoEVocd /YYaGTFMFG63f089WdfF6kBWBN3rOOOlKjh8zAtRsl82TNgazmvYoeM/yBARUuQAwFk4 TVXoOA0olyQZgEDZ99QQRU6VJgOsVxyJqAh1tALctZXB20ImTVQ0koKoShBmZGGZS+pA KcZw== X-Gm-Message-State: AOJu0YyjJvbmp6r3IC4FJNNCBttRCO7ZbW6Gn/shn0ufqpb0J30Em/oK ySHrZWjF5Z2EhyF0OWlpFFdLzV0CPcs= X-Google-Smtp-Source: AGHT+IHZM5Kmo29ZPkCCRzfN+8GhDHPIl18QnIWRia6EIwlxWyCegOo4GSZZXY7zztbMq8Ge7C1iWQ== X-Received: by 2002:a05:620a:b5b:b0:76e:f149:fb43 with SMTP id x27-20020a05620a0b5b00b0076ef149fb43mr5240039qkg.70.1696516331860; Thu, 05 Oct 2023 07:32:11 -0700 (PDT) Received: from hurd (dsl-151-116.b2b2c.ca. [66.158.151.116]) by smtp.gmail.com with ESMTPSA id s3-20020a05620a16a300b0076ef0fb5050sm525420qkj.31.2023.10.05.07.32.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 07:32:11 -0700 (PDT) From: Maxim Cournoyer To: Vivien Kraus Subject: Re: [PATCH gnome-team v7 4/5] gnu: libgudev: Update to 238. In-Reply-To: (Vivien Kraus's message of "Tue, 19 Sep 2023 13:32:26 +0200") References: <69e084520f189ab5f8a80afc7011a9b1ae911d2a.camel@gmail.com> Date: Thu, 05 Oct 2023 10:32:10 -0400 Message-ID: <87h6n5rvh1.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: 66099@debbugs.gnu.org, Liliana Marie Prikler , rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Vivien Kraus writes: > * gnu/packages/gnome.scm (libgudev): Update to 238. > --- > gnu/packages/gnome.scm | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm > index eaceb76e1e..4ea3dc455a 100644 > --- a/gnu/packages/gnome.scm > +++ b/gnu/packages/gnome.scm > @@ -6899,14 +6899,14 @@ (define-public eog-plugins > (define-public libgudev > (package > (name "libgudev") > - (version "236") > + (version "238") > (source (origin > (method url-fetch) > (uri (string-append "mirror://gnome/sources/" name "/" > version "/" name "-" version ".tar.xz")) > (sha256 > (base32 > - "094mgjmwgsgqrr1i0vd20ynvlkihvs3vgbmpbrhswjsrdp86j0z5")))) > + "1laxgdkgmr30aw44sm4rgpsdybwxx5rszcm8c2y3vmy9myqnl9k1")))) > (build-system meson-build-system) > (native-inputs > `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. LGTM. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 05 10:36:13 2023 Received: (at 66099) by debbugs.gnu.org; 5 Oct 2023 14:36:13 +0000 Received: from localhost ([127.0.0.1]:48088 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoPSX-00005g-CX for submit@debbugs.gnu.org; Thu, 05 Oct 2023 10:36:13 -0400 Received: from mail-ot1-x333.google.com ([2607:f8b0:4864:20::333]:61814) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoPSU-00005G-QB for 66099@debbugs.gnu.org; Thu, 05 Oct 2023 10:36:12 -0400 Received: by mail-ot1-x333.google.com with SMTP id 46e09a7af769-6c4e7951dc1so720945a34.3 for <66099@debbugs.gnu.org>; Thu, 05 Oct 2023 07:35:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696516546; x=1697121346; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SxP0eWogriJltelYNG3k0jvcmIZgE6l3LVkJVBos1gQ=; b=f16YNz0EcGpfJDGke5dS7U0Fjy7rDfVF6O+A90F8BdG5sGP2cgu+FUe2ZoqO1hjzgF j2aPfSWoXGXtTdvU3TuCdIUNKbU/n5D1f8FiTqV1ekgt6PMSCPMQtzK1R0+sHfOMMOrK RkYtpiFqr8EeQ5usp5Cjt6kP4Xr6KO9IOYgRMeOQ9TYvNxzPxBuCVd0/NgL9ZhiczjH1 FNpLtlLEIzIeo7/FVHJmBVcARNQXBx1lMdHvyMeN1MNeffi6makzP3BOJHFOfIoKDd5w J5RUI9I8rjiMcrAqhh29IhJQ32BUHC98rzX2kbphCCR9xFUMhdLQ19M1W/C9iAjckeZK mBBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696516546; x=1697121346; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=SxP0eWogriJltelYNG3k0jvcmIZgE6l3LVkJVBos1gQ=; b=iYW9aMNai6CCqBisia9wXoBndwrFhVkTdiMqPKlTUlS3R8LcAgfhcf3x7+FcbVEZF1 YUTvQ6+c8mnslm3/4+Bprxi3UgZigd0F4/JfWGJPrM5wToFCvDiBlH1yujs+z/Z2QwOL MJshlg4ghzrHiwLYZu9RuV4zNYwpQPwDICgLO/Bwe8aPFJlcm884X5MavmxGMcQmul4c TjZmnLP55RWLqCRijN3VHB7HiRZXjlOXcH09TI56IKsHfY5TU7djyKcEg2LL3CMrfAH5 mfmEKKGmz4/UU9SEgIqY7kts0CjRdSbkkCgSMVdfvtNkNul8HkPxO7/5W2Btau9knAz7 nVoQ== X-Gm-Message-State: AOJu0YzDuJIg6sAID9xOhxHiUCXecuYHUC+yx+rcNt54vBFI9fP0nC/G OqqaP0uXMDv8D06dHcKPz8U= X-Google-Smtp-Source: AGHT+IFjYgkM6bLQb+tuGDqDQVLoZCKLqWlw+TjHI/3Dz7vvRDYpWQ9S5Ovw1287lBWON69IbHOJAw== X-Received: by 2002:a05:6870:1493:b0:1b3:6ea7:7475 with SMTP id k19-20020a056870149300b001b36ea77475mr6341236oab.0.1696516546424; Thu, 05 Oct 2023 07:35:46 -0700 (PDT) Received: from hurd (dsl-151-116.b2b2c.ca. [66.158.151.116]) by smtp.gmail.com with ESMTPSA id o24-20020a05620a111800b0075ca4cd03d4sm521329qkk.64.2023.10.05.07.35.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 07:35:46 -0700 (PDT) From: Maxim Cournoyer To: Vivien Kraus Subject: Re: [PATCH gnome-team v7 5/5] gnu: upower: Update to 1.90.2. In-Reply-To: <1d1ca103f706928cdf7c9008fa00e67af66a6a91.1696482243.git.vivien@planete-kraus.eu> (Vivien Kraus's message of "Tue, 19 Sep 2023 13:32:46 +0200") References: <69e084520f189ab5f8a80afc7011a9b1ae911d2a.camel@gmail.com> <1d1ca103f706928cdf7c9008fa00e67af66a6a91.1696482243.git.vivien@planete-kraus.eu> Date: Thu, 05 Oct 2023 10:35:45 -0400 Message-ID: <87cyxtrvb2.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: 66099@debbugs.gnu.org, Liliana Marie Prikler , rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi! Vivien Kraus writes: > The new eudev now can install hwdb files. Upower has some, but they shoul= d get > installed in upower=E2=80=99s output, not eudev=E2=80=99s. > > The phases needed a rework. Now the 32-bit-specific test fix is always th= ere, > except it may be empty. > > test_bluetooth_hidpp_mouse fails, after calling into a bluez dbus method. > > * gnu/packages/gnome.scm (upower): Update to 1.90.2. > [#:configure-flags]: Set udevhwdbdir. > [#:phases] : Add this phase > unconditionnally > : Disable test_bluetooth_hidpp_mouse. > [inputs]: Remove dbus-glib. > [native-inputs]: Add dbus. LGTM! --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 06 13:31:27 2023 Received: (at 66099) by debbugs.gnu.org; 6 Oct 2023 17:31:27 +0000 Received: from localhost ([127.0.0.1]:52562 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoofe-0000Ue-AM for submit@debbugs.gnu.org; Fri, 06 Oct 2023 13:31:27 -0400 Received: from planete-kraus.eu ([89.234.140.182]:43846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoofb-0000UU-Km for 66099@debbugs.gnu.org; Fri, 06 Oct 2023 13:31:25 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 6965ecc4; Fri, 6 Oct 2023 17:31:02 +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:mime-version :content-type:content-transfer-encoding:to:cc; s=albinoniB; bh=b 32EIDFfT6SULt6oR8ApdhdMSQA=; b=IulFV3NcJsXhy+5i4v3V56ug9ps/m2wPU b2gmGAtM7gqKFFvaCeni1so3nQJgyzKZBuO02qaNVvY0vMqFvwtGWJdogGgR+G5N Yft6hkLwIR4wcxgbtmp9GDGNEMDIs7KMcSybRPBoY0jHfGi9indoBeKDbqc8Pa2V HJoBG3arQBaS/A7GeyTrN793DG/I+k/qlYkI4SsSUvuRZSkTltODqQAdw7uIK2ug aczGkEfxCuFeX0WnoOw+hgtb/THeO4JPtUyLsuEU+k5eC7RXJQqeRHeQWrXjscDy haIiX5blW1Lz7pFJrUCrHG1ShiRs3oO4RFgR24CZdx0yIsFu5kKFA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 61cb4693 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 6 Oct 2023 17:31:02 +0000 (UTC) Message-ID: In-Reply-To: <0825bf42daa34ee464c5237b04ad6bf90942e489.camel@gmail.com>, , <1a1089275d13e02b4485c5de6e908ece88f5d2b6.camel@gmail.com><87y1ghryel.fsf@gmail.com>, <87pm1try6q.fsf@gmail.com>, <87lechrvhl.fsf@gmail.com> References: <0825bf42daa34ee464c5237b04ad6bf90942e489.camel@gmail.com> , ,<1a1089275d13e02b4485c5de6e908ece88f5d2b6.camel@gmail.com> <87y1ghryel.fsf@gmail.com>,<87pm1try6q.fsf@gmail.com> ,<87lechrvhl.fsf@gmail.com> From: Vivien Kraus Date: Fri, 6 Oct 2023 18:45:46 +0200 Subject: [PATCH gnome-team v8 0/6] Update eudev, udev-service-type, upower MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: Liliana Marie Prikler ,Maxim Cournoyer ,66099@debbugs.gnu.org User-Agent: Evolution 3.46.4 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Dear guix, Thank you for your reviews! Since eudev released 3.2.14 in the mean time, I udpated it. I also reused more code in the udev-service-type helper functions. Le jeudi 05 octobre 2023 à 07:42 +0200, Liliana Marie Prikler a écrit : > Am Montag, dem 02.10.2023 um 21:08 +0200 schrieb Vivien Kraus: > > The "rules" field in the udev-configuration record can now hold > > both > > rules and hwdb files. > Yeah, how about we instead have separate fields – one named "rules" and one > named "hardware". We're already breaking ABI stability anyway, so we might > as well. Okay. I fixed the udev-service-type function so that both fields are populated correctly. > Speaking of which, we might want to rename "hwdb.d" to "hardware" in udev > itself to make that name readable, but keep /etc/udev/hwdb.bin as-is. I renamed to "hardware" in Guix documentation, but individual packages (if they behave like upower) expect to install their hardware files in "hwdb.d", so I think we should keep "hwdb.d" as the directory name. Le jeudi 05 octobre 2023 à 08:53 +0200, Liliana Marie Prikler a écrit : > Am Donnerstag, dem 05.10.2023 um 07:55 +0200 schrieb Vivien Kraus: > > Le jeudi 05 octobre 2023 à 07:42 +0200, Liliana Marie Prikler a > > écrit : > > > Am Montag, dem 02.10.2023 um 21:08 +0200 schrieb Vivien Kraus: > > > > The "rules" field in the udev-configuration record can now hold > > > > both rules and hwdb files. > > > Yeah, how about we instead have separate fields – one named > > > "rules" > > > and one named "hardware". > > > > Since the extensions are untyped anyway, I thought we would not > > care > > in the configuration record itself. Should we also introduce types > > for the extension values? > This is about field semantics rather than type theory, but if you > prefer, I think we can use list-of file-like? or similar for both. I addressed the "field semantics" view of the problem. Le jeudi 05 octobre 2023 à 09:28 -0400, Maxim Cournoyer a écrit : > > Eudev has a hardware database that installs descriptions of hardware > > in /etc, > > but they should go to /lib prior to being used. The build > > system can’t > > install to /etc, and should not, because this directory is owned by > > the > > udev-service-type. So they are installed directly in /lib. > > Another > > file, an empty /etc/udev.conf, is simply ignored. > > This sounds more like a limitation/bug in our udev-service-type than in > eudev? If eudev wants its files installed to /etc, they should be left > there I think. Going against this is more maintenance down the road, and > surprise from users. As discussed in IRC, we set sysconfdir to /etc so that it can have hardware files from many packages. So the hardware files are searched from either "/etc/udev/hwdb.d" or "$individual_package_prefix/lib/udev/hwdb.d". So, the only standard directory to install hwdb files during a build of a package is $package_prefix/lib/udev/hwdb.d. Le jeudi 05 octobre 2023 à 09:28 -0400, Maxim Cournoyer a écrit : > > The hwdb.bin file used to be generated in > > /etc/udev/hwdb.bin, but > > since the sysconf dir is now directly /etc, the hwdb.bin index will > > not be > > found under /etc/udev/hwdb.bin. > > > > * gnu/packages/linux.scm (eudev): Update to a post-v3.2.12 commit. > > [snippet]: New snippet to override the version number. > > [modules]: Import (guix build utils). > > [#:phases] : New phase. > > : New phase. > > : Remove phase. > > [#:configure-flags]: Set sysconfdir to avoid a prefix. > > The above should be commented in the code. What prefix? sysconfdir > typically defaults to /etc, if I recall correctly. I added comments in the code. As mentioned in IRC, sysconfdir defaults to $prefix/etc. If we use $eudev_prefix/etc/udev/hwdb.d as the directory where the highest priority hardware files are found, then we won’t be able to add files to it at all, and it will be disconnected from /etc/udev/hwdb.d (prepared by the udev-service-type). Le jeudi 05 octobre 2023 à 09:28 -0400, Maxim Cournoyer a écrit : > > + (add-before 'bootstrap 'install-in-lib > > + (lambda _ [...] > > That's rather complex. Could we instead modify udev-service-type to only > union what it needs under /etc/udev and not the undesired files from this > package? Considering the steps in this phase other than changing the installation directory of hardware files, the build system wants to install things to /etc, which is unaccessible when building the package. So we either have to change the installation directory of the empty template configuration, or disable the installation. Same for the mkdir -p, we either have to make the empty directory in the installation prefix of the package, or disable it. I think that the empty configuration file and the empty directory are not worth keeping. > > + "--sysconfdir=/etc"))) > > See comment above about justifying this flag. As discussed, we need it. The added comments should help justify it. > > @@ -20,11 +20,12 @@ this hack. > > - "/lib/udev/rules.d", > > - "/usr/lib/udev/rules.d", > > -#endif > > +- "/usr/local/lib/udev/rules.d", > > + NULL, /* placeholder for $EUDEV_RULES_DIRECTORY */ > > NULL}; > > > > struct udev_rules { > > -@@ -1704,6 +1700,9 @@ > > +@@ -1718,6 +1713,9 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) { > > > > udev_rules_check_timestamp(rules); > > It'd be nicer if eudev's build system allowed to configure the above without > patches hard coding things. Indeed. For now, I think the patch is fine (I know very little about udev rules though). Le jeudi 05 octobre 2023 à 09:33 -0400, Maxim Cournoyer a écrit : > I'm not sure using Texinfo in plain docstrings provides much; there's no > tooling to render them and it's a convention to use FULL CAPS for variable > names in Guile doc strings, at least in the Guix code base. (discussing the docstrings use of texinfo) Le jeudi 05 octobre 2023 à 10:31 -0400, Maxim Cournoyer a écrit : > > Some udev-related auxiliary functions in (gnu services base) had > > non-texinfo > > variable references in their docstrings ("FILE-NAME" instead of > > "@var{file-name}"). > > That's fairly conventional. Texinfo is used in the manual documentation, > package synopsis/descriptions and services documentation, not for every doc > string in the code base. Since the ,describe top-level guile command does not try to render texinfo, I think you are right. I reverted the changes. I changed the documentation as indicated ("matter", double spaces, "@file", the udev-rule introduction, "@code{operating-system}", the android-udev-rules comment). > As discussed above, I'm not convinced about changing dostrings to use > Texinfo, but I see that was already the cases for some around. Hm. I guess that’s from guile people (in guile, the docstrings are extracted to be included in the manual). About the texinfocation of the udev-rules-service docstring: > I'd drop this change. Done. > > +@item @code{native-udev} (default: @code{eudev}) (type: file-like) > > +Native udev package to compile @code{hwdb.bin}. The trie format used for > > +@code{hwdb.bin} must be compatible with the @code{udev} and > > +@code{native-udev} fields of the udev configuration. To avoid generating > > +@code{hwdb.bin}, pass @code{#f} as the @code{native-udev} field. > > + > > +In any case, if the package version string differs between @code{udev} > > +and @code{native-udev}, @code{hwdb.bin} is @strong{not} created. > > Shouldn't that raise an error with a useful error message? Then it doesn't > need to be documented here. Thinking again, why is it necessary to have an > explicite native-udev field? The gexps mechanism of the service could > perhaps use #+udev instead of #$udev where needed, sharing the same 'udev' > field for both purposes? Further down, about the native-udev file in the configuration record definition: > As discussed earlier, I don't think that new field is needed. And further down: > > + (invoke #+(file-append native-udev "/bin/udevadm") > > [...] > > As discussed above, this can probably be simplified by dropping native-udev. > If it's truly needed, the pathological case where different versions are > needed should be handled earliest and an error raised with a useful message. I dropped the native-udev field, with a warning that it will be used both in the current system and the target system. > Could you please send a v8 with changes along those suggested? Here! Best regards, Vivien Vivien Kraus (6): gnu: eudev: Update to 3.2.14. services: udev: Rewrite udev-rule to use file->udev-rule. services: udev: Make udev-rule helper functions generic. gnu: udev-service-type: accept hardware description file extensions. gnu: libgudev: Update to 238. gnu: upower: Update to 1.90.2. doc/guix.texi | 57 ++++++-- gnu/packages/gnome.scm | 43 +++--- gnu/packages/linux.scm | 57 +++++--- .../patches/eudev-rules-directory.patch | 9 +- gnu/services/base.scm | 124 +++++++++++++----- 5 files changed, 205 insertions(+), 85 deletions(-) base-commit: b18b2d13488f2a92331ccad2dc8cbb54ee15582f -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 06 13:31:41 2023 Received: (at 66099) by debbugs.gnu.org; 6 Oct 2023 17:31:41 +0000 Received: from localhost ([127.0.0.1]:52565 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoofp-0000V5-36 for submit@debbugs.gnu.org; Fri, 06 Oct 2023 13:31:40 -0400 Received: from planete-kraus.eu ([89.234.140.182]:43846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoofj-0000UU-TE for 66099@debbugs.gnu.org; Fri, 06 Oct 2023 13:31:35 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 3297bb21; Fri, 6 Oct 2023 17:31: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=061rTtIN0gegOXVEMZEocWmTM/M=; b=x mXKA+NxEnvBsNL6U9wL20cHHdMfRj1RdJykvuVXDxXpCqAFJU9FI4hP7zodKK5FV paPLGoGVMWbeNSqACQ0BeCJicbjsE8R2QSgf1aLwNhCCMI9vxaW1gHXX4RXMFjS8 7n7GDFyPOBlC1l9zXzK85vhlSHsm8y6PVd1WfszvAXk0w2BOTPdm5Fv4hGLazFQ0 jBw7oqSOIYi2G6ozAL6EIaMn+qxuwsfSlSN4P5YsKyMAQois71T8vaBaV2qwF4/A DLGRG4hi+6d2H1f25WIUn2ep2dHV0YubKAKVdQ/SnIQjucELhOG8gbj4R15E9qe6 S+hpj//L11eaCTNf1fvnQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 09a75fb3 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 6 Oct 2023 17:31:10 +0000 (UTC) Message-ID: In-Reply-To: References: <0825bf42daa34ee464c5237b04ad6bf90942e489.camel@gmail.com>, , <1a1089275d13e02b4485c5de6e908ece88f5d2b6.camel@gmail.com><87y1ghryel.fsf@gmail.com>, <87pm1try6q.fsf@gmail.com>, <87lechrvhl.fsf@gmail.com> From: Vivien Kraus Date: Tue, 19 Sep 2023 13:23:22 +0200 Subject: [PATCH gnome-team v8 1/6] gnu: eudev: Update to 3.2.14. To: Liliana Marie Prikler ,Maxim Cournoyer ,66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Everything that eudev searches in "sysconf" is actually searched under /gnu/store/.../etc/udev, as autoconf defines sysconfdir under $prefix by default. The udev-service-type however prepares every fi [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Everything that eudev searches in "sysconf" is actually searched under /gnu/store/.../etc/udev, as autoconf defines sysconfdir under $prefix by default. The udev-service-type however prepares every fi [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Everything that eudev searches in "sysconf" is actually searched under /gnu/store/.../etc/udev, as autoconf defines sysconfdir under $prefix by default. The udev-service-type however prepares every file in /etc/udev, without a prefix. To use /etc/udev as the sysconfdir, we must set it as a configure flag. Eudev has a hardware database that installs descriptions of hardware in /etc, but they can also be installed in /lib instead. The manual page recommends to install all hardware description files into /lib/udev/hwdb.d, but this directory will be read-only when installing another hardware-providing package. udevadm hwdb --update searches for hardware files in /etc/udev/hwdb.d, then /lib/udev/hwdb.d, then UDEV_HWDB_PATH. Each package providing hardware descriptions should install them into their respective /lib/udev/hwdb.d, and the udev-service-type is responsible to collect the relevant hardware descriptions and put them all in /etc/udev/hwdb.d. The build system tries, but fails, to install hardware files into /etc. A fix makes it install the hardware files into /lib instead. Another file, an empty /etc/udev.conf, is expected to be installed in /etc/udev, but it is not needed in guix. The hwdb.bin file used to be generated in /etc/udev/hwdb.bin, but since the sysconf dir is now directly /etc, the hwdb.bin index will not be found under /etc/udev/hwdb.bin. * gnu/packages/linux.scm (eudev): Update to 3.2.14. [modules]: Import (guix build utils). [#:phases] : New phase. : New phase. : Remove phase. [#:configure-flags]: Set sysconfdir to avoid a prefix. [native-search-paths]: Add UDEV_HWDB_PATH. * gnu/packages/patches/eudev-rules-directory.patch: Rebase it. --- gnu/packages/linux.scm | 57 +++++++++++++------ .../patches/eudev-rules-directory.patch | 9 +-- 2 files changed, 45 insertions(+), 21 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 85e3d9845d..c33036b6e0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4262,10 +4262,9 @@ (define-public earlyoom (license license:expat))) (define-public eudev - ;; The post-systemd fork, maintained by Gentoo. (package (name "eudev") - (version "3.2.11") + (version "3.2.14") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/gentoo/eudev") @@ -4273,8 +4272,9 @@ (define-public eudev (file-name (git-file-name name version)) (sha256 (base32 - "0dzaqwjnl55f69ird57wb6skahc6l7zs1slsrzqqfhww33icp6av")) - (patches (search-patches "eudev-rules-directory.patch")))) + "1f6lz57igi7iw2ls3fpzgw42bfznam4nf9368h7x8yf1mb737yxz")) + (patches (search-patches "eudev-rules-directory.patch")) + (modules '((guix build utils))))) (build-system gnu-build-system) (arguments (list @@ -4285,6 +4285,31 @@ (define-public eudev (substitute* "man/make.sh" (("/usr/bin/xsltproc") (search-input-file (or native-inputs inputs) "/bin/xsltproc"))))) + (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. + (copy-file "hwdb/Makefile.am" "hwdb/files.am") + (call-with-output-file "hwdb/Makefile.am" + (lambda (port) + (format port "udevhwdblibdir = $(udevlibexecdir)/hwdb.d\n") + (format port "include ./files.am"))) + (substitute* "hwdb/files.am" + (("dist_udevhwdb_DATA =") + "dist_udevhwdblib_DATA =")) + ;; Do not install the empty udev.conf template. + (substitute* "src/udev/Makefile.am" + (("dist_udevconf_DATA =") + "dist_noinst_DATA =")) + ;; Do not ensure that /etc/udev/rules.d exists. + (substitute* "rules/Makefile.am" + (("\\$\\(MKDIR_P\\) \\$\\(DESTDIR\\)\\$\\(udevconfdir\\)/rules\\.d") + "true")))) (add-after 'install 'move-static-library (lambda _ (let ((source (string-append #$output "/lib/libudev.a")) @@ -4296,19 +4321,17 @@ (define-public eudev ;; such that Libtool looks for it in the usual places. (substitute* (string-append #$output "/lib/libudev.la") (("old_library=.*") - "old_library=''\n"))))) - (add-after 'install 'build-hwdb - (lambda _ - ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and - ;; similar tools to display product names. - ;; - ;; XXX: This can't be done when cross-compiling. Find another way - ;; to generate hwdb.bin for cross-built systems. - #$@(if (%current-target-system) - #~(#t) - #~((invoke (string-append #$output "/bin/udevadm") - "hwdb" "--update")))))) - #:configure-flags #~(list "--enable-manpages"))) + "old_library=''\n")))))) + #:configure-flags + #~(list "--enable-manpages" + ;; By default, autoconf uses $prefix/etc. The udev-service-type + ;; makes sure /etc is set up with rules and hardware file + ;; descriptions. + "--sysconfdir=/etc"))) + (native-search-paths + (list (search-path-specification + (variable "UDEV_HWDB_PATH") + (files '("lib/udev/hwdb.d"))))) (native-inputs (list autoconf automake diff --git a/gnu/packages/patches/eudev-rules-directory.patch b/gnu/packages/patches/eudev-rules-directory.patch index 54fc01c6d5..c4b1cfae39 100644 --- a/gnu/packages/patches/eudev-rules-directory.patch +++ b/gnu/packages/patches/eudev-rules-directory.patch @@ -4,9 +4,9 @@ The old udev 182 supported $UDEV_CONFIG_FILE, which in turn allowed the search path to be customized, but eudev no longer has this, hence this hack. ---- eudev-3.1.5/src/udev/udev-rules.c 2015-10-13 06:22:14.000000000 +0800 -+++ eudev-3.1.5/src/udev/udev-rules.c 2015-10-16 20:45:38.491934336 +0800 -@@ -47,15 +47,11 @@ +--- a/src/udev/udev-rules.c ++++ b/src/udev/udev-rules.c +@@ -48,16 +48,11 @@ struct uid_gid { }; }; @@ -20,11 +20,12 @@ this hack. - "/lib/udev/rules.d", - "/usr/lib/udev/rules.d", -#endif +- "/usr/local/lib/udev/rules.d", + NULL, /* placeholder for $EUDEV_RULES_DIRECTORY */ NULL}; struct udev_rules { -@@ -1704,6 +1700,9 @@ +@@ -1718,6 +1713,9 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) { udev_rules_check_timestamp(rules); -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 06 13:31:41 2023 Received: (at 66099) by debbugs.gnu.org; 6 Oct 2023 17:31:41 +0000 Received: from localhost ([127.0.0.1]:52568 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qooft-0000VF-0l for submit@debbugs.gnu.org; Fri, 06 Oct 2023 13:31:41 -0400 Received: from planete-kraus.eu ([89.234.140.182]:43846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoofp-0000UU-TW for 66099@debbugs.gnu.org; Fri, 06 Oct 2023 13:31:38 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id c267bf91; Fri, 6 Oct 2023 17:31:17 +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=k+d97SLb+vlGEuQb3iYvz11PVP4=; b=l YtUtvObW7pefUAJKtdAvb/uSNhh5L7Q+m/27ajarUtcwRebQwF9veh3XBZ96ZVeS Z4exxJyRYax7fJJjKC1N+Uld12A3qRM0VBjhKYe+3Pvz0LYR6m8p0V58XA2DXsC/ 21gDosJW6Z8xIF0w3hczIk6tR7NrPvu2cW+f1d45QExsmKSxUh18gPmSx88l2O7n bzAoAUeKa99b5Dl0J7tRvYMCd6rJfSpRF7AIh0yxwcnL8sSEG05nrupycK47Ju+n qIQoA40pw0M807o8CbmCVjDEktIUq2TH/qV69Nm8l3kqqRoe6Dy6TXM015XMdi2Y ksE8Uo+KKHxamQcl6SItA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 3fcedc74 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 6 Oct 2023 17:31:17 +0000 (UTC) Message-ID: <745ab283537534e14ae37e1989ba7baa4178938b.1696610746.git.vivien@planete-kraus.eu> In-Reply-To: References: <0825bf42daa34ee464c5237b04ad6bf90942e489.camel@gmail.com>, , <1a1089275d13e02b4485c5de6e908ece88f5d2b6.camel@gmail.com><87y1ghryel.fsf@gmail.com>, <87pm1try6q.fsf@gmail.com>, <87lechrvhl.fsf@gmail.com> From: Vivien Kraus Date: Thu, 5 Oct 2023 19:33:24 +0200 Subject: [PATCH gnome-team v8 2/6] services: udev: Rewrite udev-rule to use file->udev-rule. To: Liliana Marie Prikler ,Maxim Cournoyer ,66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: 0.8 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) * gnu/services/base.scm (udev-rule): Use file->udev-rule. --- gnu/services/base.scm | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index b3f2d2e8b8..30372bf1b5 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2212,19 +2212,7 @@ (define (udev-rules-union packages) (define (udev-rule file-name contents) "Return a directory with a udev rule file FILE-NAME containing CONTENTS." - (computed-file file-name - (with-imported-modules '((guix build utils)) - #~(begin - (use-modules (guix build utils)) - - (define rules.d - (string-append #$output "/lib/udev/rules.d")) - - (mkdir-p rules.d) - (call-with-output-file - (string-append rules.d "/" #$file-name) - (lambda (port) - (display #$contents port))))))) + (file->udev-rule file-name (plain-file file-name contents))) (define (file->udev-rule file-name file) "Return a directory with a udev rule file FILE-NAME which is a copy of FILE." -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 06 13:31:46 2023 Received: (at 66099) by debbugs.gnu.org; 6 Oct 2023 17:31:47 +0000 Received: from localhost ([127.0.0.1]:52571 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoofy-0000Vc-DO for submit@debbugs.gnu.org; Fri, 06 Oct 2023 13:31:46 -0400 Received: from planete-kraus.eu ([89.234.140.182]:43846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoofv-0000UU-Tg for 66099@debbugs.gnu.org; Fri, 06 Oct 2023 13:31:44 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 9f195b6a; Fri, 6 Oct 2023 17:31:23 +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=rJOSnSnmweLGN0RaufMBzY2kw/Q=; b=Y /pxeosNk8SyPbm3asKbH+M0TaLZCZ5cyzdmRZXxv2d/3pzZ6HGOunVrU6q7mK//V ny+Zjd5wOdaV8XfslKD35CLtj93qcCSMt9Pfs05ma+ty60wvvKSJhABAbymvfP55 JOidjeQZ+XVXH2cdQfpqDiei+kxzLfRLBALdFnZO6fyam0683q1TJ/wCWZPl6p/y opZAziOve6GsAx/EULrqX8RXf+iGLzqdcyc7syepIgmJqw5xZEOf8AMx/3imOrgT cVXgHQ81IqV4E9cMjLmcZeM5P+1usDLTV0vzmWbysrhMNIcATCu86pnLBa2eS9KJ J2rGTwOZQbSpjKLWXX3qw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id bafbb626 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 6 Oct 2023 17:31:23 +0000 (UTC) Message-ID: <1e9635cac8aa08da17be6f1270552e3f4dfbdd40.1696610746.git.vivien@planete-kraus.eu> In-Reply-To: References: <0825bf42daa34ee464c5237b04ad6bf90942e489.camel@gmail.com>, , <1a1089275d13e02b4485c5de6e908ece88f5d2b6.camel@gmail.com><87y1ghryel.fsf@gmail.com>, <87pm1try6q.fsf@gmail.com>, <87lechrvhl.fsf@gmail.com> From: Vivien Kraus Date: Thu, 5 Oct 2023 19:24:56 +0200 Subject: [PATCH gnome-team v8 3/6] services: udev: Make udev-rule helper functions generic. To: Liliana Marie Prikler ,Maxim Cournoyer ,66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) * gnu/services/base.scm (udev-configurations-union): New function. (udev-configuration-file): New function, use file->udev-configuration-file. (file->udev-configuration-file): New function. (udev-rules-union): Use udev-configurations-union. (udev-rule): Use udev-configuration-file. (file->udev-rule): Use file->udev-configuration-file. --- gnu/services/base.scm | 50 +++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 30372bf1b5..0bf0568a4e 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2184,9 +2184,9 @@ (define-record-type* (rules udev-configuration-rules ;list of file-like (default '()))) -(define (udev-rules-union packages) - "Return the union of the @code{lib/udev/rules.d} directories found in each -item of @var{packages}." +(define (udev-configurations-union subdirectory packages) + "Return the union of the lib/udev/SUBDIRECTORY.d directories found in each +item of PACKAGES." (define build (with-imported-modules '((guix build union) (guix build utils)) @@ -2197,39 +2197,57 @@ (define (udev-rules-union packages) (srfi srfi-26)) (define %standard-locations - '("/lib/udev/rules.d" "/libexec/udev/rules.d")) + '(#$(string-append "/lib/udev/" subdirectory ".d") + #$(string-append "/libexec/udev/" subdirectory ".d"))) - (define (rules-sub-directory directory) - ;; Return the sub-directory of DIRECTORY containing udev rules, or - ;; #f if none was found. + (define (configuration-sub-directory directory) + ;; Return the sub-directory of DIRECTORY containing udev + ;; configurations, or #f if none was found. (find directory-exists? (map (cut string-append directory <>) %standard-locations))) (union-build #$output - (filter-map rules-sub-directory '#$packages))))) + (filter-map configuration-sub-directory '#$packages))))) + + (computed-file (string-append "udev-" subdirectory) build)) - (computed-file "udev-rules" build)) +(define (udev-rules-union packages) + "Return the union of the lib/udev/rules.d directories found in each +item of PACKAGES." + (udev-configurations-union "rules" packages)) + +(define (udev-configuration-file subdirectory file-name contents) + "Return a directory with a udev configuration file FILE-NAME containing CONTENTS." + (file->udev-configuration-file subdirectory file-name (plain-file file-name contents))) (define (udev-rule file-name contents) "Return a directory with a udev rule file FILE-NAME containing CONTENTS." - (file->udev-rule file-name (plain-file file-name contents))) + (udev-configuration-file "rules" file-name contents)) -(define (file->udev-rule file-name file) - "Return a directory with a udev rule file FILE-NAME which is a copy of FILE." +(define (file->udev-configuration-file subdirectory file-name file) + "Return a directory with a udev configuration file FILE-NAME which is a copy + of FILE." (computed-file file-name (with-imported-modules '((guix build utils)) #~(begin (use-modules (guix build utils)) - (define rules.d - (string-append #$output "/lib/udev/rules.d")) + (define conf.d + (string-append #$output + "/lib/udev/" + #$subdirectory + ".d")) (define file-copy-dest - (string-append rules.d "/" #$file-name)) + (string-append conf.d "/" #$file-name)) - (mkdir-p rules.d) + (mkdir-p conf.d) (copy-file #$file file-copy-dest))))) +(define (file->udev-rule file-name file) + "Return a directory with a udev rule file FILE-NAME which is a copy of FILE." + (file->udev-configuration-file "rules" file-name file)) + (define kvm-udev-rule ;; Return a directory with a udev rule that changes the group of /dev/kvm to ;; "kvm" and makes it #o660. Apparently QEMU-KVM used to ship this rule, -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 06 13:31:52 2023 Received: (at 66099) by debbugs.gnu.org; 6 Oct 2023 17:31:52 +0000 Received: from localhost ([127.0.0.1]:52574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoog3-0000Vu-VH for submit@debbugs.gnu.org; Fri, 06 Oct 2023 13:31:52 -0400 Received: from planete-kraus.eu ([89.234.140.182]:43846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoog1-0000UU-Tv for 66099@debbugs.gnu.org; Fri, 06 Oct 2023 13:31:50 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 216ea6d6; Fri, 6 Oct 2023 17:31:29 +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=dN/6T1jAXW6zqtpJRIsLQF9Ti94=; b=y i96cK2GTPdhGYFpSkRIJeVgd0pJI2ucCMcXKSbkSPb6sDVg58pjp9vvQGSehIKj6 HJ4e5FUtCjGecRs1KJuko2j/i6Cp94e2i0ENxGyt1C70caQ26AfsqjpvyZynNASe bxLCVADoggw/uD4TTQttPVEpovZu5mgnLo5v1NJJuiBk8KxuFYa4Yre/H8ranz1G f8cMYCfwmaL8oIZg2ETpAj2Xf4k4RqjW//0jsmkEfLAQrQ14pgQ7ss8a87Yc1mgj RUeLHKKezP0QbBmmbixYfrTMZcjcjN7IiuE4BwIMmaMXk5iPKHFoWCGf+uG3P6bN B2xeRadaV36E/WmS3EABg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 8c2313d8 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 6 Oct 2023 17:31:28 +0000 (UTC) Message-ID: <49d22daea7adba540d15321c247da1388010c76c.1696610746.git.vivien@planete-kraus.eu> In-Reply-To: References: <0825bf42daa34ee464c5237b04ad6bf90942e489.camel@gmail.com>, , <1a1089275d13e02b4485c5de6e908ece88f5d2b6.camel@gmail.com><87y1ghryel.fsf@gmail.com>, <87pm1try6q.fsf@gmail.com>, <87lechrvhl.fsf@gmail.com> From: Vivien Kraus Date: Mon, 2 Oct 2023 21:08:49 +0200 Subject: [PATCH gnome-team v8 4/6] gnu: udev-service-type: accept hardware description file extensions. To: Liliana Marie Prikler ,Maxim Cournoyer ,66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) The udev-configuration record now has a hardware field. The contents of the /etc directory now includes hwdb.d and hwdb.bin, which is computed immediately. The documentation has been reworked so as to explain why creating udev rules or hwdb needs helper functions for configuration or extension. The hwdb.bin file is conditionally computed by a native version of eudev, that may be configured in the udev-service-type configuration. The condition is that both target and native eudev have the same version. If so, we can reasonably expect that the hwdb.bin file created by native eudev can later be read by target eudev. * gnu/services/base.scm (udev-hardware): New function. (file->udev-hardware): New function. (udev-hardware-service): New function. (udev-etc): Add hwdb.d and hwdb.bin. (module): Export udev-hardware, file->udev-hardware, and udev-hardware-service. (): Add the native-udev field. (udev-service-type) [extend]: Populate the hardware field. * doc/guix.texi (Base Services)[udev-service-type]: Explain configuration and extension values. * doc/guix.texi (Base Services)[udev-hardware]: Document it. [udev-hardware-service]: Same. * doc/guix.texi (Base Services)[udev-configuration]: Document the native-udev field. --- doc/guix.texi | 57 +++++++++++++++++++++++++++++++-------- gnu/services/base.scm | 62 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 101 insertions(+), 18 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 46591b2f64..ec0bd688f0 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -19322,9 +19322,23 @@ Base Services @file{/dev} directory dynamically, whose value is a @code{} object. -This service type can be @emph{extended} using procedures -@code{udev-rules-service} along with @code{file->udev-rule} or -@code{udev-rule} which simplify the process of writing udev rules. +Since the file names for udev rules and hardware description files +matter, the configuration items for rules and hardware cannot simply be +plain file-like objects with the rules content, because the name would +be ignored. Instead, they are directory file-like objects that contain +optional rules in @file{lib/udev/rules.d} and optional hardware files in +@file{lib/udev/hwdb.d}. This way, the service can be configured with +whole packages from which to take rules and hwdb files. + +The @code{udev-service-type} can be @emph{extended} with file-like +directories that respect this hierarchy. For convenience, the +@code{udev-rule} and @code{file->udev-rule} can be used to construct +udev rules, while @code{udev-hardware} and @code{file->udev-hardware} +can be used to construct hardware description files. + +In an @code{operating-system} declaration, this service type can be +@emph{extended} using procedures @code{udev-rules-service} and +@code{udev-hardware-service}. @end defvar @deftp {Data Type} udev-configuration @@ -19332,10 +19346,17 @@ Base Services @table @asis @item @code{udev} (default: @code{eudev}) (type: file-like) -Package object of the udev service. +Package object of the udev service. This package is used at run-time, +when compiled for the target system. In order to generate the +@file{hwdb.bin} hardware index, it is also used when generating the +system definition, compiled for the current system. @item @code{rules} (default: @var{'()}) (type: list-of-file-like) -List of file-like objects denoting udev-rule files. +List of file-like objects denoting udev rule files under a sub-directory. + +@item @code{hardware} (default: @var{'()}) (type: list-of-file-like) +List of file-like objects denoting udev hardware description files under +a sub-directory. @end table @end deftp @@ -19358,6 +19379,11 @@ Base Services @end lisp @end deffn +@deffn {Procedure} udev-hardware @var{file-name} @var{contents} +Return a udev hardware description file named @var{file-name} containing +the hardware information @var{contents}. +@end deffn + @deffn {Procedure} udev-rules-service @var{name} @var{rules} [#:groups '()] Return a service that extends @code{udev-service-type} with @var{rules} and @code{account-service-type} with @var{groups} as system groups. @@ -19377,6 +19403,11 @@ Base Services @end lisp @end deffn +@deffn {Procedure} udev-hardware-service @var{name} @var{hardware} +Return a service that extends @code{udev-service-type} with +@var{hardware}. The service name is @code{@var{name}-udev-hardware}. +@end deffn + @deffn {Procedure} file->udev-rule @var{file-name} @var{file} Return a udev-rule file named @var{file-name} containing the rules defined within @var{file}, a file-like object. @@ -19401,12 +19432,16 @@ Base Services @end lisp @end deffn -Additionally, Guix package definitions can be included in @var{rules} in -order to extend the udev rules with the definitions found under their -@file{lib/udev/rules.d} sub-directory. In lieu of the previous -@var{file->udev-rule} example, we could have used the -@var{android-udev-rules} package which exists in Guix in the @code{(gnu -packages android)} module. +Since guix package definitions can be included in @var{rules} in order +to use all their rules under the @file{lib/udev/rules.d} sub-directory, +then in lieu of the previous @var{file->udev-rule} example, we could +have used the @var{android-udev-rules} package which exists in Guix in +the @code{(gnu packages android)} module. + +@deffn {Procedure} file->udev-hardware @var{file-name} @var{file} +Return a udev hardware description file named @var{file-name} containing +the rules defined within @var{file}, a file-like object. +@end deffn The following example shows how to use the @var{android-udev-rules} package so that the Android tool @command{adb} can detect devices diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 0bf0568a4e..0ca7f2af4a 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -81,6 +81,7 @@ (define-module (gnu services base) #:select (mount-flags->bit-mask swap-space->flags-bit-mask)) #:use-module (guix gexp) + #:use-module ((guix packages) #:select (package-version)) #:use-module (guix records) #:use-module (guix modules) #:use-module (guix pki) @@ -150,11 +151,15 @@ (define-module (gnu services base) udev-configuration udev-configuration? udev-configuration-rules + udev-configuration-hardware udev-service-type udev-service ; deprecated udev-rule + udev-hardware file->udev-rule + file->udev-hardware udev-rules-service + udev-hardware-service login-configuration login-configuration? @@ -2181,8 +2186,10 @@ (define-record-type* udev-configuration? (udev udev-configuration-udev ;file-like (default eudev)) - (rules udev-configuration-rules ;list of file-like - (default '()))) + (rules udev-configuration-rules ;package-like file-like + (default '())) + (hardware udev-configuration-hardware ;package-like file-like + (default '()))) (define (udev-configurations-union subdirectory packages) "Return the union of the lib/udev/SUBDIRECTORY.d directories found in each @@ -2224,6 +2231,10 @@ (define (udev-rule file-name contents) "Return a directory with a udev rule file FILE-NAME containing CONTENTS." (udev-configuration-file "rules" 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" 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 of FILE." @@ -2248,6 +2259,10 @@ (define (file->udev-rule file-name file) "Return a directory with a udev rule file FILE-NAME which is a copy of FILE." (file->udev-configuration-file "rules" 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" file-name file)) + (define kvm-udev-rule ;; Return a directory with a udev rule that changes the group of /dev/kvm to ;; "kvm" and makes it #o660. Apparently QEMU-KVM used to ship this rule, @@ -2355,13 +2370,30 @@ (define udev.conf (define (udev-etc config) (match-record config - (udev rules) + (udev rules hardware) + (let* ((hwdb.d + (udev-configurations-union "hwdb" (cons* udev hardware))) + (hwdb.bin + (computed-file + "hwdb.bin" + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + (setenv "UDEV_HWDB_PATH" #$hwdb.d) + (invoke #+(file-append udev "/bin/udevadm") + "hwdb" + "--update" + "-o" #$output)))))) `(("udev" ,(file-union "udev" `(("udev.conf" ,udev.conf) ("rules.d" ,(udev-rules-union (cons* udev kvm-udev-rule - rules))))))))) + rules))) + ("hwdb.d" ,hwdb.d) + ,@(if hwdb.bin + `(("hwdb.bin" ,hwdb.bin)) + '())))))))) (define udev-service-type (service-type (name 'udev) @@ -2370,12 +2402,15 @@ (define udev-service-type udev-shepherd-service) (service-extension etc-service-type udev-etc))) (compose concatenate) ;concatenate the list of rules - (extend (lambda (config rules) + (extend (lambda (config extensions) (let ((initial-rules - (udev-configuration-rules config))) + (udev-configuration-rules config)) + (initial-hardware + (udev-configuration-hardware config))) (udev-configuration (inherit config) - (rules (append initial-rules rules)))))) + (rules (append initial-rules extensions)) + (hardware (append initial-hardware extensions)))))) (default-value (udev-configuration)) (description "Run @command{udev}, which populates the @file{/dev} @@ -2410,6 +2445,19 @@ (define* (udev-rules-service name rules #:key (groups '())) (description "This service adds udev rules.")))) (service type #f))) +(define (udev-hardware-service name hardware-files) + "Return a service that extends udev-service-type with HARDWARE-FILES, named +NAME-udev-hardware." + (let* ((name (symbol-append name '-udev-hardware)) + (udev-extension (const (list hardware-files))) + (type (service-type + (name name) + (extensions (list + (service-extension + udev-service-type udev-extension))) + (description "This service adds udev hardware files.")))) + (service type #f))) + (define (swap-space->shepherd-service-name space) (let ((target (swap-space-target space))) (symbol-append 'swap- -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 06 13:31:59 2023 Received: (at 66099) by debbugs.gnu.org; 6 Oct 2023 17:31:59 +0000 Received: from localhost ([127.0.0.1]:52577 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoogA-0000WD-Sr for submit@debbugs.gnu.org; Fri, 06 Oct 2023 13:31:59 -0400 Received: from planete-kraus.eu ([89.234.140.182]:43846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoog9-0000UU-U6 for 66099@debbugs.gnu.org; Fri, 06 Oct 2023 13:31:58 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 4cb8d12b; Fri, 6 Oct 2023 17:31:37 +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=8IllG/iUYeuMh4Fe17WtACJeN8U=; b=t gATjwaF0sl6Qmj2rwtfDeTdxXetLvx0jMfqtQ7MtHGzx2cmjWVBCjNCyTDvfX7pv C+Iy2UdbLKV2x9VbJqzUVECT/NP+kcmx0xEG7r4KjZ6Uct7VX1SIpw2coE3rhSX2 h+ZDWupG8lKMPkMJPP1cV2mZ502D2MjB0bIrv2XLJBPHkYr2W+89t+7/SWwnNnvP B67b4Aj4Wto5JP6xhIMMB7xMOaGTk8UQxVJANk1SCIQDBBBAGE2mji4/Kw8qydwd NU0oi4IyseSbVFTsQIBYyVB17zM1SGjCIEVFIT+Ak8Pc8rzmqzouSMLU4Y79Cydx UtCEsi26pTLfHAWhE9DpQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 6307c6ad (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 6 Oct 2023 17:31:36 +0000 (UTC) Message-ID: <0eed23771cad33bdc798d934374c783be7a4cbee.1696610746.git.vivien@planete-kraus.eu> In-Reply-To: References: <0825bf42daa34ee464c5237b04ad6bf90942e489.camel@gmail.com>, , <1a1089275d13e02b4485c5de6e908ece88f5d2b6.camel@gmail.com><87y1ghryel.fsf@gmail.com>, <87pm1try6q.fsf@gmail.com>, <87lechrvhl.fsf@gmail.com> From: Vivien Kraus Date: Tue, 19 Sep 2023 13:32:26 +0200 Subject: [PATCH gnome-team v8 5/6] gnu: libgudev: Update to 238. To: Liliana Marie Prikler ,Maxim Cournoyer ,66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ea3dc455a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-pl [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ea3dc455a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-pl [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ea3dc455a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-plugins (define-public libgudev (package (name "libgudev") - (version "236") + (version "238") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "094mgjmwgsgqrr1i0vd20ynvlkihvs3vgbmpbrhswjsrdp86j0z5")))) + "1laxgdkgmr30aw44sm4rgpsdybwxx5rszcm8c2y3vmy9myqnl9k1")))) (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 06 13:32:11 2023 Received: (at 66099) by debbugs.gnu.org; 6 Oct 2023 17:32:11 +0000 Received: from localhost ([127.0.0.1]:52586 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoogN-0000XY-6W for submit@debbugs.gnu.org; Fri, 06 Oct 2023 13:32:11 -0400 Received: from planete-kraus.eu ([89.234.140.182]:43846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoogK-0000UU-VG for 66099@debbugs.gnu.org; Fri, 06 Oct 2023 13:32:09 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id a94b660d; Fri, 6 Oct 2023 17:31:49 +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:mime-version :content-type:content-transfer-encoding:to:cc; s=albinoniB; bh=U 4Q95r5OzDlerBhawFCb592wjQg=; b=jqYZry9MpWachHRTYqEk0BtqebMxxn0X8 yMVnih1fQ9T3QmVWfeLBYM0n/6Cyu7uyKLs4d3WgkDNHCxQFsiK/SZalZZYW08Yl eT2UwllGuTLqHl7YGA/ZnRdy+GaT+BeVGFw5n5rLpNAFbKcF9DVvv2ZGG1+IlVrf Lgm46Cshak4cF3FJSVWcZgiKvCKJYcWvaJk59fkeFzBIAn4+zOwCPLnCjrY+JIoO HpD3aUzdlVMgyrgxHnsf6knSTuQTgY3wHURP1vjQ2xMztU0paPKany2C7uUq9V9E FzAjLCaH4dT3nQZyzI58iZqQ4eXi8/MzMjNPuv1j8dMyDHyMg19uA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 137a44d3 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 6 Oct 2023 17:31:48 +0000 (UTC) Message-ID: In-Reply-To: References: <0825bf42daa34ee464c5237b04ad6bf90942e489.camel@gmail.com>, , <1a1089275d13e02b4485c5de6e908ece88f5d2b6.camel@gmail.com><87y1ghryel.fsf@gmail.com>, <87pm1try6q.fsf@gmail.com>, <87lechrvhl.fsf@gmail.com> From: Vivien Kraus Date: Tue, 19 Sep 2023 13:32:46 +0200 Subject: [PATCH gnome-team v8 6/6] gnu: upower: Update to 1.90.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: Liliana Marie Prikler ,Maxim Cournoyer ,66099@debbugs.gnu.org User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The new eudev now can install hwdb files. Upower has some, but they should get installed in upower’s output, not eudev’s. The phases needed a rework. Now the 32-bit-specific test fix is always there, except it may be empty. Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The new eudev now can install hwdb files. Upower has some, but they should get installed in upower’s output, not eudev’s. The phases needed a rework. Now the 32-bit-specific test fix is always there, except it may be empty. Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager The new eudev now can install hwdb files. Upower has some, but they should get installed in upower’s output, not eudev’s. The phases needed a rework. Now the 32-bit-specific test fix is always there, except it may be empty. test_bluetooth_hidpp_mouse fails, after calling into a bluez dbus method. * gnu/packages/gnome.scm (upower): Update to 1.90.2. [#:configure-flags]: Set udevhwdbdir. [#:phases] : Add this phase unconditionnally : Disable test_bluetooth_hidpp_mouse. [inputs]: Remove dbus-glib. [native-inputs]: Add dbus. --- gnu/packages/gnome.scm | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4ea3dc455a..3f773aae8a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5727,7 +5727,7 @@ (define-public geocode-glib-with-libsoup2 (define-public upower (package (name "upower") - (version "1.90.0") + (version "1.90.2") (source (origin (method git-fetch) @@ -5736,7 +5736,7 @@ (define-public upower (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1g17rm91p8vfpjyb0k2shylrs55nccn3fa890vlk4n9s71sghbzq")) + (base32 "13xp423ycv8imf2cmgf6lii9f01p7x2v19cny7acrmczkc0cqv7d")) (modules '((guix build utils))) (snippet ;; Upstream commit . - (substitute* "src/linux/integration-test.py" - (("assertEqual(.*)40\\.0" _ middle) - (string-append - "assertAlmostEqual" middle "40.0")))))) - #~%standard-phases))) + (string-append "-Dudevrulesdir=" #$output "/bin/udev/rules.d") + (string-append "-Dudevhwdbdir=" #$output "/lib/udev/hwdb.d")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'adjust-test-suite + (lambda _ + ;; This test calls an unimplemented bluez dbus method. + (substitute* "src/linux/integration-test.py" + (("test_bluetooth_hidpp_mouse") + "disabled_test_bluetooth_hidpp_mouse")) + #$@(if (target-x86-32?) + ;; Address test failure caused by excess precision + ;; on i686: + ;; . + '((substitute* "src/linux/integration-test.py" + (("assertEqual(.*)40\\.0" _ middle) + (string-append + "assertAlmostEqual" middle "40.0")))) + '())))))) (native-inputs (list `(,glib "bin") ; for gdbus-codegen gobject-introspection @@ -5785,12 +5791,13 @@ (define-public upower python-packaging python-pygobject umockdev + dbus ;; For man pages. docbook-xsl libxslt ; for 'xsltproc' libxml2)) ; for 'XML_CATALOG_FILES' (inputs - (list dbus-glib libgudev libusb)) + (list libgudev libusb)) (propagated-inputs ;; In Requires of upower-glib.pc. (list glib)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 06 14:23:34 2023 Received: (at 66099) by debbugs.gnu.org; 6 Oct 2023 18:23:34 +0000 Received: from localhost ([127.0.0.1]:52640 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qopU5-0001w1-JD for submit@debbugs.gnu.org; Fri, 06 Oct 2023 14:23:33 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:48330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qopU3-0001vm-Mo for 66099@debbugs.gnu.org; Fri, 06 Oct 2023 14:23:32 -0400 Received: by mail-wr1-x444.google.com with SMTP id ffacd0b85a97d-307d20548adso2229379f8f.0 for <66099@debbugs.gnu.org>; Fri, 06 Oct 2023 11:23:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696616587; x=1697221387; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=wx7ShwjDK2tWnfQZAGT5VIZwdznP57RO33WInVVbRNY=; b=FB3H3UiIpWaZ3ihxkSePxrFyjzNa0sMwqJtQSq31d3naq1eR5vmzo83HpA1WXwO2cS QVeYmWf8YOvUoF3KIV/c5CZaateVMybosDhDt6xXuJSdVaKy2R3q81SphW+PPuDFaadd sPUSAUvuauHdutLkK0o3p1qA19lgyyIA3ZEYP5le25pmacExyzHXIHYRbMeiaNgBivvh 6/JI2rNtxj9BJnSwa4ITP4SHdj4Z6nnHU6zqbLFWHWoO2NtC3zNrZBuCzAi6Y+8GRm/Q VhoOe+YUwczc3dd1e07nnVk+pV5cgZMkt/X97NwHTuEN+CK/Se6h9TL7FliQDRJqkCxQ LFZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696616587; x=1697221387; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=wx7ShwjDK2tWnfQZAGT5VIZwdznP57RO33WInVVbRNY=; b=OJDX3gzXxpfFklszsP7lmRQPoH7Y1miNxjVLaoasyV9JTBefLWbn7wmBvL2nrd9AF7 Gb1bU2L8VBCIhHKIk0xnoAlY0MzVW4avjEJ4roDa4gkWxziahFGYVAaIr5I5L9RzxGDR +Gu8OGjLtVInHAgGdc/puNHTXfN82T4hFqKmO8AJ/MnIaj5kYN5Af5NRQ2GYJJhBS3D6 XKaFdTn5Ebyaag+gxmonwicXzyfslAPQ4+PgST69ZaI8b1X2EM1m7QQyqN8u+JFp7Qh0 Kf56FJgZozhk0Z/9bdkJGDMu/1NVjK8T9utAXWSnWtJoi+WrirTbUfiJg+XVOWeqiMWu x/qQ== X-Gm-Message-State: AOJu0YzLHK25mz2n/PAhc6apgukNEdaAFboypuueX7egb0myZQy3dXfa h23SJ3XIOTiRtYP/jx82fKc= X-Google-Smtp-Source: AGHT+IFg2La4cpUGKV8S0CPoG5LK2W1ruHZOVlBvaoebLWQGr7z+Ud+vI9fWylarilx4/UZizLvJUQ== X-Received: by 2002:adf:e886:0:b0:31f:f9e5:ef05 with SMTP id d6-20020adfe886000000b0031ff9e5ef05mr8165013wrm.1.1696616586686; Fri, 06 Oct 2023 11:23:06 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q8-20020adff508000000b003200c918c81sm2175498wro.112.2023.10.06.11.23.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 11:23:05 -0700 (PDT) Message-ID: Subject: Re: [PATCH gnome-team v8 0/6] Update eudev, udev-service-type, upower From: Liliana Marie Prikler To: Vivien Kraus , Maxim Cournoyer , 66099@debbugs.gnu.org Date: Fri, 06 Oct 2023 20:23:04 +0200 In-Reply-To: References: <0825bf42daa34ee464c5237b04ad6bf90942e489.camel@gmail.com> , ,<1a1089275d13e02b4485c5de6e908ece88f5d2b6.camel@gmail.com> <87y1ghryel.fsf@gmail.com>,<87pm1try6q.fsf@gmail.com> ,<87lechrvhl.fsf@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Freitag, dem 06.10.2023 um 18:45 +0200 schrieb Vivien Kraus: > Le jeudi 05 octobre 2023 =C3=A0 07:42 +0200, Liliana Marie Prikler a =C3= =A9crit > : > > Speaking of which, we might want to rename "hwdb.d" to "hardware" > > in udev itself to make that name readable, but keep > > /etc/udev/hwdb.bin as-is. >=20 > I renamed to "hardware" in Guix documentation, but individual > packages (if they behave like upower) expect to install their > hardware files in "hwdb.d", so I think we should keep "hwdb.d" as the > directory name. We could patch those or supply configuration arguments, but fair enough if you don't want to. > Le jeudi 05 octobre 2023 =C3=A0 08:53 +0200, Liliana Marie Prikler a > =C3=A9crit=C2=A0: > > This sounds more like a limitation/bug in our udev-service-type > > than in eudev?=C2=A0 If eudev wants its files installed to /etc, they > > should be left there I think.=C2=A0 Going against this is more > > maintenance down the road, and surprise from users. >=20 > As discussed in IRC, we set sysconfdir to /etc so that it can have > hardware files from many packages. So the hardware files are searched > from either "/etc/udev/hwdb.d" or > "$individual_package_prefix/lib/udev/hwdb.d". > So, the only standard directory to install hwdb files during a build > of a package is $package_prefix/lib/udev/hwdb.d. Which makes me think we could also make this $prefix/lib/udev/hardware. But again, if you like ltrsld, I'm fine with that. > Vivien Kraus (6): > =C2=A0 gnu: eudev: Update to 3.2.14. > =C2=A0 services: udev: Rewrite udev-rule to use file->udev-rule. > =C2=A0 services: udev: Make udev-rule helper functions generic. > =C2=A0 gnu: udev-service-type: accept hardware description file > extensions. > =C2=A0 gnu: libgudev: Update to 238. > =C2=A0 gnu: upower: Update to 1.90.2. >=20 > =C2=A0doc/guix.texi=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 57 = ++++++-- > =C2=A0gnu/packages/gnome.scm=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 |=C2=A0 43 +++--- > =C2=A0gnu/packages/linux.scm=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 |=C2=A0 57 +++++--- > =C2=A0.../patches/eudev-rules-directory.patch=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 |=C2=A0=C2=A0 9 +- > =C2=A0gnu/services/base.scm=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 | 124 +++++++++++++--- > -- > =C2=A05 files changed, 205 insertions(+), 85 deletions(-) Will look at those shortly. Cheers From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 06 14:36:11 2023 Received: (at 66099) by debbugs.gnu.org; 6 Oct 2023 18:36:11 +0000 Received: from localhost ([127.0.0.1]:52657 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qopgI-0002Jc-On for submit@debbugs.gnu.org; Fri, 06 Oct 2023 14:36:11 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:58472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qopgH-0002JP-BM for 66099@debbugs.gnu.org; Fri, 06 Oct 2023 14:36:09 -0400 Received: by mail-wr1-x444.google.com with SMTP id ffacd0b85a97d-307d58b3efbso2167875f8f.0 for <66099@debbugs.gnu.org>; Fri, 06 Oct 2023 11:35:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696617344; x=1697222144; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=qZtUMMOaOCYN3PRBvIraXxtQ6t3DPJz8lpiP1qKHToY=; b=FgQScH+N91S2pIoDuwbf6hZLXc9earCzkUpbDSTBf5V2ATrOll847yI5majQM5EcA4 5gRJmnDWOw1DlZsrCrqFFuTUEdq58sEw6QyyNesd295kurfXLq/OxssCO5/dVVE/Ftsp UF/XjPC3RwIM+fShP8/GNKqAhfg3XIQYgZDCDOktoH6qJj3cqMqG7eO5HAJczaSuQL/N h7P/ZQeLuFDjtEA5buvKpsbb86T2S3Cgw9/6KzsMO8Dh7HjQZr46KMBqD0UPSn2XFUZn 2t3/XJDmjUMsxQH5gWtYEgm6FnJjt/xzYZrB9UseyAAzOkSVaq8+Yt19O8/A4kn1UmcT DYpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696617344; x=1697222144; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=qZtUMMOaOCYN3PRBvIraXxtQ6t3DPJz8lpiP1qKHToY=; b=gAz2jMGwxBioJqrrMYUKY2LBrl8JHR52W4LqEpul01SJP5i63vMWzBrwXfi9uB0Fxi wVtVr1qvj0KJ50hjGCOc8Qx1ftFcUuSAw4v2ZUK+o8beTduduOHjFXey1BAeYkUDMdL1 YzmaOs1TjfDQLY7ib5k0+sa4PS7kl2AK7UppsVsZPuUH9YJOwqagv7kJjTgFkAWGQiak 1nZL05vQGMDSOU18nXFLLuUMYkSFXI+54dHP7i9AylYQaTsckSnbCvXyO1xAKkBZt6PO mfABNqBPPo8f5+mIL/rzlzQH/rVzr4bVLF4WN645sINkUDjEjiGXE8BqaN4l6mQrVD/z tRBw== X-Gm-Message-State: AOJu0YwpTHzrw86PWViCFEOVXWypfFHGsvK+q0fuuP2cGTZHtrzowOPr Su08+gH+tCZagYKJ0LN2JQA= X-Google-Smtp-Source: AGHT+IH0bxwQh4vt07ure1Yh1BK/iifYeWBFnI04tSAM6d0A3poL62kzUrWpzDJmwWzsnprFe+akZA== X-Received: by 2002:a5d:4905:0:b0:321:64a6:e417 with SMTP id x5-20020a5d4905000000b0032164a6e417mr8206904wrq.1.1696617344382; Fri, 06 Oct 2023 11:35:44 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id e14-20020adffd0e000000b00315af025098sm2231414wrr.46.2023.10.06.11.35.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 11:35:43 -0700 (PDT) Message-ID: <10e334a07e0d45ff7bce0a18b56fd68f13ad2ce8.camel@gmail.com> Subject: Re: [PATCH gnome-team v8 1/6] gnu: eudev: Update to 3.2.14. From: Liliana Marie Prikler To: Vivien Kraus , Maxim Cournoyer , 66099@debbugs.gnu.org Date: Fri, 06 Oct 2023 20:35:42 +0200 In-Reply-To: References: <0825bf42daa34ee464c5237b04ad6bf90942e489.camel@gmail.com> , ,<1a1089275d13e02b4485c5de6e908ece88f5d2b6.camel@gmail.com> <87y1ghryel.fsf@gmail.com>,<87pm1try6q.fsf@gmail.com> ,<87lechrvhl.fsf@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Dienstag, dem 19.09.2023 um 13:23 +0200 schrieb Vivien Kraus: > Everything that eudev searches in "sysconf" is actually searched > under /gnu/store/.../etc/udev, as autoconf defines sysconfdir under > $prefix by default. The udev-service-type however prepares every file > in /etc/udev, without a prefix. To use /etc/udev as the sysconfdir, > we must set it as a configure flag. This comment remains more confusing than helpful. I get what you're trying to express (or at least I hope I do), but I could easily read it the wrong way. Basically, what you're trying to express is that we set sysconfdir to /etc/udev so that eudev uses the hwdb from udev-service- type rather than the one in its own package. This is fine =E2=80=93 althou= gh there are better ways to do so, see below =E2=80=93 but the way it's communicated here, is=E2=80=A6 strange. > Eudev has a hardware database that installs descriptions of hardware > in /etc, but they can also be installed in /lib instead. The > manual page recommends to install all hardware description files into > /lib/udev/hwdb.d, but this directory will be read- > only when installing another hardware-providing package. This should be "Eudev now has a hardware database /etc made up of descriptions installed in /lib/udev/hwdb.d, and more generally, UDEV_HWDB_PATH." We should probably also patch our own manuals to not make that recommendation. Perhaps close off with mentioning hwdb -- update. > The build system tries, but fails, to install hardware files into > /etc. A fix makes it install the hardware files into /lib > instead. Another file, an empty /etc/udev.conf, is expected to be > installed in /etc/udev, but it is not needed in guix. Gratuitous information that's more confusing than helpful. > The hwdb.bin file used to be generated in /etc/udev/hwdb.bin, > but since the sysconf dir is now directly /etc, the hwdb.bin index > will not be found under /etc/udev/hwdb.bin. While we choose to do this via sysconfdir, the proper fix would be to read the path to the hwdb file from /etc/udev/udev.conf and fall back to $prefix/etc/udev/hwdb.bin if it's undefined. That saves us some hacks. > * gnu/packages/linux.scm (eudev): Update to 3.2.14. > [modules]: Import (guix build utils). > [#:phases] : New phase. > : New phase. > : Remove phase. > [#:configure-flags]: Set sysconfdir to avoid a prefix. > [native-search-paths]: Add UDEV_HWDB_PATH. > * gnu/packages/patches/eudev-rules-directory.patch: Rebase it. > --- Cheers From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 06 14:43:12 2023 Received: (at 66099) by debbugs.gnu.org; 6 Oct 2023 18:43:12 +0000 Received: from localhost ([127.0.0.1]:52674 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qopn5-0002WO-Im for submit@debbugs.gnu.org; Fri, 06 Oct 2023 14:43:12 -0400 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]:51601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qopn3-0002W9-Q7 for 66099@debbugs.gnu.org; Fri, 06 Oct 2023 14:43:10 -0400 Received: by mail-ej1-x641.google.com with SMTP id a640c23a62f3a-9b9ad5760b9so425293266b.3 for <66099@debbugs.gnu.org>; Fri, 06 Oct 2023 11:42:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696617765; x=1697222565; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=Aus0RSs/BoP0BpkyjCdaXZGiSm+V7pNmSqtOrHuldhM=; b=aRoEYLUCiH6VtYcF0+twGwosJ9styyj3v80R8OVEb4O9xlUsy+mypNTkHRUXx9nI4r 1wWbEr+WWzB9V/24GWEGbuw6c+xD4XpyZSS7oLESOAUUUPCmSI6+fkxqHEJ5gOKx2LQX 08dwN7/FviYmM69A74ixa+SFsu7VqK5XGCnO9VlDexEs9OSeanaX6lFTf51qB7smrQw0 biBXCIH8YEJWXTuwhrNDLhLQ+57BHcn9q7Xr6iL8oAUO/k0b+n8ndk0mCLG/gI6O1qeo foAtr+Fjky8uHZeDAGUf/6EtrWoNTqIE6Gw3N9ExPX2R59vqJVOiiSCh3E9yQJJsMOCA Qvgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696617765; x=1697222565; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Aus0RSs/BoP0BpkyjCdaXZGiSm+V7pNmSqtOrHuldhM=; b=P5NrPhUsiukO7wSeXujaJawOCFRi36tgB1ZekIlSZLuiyhMJNvE53GRhhHwpAtE4+c IETpgpFx7Cfl/puPx0APCMXg19vEytFBSNSUJwLz5R6KnLbfxnnHNhjOjWZBiZTgpz7e zJikMxkLmxxkv21OqPFd1AXn4kzBJLVG/Ibq4Ai8S7NgyNHIV+uBRP2UATu76NCHJJt2 900ZeJNCoA592Q11Xq1E3U1Dqi/TXUirt8Q6Gir7N64xAXo7z5cIC9oOH511AsMeo2Uz Pf+fxVw9S5GMNuRAMhEoW54iK9ZhCeor403GOBCikpT82oDGDFcZpCC5HET7OnsRtv9N liKA== X-Gm-Message-State: AOJu0YwAmppbdpdIxRUFbPBpyGErNILfYXI85RL+KprWXVdbfjxaiC6P SNOJc4wK7RmrIOIEEOyEcyE= X-Google-Smtp-Source: AGHT+IE0AXb7q7TykgVBkXoXLyJEUY5KjNcUxVXCtF64LaSHfH7V5rLI4duxinqIyXncr2+5iO7lWA== X-Received: by 2002:a17:906:5352:b0:99b:4ed4:5527 with SMTP id j18-20020a170906535200b0099b4ed45527mr8057902ejo.25.1696617764572; Fri, 06 Oct 2023 11:42:44 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id f5-20020a170906560500b009b8dbdd5203sm3250749ejq.107.2023.10.06.11.42.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 11:42:43 -0700 (PDT) Message-ID: <9dcb22311514913d7b0fe41fd957e24423b8fa9b.camel@gmail.com> Subject: Re: [PATCH gnome-team v8 4/6] gnu: udev-service-type: accept hardware description file extensions. From: Liliana Marie Prikler To: Vivien Kraus , Maxim Cournoyer , 66099@debbugs.gnu.org Date: Fri, 06 Oct 2023 20:42:35 +0200 In-Reply-To: <49d22daea7adba540d15321c247da1388010c76c.1696610746.git.vivien@planete-kraus.eu> References: <0825bf42daa34ee464c5237b04ad6bf90942e489.camel@gmail.com> , ,<1a1089275d13e02b4485c5de6e908ece88f5d2b6.camel@gmail.com> <87y1ghryel.fsf@gmail.com>,<87pm1try6q.fsf@gmail.com> ,<87lechrvhl.fsf@gmail.com> <49d22daea7adba540d15321c247da1388010c76c.1696610746.git.vivien@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) QW0gTW9udGFnLCBkZW0gMDIuMTAuMjAyMyB1bSAyMTowOCArMDIwMCBzY2hyaWViIFZpdmllbiBL cmF1czoKPiBUaGUgdWRldi1jb25maWd1cmF0aW9uIHJlY29yZCBub3cgaGFzIGEgaGFyZHdhcmUg ZmllbGQuCj4gCj4gVGhlIGNvbnRlbnRzIG9mIHRoZSAvZXRjIGRpcmVjdG9yeSBub3cgaW5jbHVk ZXMgaHdkYi5kIGFuZCBod2RiLmJpbiwKPiB3aGljaCBpcyBjb21wdXRlZCBpbW1lZGlhdGVseS4K SW1tZWRpYXRlbHk/Cgo+IFRoZSBkb2N1bWVudGF0aW9uIGhhcyBiZWVuIHJld29ya2VkIHNvIGFz IHRvIGV4cGxhaW4gd2h5IGNyZWF0aW5nCj4gdWRldiBydWxlcyBvciBod2RiIG5lZWRzIGhlbHBl ciBmdW5jdGlvbnMgZm9yIGNvbmZpZ3VyYXRpb24gb3IKPiBleHRlbnNpb24uCj4gCj4gVGhlIGh3 ZGIuYmluIGZpbGUgaXMgY29uZGl0aW9uYWxseSBjb21wdXRlZCBieSBhIG5hdGl2ZSB2ZXJzaW9u IG9mCj4gZXVkZXYsIHRoYXQgbWF5IGJlIGNvbmZpZ3VyZWQgaW4gdGhlIHVkZXYtc2VydmljZS10 eXBlIGNvbmZpZ3VyYXRpb24uClRoaXMgbm8gbG9uZ2VyIGhvbGRzLCBhcyBmYXIgYXMgSSBjYW4g c2VlPwo+IFRoZSBjb25kaXRpb24gaXMgdGhhdCBib3RoIHRhcmdldCBhbmQgbmF0aXZlIGV1ZGV2 IGhhdmUgdGhlIHNhbWUKPiB2ZXJzaW9uLiBJZiBzbywgd2UgY2FuIHJlYXNvbmFibHkgZXhwZWN0 IHRoYXQgdGhlIGh3ZGIuYmluIGZpbGUKPiBjcmVhdGVkIGJ5IG5hdGl2ZSBldWRldiBjYW4gbGF0 ZXIgYmUgcmVhZCBieSB0YXJnZXQgZXVkZXYuCkNvbnRpbnVhdGlvbiBvZiBhYm92ZS4KCj4gKiBn bnUvc2VydmljZXMvYmFzZS5zY20gKHVkZXYtaGFyZHdhcmUpOiBOZXcgZnVuY3Rpb24uCj4gKGZp bGUtPnVkZXYtaGFyZHdhcmUpOiBOZXcgZnVuY3Rpb24uCj4gKHVkZXYtaGFyZHdhcmUtc2Vydmlj ZSk6IE5ldyBmdW5jdGlvbi4KPiAodWRldi1ldGMpOiBBZGQgaHdkYi5kIGFuZCBod2RiLmJpbi4K PiAobW9kdWxlKTogRXhwb3J0IHVkZXYtaGFyZHdhcmUsIGZpbGUtPnVkZXYtaGFyZHdhcmUsIGFu ZCB1ZGV2LQo+IGhhcmR3YXJlLXNlcnZpY2UuCj4gKDx1ZGV2LWNvbmZpZ3VyYXRpb24+KTogQWRk IHRoZSBuYXRpdmUtdWRldiBmaWVsZC4KPiAodWRldi1zZXJ2aWNlLXR5cGUpIFtleHRlbmRdOiBQ b3B1bGF0ZSB0aGUgaGFyZHdhcmUgZmllbGQuCj4gKiBkb2MvZ3VpeC50ZXhpIChCYXNlIFNlcnZp Y2VzKVt1ZGV2LXNlcnZpY2UtdHlwZV06IEV4cGxhaW4KPiBjb25maWd1cmF0aW9uIGFuZAo+IGV4 dGVuc2lvbiB2YWx1ZXMuCj4gKiBkb2MvZ3VpeC50ZXhpIChCYXNlIFNlcnZpY2VzKVt1ZGV2LWhh cmR3YXJlXTogRG9jdW1lbnQgaXQuCj4gW3VkZXYtaGFyZHdhcmUtc2VydmljZV06IFNhbWUuCj4g KiBkb2MvZ3VpeC50ZXhpIChCYXNlIFNlcnZpY2VzKVt1ZGV2LWNvbmZpZ3VyYXRpb25dOiBEb2N1 bWVudCB0aGUKPiBuYXRpdmUtdWRldgo+IGZpZWxkLgo+IC0tLQo+IMKgZG9jL2d1aXgudGV4acKg wqDCoMKgwqDCoMKgwqAgfCA1NyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0t LS0KPiDCoGdudS9zZXJ2aWNlcy9iYXNlLnNjbSB8IDYyICsrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrLS0tCj4gLS0KPiDCoDIgZmlsZXMgY2hhbmdlZCwgMTAxIGluc2VydGlv bnMoKyksIDE4IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kb2MvZ3VpeC50ZXhpIGIv ZG9jL2d1aXgudGV4aQo+IGluZGV4IDQ2NTkxYjJmNjQuLmVjMGJkNjg4ZjAgMTAwNjQ0Cj4gLS0t IGEvZG9jL2d1aXgudGV4aQo+ICsrKyBiL2RvYy9ndWl4LnRleGkKPiBAQCAtMTkzMjIsOSArMTkz MjIsMjMgQEAgQmFzZSBTZXJ2aWNlcwo+IMKgQGZpbGV7L2Rldn0gZGlyZWN0b3J5IGR5bmFtaWNh bGx5LCB3aG9zZSB2YWx1ZSBpcyBhCj4gwqBAY29kZXs8dWRldi1jb25maWd1cmF0aW9uPn0gb2Jq ZWN0Lgo+IMKgCj4gLVRoaXMgc2VydmljZSB0eXBlIGNhbiBiZSBAZW1waHtleHRlbmRlZH0gdXNp bmcgcHJvY2VkdXJlcwo+IC1AY29kZXt1ZGV2LXJ1bGVzLXNlcnZpY2V9IGFsb25nIHdpdGggQGNv ZGV7ZmlsZS0+dWRldi1ydWxlfSBvcgo+IC1AY29kZXt1ZGV2LXJ1bGV9IHdoaWNoIHNpbXBsaWZ5 IHRoZSBwcm9jZXNzIG9mIHdyaXRpbmcgdWRldiBydWxlcy4KPiArU2luY2UgdGhlIGZpbGUgbmFt ZXMgZm9yIHVkZXYgcnVsZXMgYW5kIGhhcmR3YXJlIGRlc2NyaXB0aW9uIGZpbGVzCj4gK21hdHRl ciwgdGhlIGNvbmZpZ3VyYXRpb24gaXRlbXMgZm9yIHJ1bGVzIGFuZCBoYXJkd2FyZSBjYW5ub3Qg c2ltcGx5Cj4gYmUKPiArcGxhaW4gZmlsZS1saWtlIG9iamVjdHMgd2l0aCB0aGUgcnVsZXMgY29u dGVudCwgYmVjYXVzZSB0aGUgbmFtZQo+IHdvdWxkCj4gK2JlIGlnbm9yZWQuwqAgSW5zdGVhZCwg dGhleSBhcmUgZGlyZWN0b3J5IGZpbGUtbGlrZSBvYmplY3RzIHRoYXQKPiBjb250YWluCj4gK29w dGlvbmFsIHJ1bGVzIGluIEBmaWxle2xpYi91ZGV2L3J1bGVzLmR9IGFuZCBvcHRpb25hbCBoYXJk d2FyZQo+IGZpbGVzIGluCj4gK0BmaWxle2xpYi91ZGV2L2h3ZGIuZH0uwqAgVGhpcyB3YXksIHRo ZSBzZXJ2aWNlIGNhbiBiZSBjb25maWd1cmVkCj4gd2l0aAo+ICt3aG9sZSBwYWNrYWdlcyBmcm9t IHdoaWNoIHRvIHRha2UgcnVsZXMgYW5kIGh3ZGIgZmlsZXMuCj4gKwo+ICtUaGUgQGNvZGV7dWRl di1zZXJ2aWNlLXR5cGV9IGNhbiBiZSBAZW1waHtleHRlbmRlZH0gd2l0aCBmaWxlLWxpa2UKPiAr ZGlyZWN0b3JpZXMgdGhhdCByZXNwZWN0IHRoaXMgaGllcmFyY2h5LsKgIEZvciBjb252ZW5pZW5j ZSwgdGhlCj4gK0Bjb2Rle3VkZXYtcnVsZX0gYW5kIEBjb2Rle2ZpbGUtPnVkZXYtcnVsZX0gY2Fu IGJlIHVzZWQgdG8gY29uc3RydWN0Cj4gK3VkZXYgcnVsZXMsIHdoaWxlIEBjb2Rle3VkZXYtaGFy ZHdhcmV9IGFuZCBAY29kZXtmaWxlLT51ZGV2LQo+IGhhcmR3YXJlfQo+ICtjYW4gYmUgdXNlZCB0 byBjb25zdHJ1Y3QgaGFyZHdhcmUgZGVzY3JpcHRpb24gZmlsZXMuCj4gKwo+ICtJbiBhbiBAY29k ZXtvcGVyYXRpbmctc3lzdGVtfSBkZWNsYXJhdGlvbiwgdGhpcyBzZXJ2aWNlIHR5cGUgY2FuIGJl Cj4gK0BlbXBoe2V4dGVuZGVkfSB1c2luZyBwcm9jZWR1cmVzIEBjb2Rle3VkZXYtcnVsZXMtc2Vy dmljZX0gYW5kCj4gK0Bjb2Rle3VkZXYtaGFyZHdhcmUtc2VydmljZX0uCj4gwqBAZW5kIGRlZnZh cgo+IMKgCj4gwqBAZGVmdHAge0RhdGEgVHlwZX0gdWRldi1jb25maWd1cmF0aW9uCj4gQEAgLTE5 MzMyLDEwICsxOTM0NiwxNyBAQCBCYXNlIFNlcnZpY2VzCj4gwqAKPiDCoEB0YWJsZSBAYXNpcwo+ IMKgQGl0ZW0gQGNvZGV7dWRldn0gKGRlZmF1bHQ6IEBjb2Rle2V1ZGV2fSkgKHR5cGU6IGZpbGUt bGlrZSkKPiAtUGFja2FnZSBvYmplY3Qgb2YgdGhlIHVkZXYgc2VydmljZS4KPiArUGFja2FnZSBv YmplY3Qgb2YgdGhlIHVkZXYgc2VydmljZS7CoCBUaGlzIHBhY2thZ2UgaXMgdXNlZCBhdCBydW4t Cj4gdGltZSwKPiArd2hlbiBjb21waWxlZCBmb3IgdGhlIHRhcmdldCBzeXN0ZW0uwqAgSW4gb3Jk ZXIgdG8gZ2VuZXJhdGUgdGhlCj4gK0BmaWxle2h3ZGIuYmlufSBoYXJkd2FyZSBpbmRleCwgaXQg aXMgYWxzbyB1c2VkIHdoZW4gZ2VuZXJhdGluZyB0aGUKPiArc3lzdGVtIGRlZmluaXRpb24sIGNv bXBpbGVkIGZvciB0aGUgY3VycmVudCBzeXN0ZW0uCj4gwqAKPiDCoEBpdGVtIEBjb2Rle3J1bGVz fSAoZGVmYXVsdDogQHZhcnsnKCl9KSAodHlwZTogbGlzdC1vZi1maWxlLWxpa2UpCj4gLUxpc3Qg b2YgZmlsZS1saWtlIG9iamVjdHMgZGVub3RpbmcgdWRldi1ydWxlIGZpbGVzLgo+ICtMaXN0IG9m IGZpbGUtbGlrZSBvYmplY3RzIGRlbm90aW5nIHVkZXYgcnVsZSBmaWxlcyB1bmRlciBhIHN1Yi0K PiBkaXJlY3RvcnkuCj4gKwo+ICtAaXRlbSBAY29kZXtoYXJkd2FyZX0gKGRlZmF1bHQ6IEB2YXJ7 JygpfSkgKHR5cGU6IGxpc3Qtb2YtZmlsZS1saWtlKQo+ICtMaXN0IG9mIGZpbGUtbGlrZSBvYmpl Y3RzIGRlbm90aW5nIHVkZXYgaGFyZHdhcmUgZGVzY3JpcHRpb24gZmlsZXMKPiB1bmRlcgo+ICth IHN1Yi1kaXJlY3RvcnkuCj4gwqAKPiDCoEBlbmQgdGFibGUKPiDCoEBlbmQgZGVmdHAKPiBAQCAt MTkzNTgsNiArMTkzNzksMTEgQEAgQmFzZSBTZXJ2aWNlcwo+IMKgQGVuZCBsaXNwCj4gwqBAZW5k IGRlZmZuCj4gwqAKPiArQGRlZmZuIHtQcm9jZWR1cmV9IHVkZXYtaGFyZHdhcmUgQHZhcntmaWxl LW5hbWV9IEB2YXJ7Y29udGVudHN9Cj4gK1JldHVybiBhIHVkZXYgaGFyZHdhcmUgZGVzY3JpcHRp b24gZmlsZSBuYW1lZCBAdmFye2ZpbGUtbmFtZX0KPiBjb250YWluaW5nCj4gK3RoZSBoYXJkd2Fy ZSBpbmZvcm1hdGlvbiBAdmFye2NvbnRlbnRzfS4KPiArQGVuZCBkZWZmbgo+ICsKPiDCoEBkZWZm biB7UHJvY2VkdXJlfSB1ZGV2LXJ1bGVzLXNlcnZpY2UgQHZhcntuYW1lfSBAdmFye3J1bGVzfQo+ IFsjOmdyb3VwcyAnKCldCj4gwqBSZXR1cm4gYSBzZXJ2aWNlIHRoYXQgZXh0ZW5kcyBAY29kZXt1 ZGV2LXNlcnZpY2UtdHlwZX0gd2l0aAo+IEB2YXJ7cnVsZXN9Cj4gwqBhbmQgQGNvZGV7YWNjb3Vu dC1zZXJ2aWNlLXR5cGV9IHdpdGggQHZhcntncm91cHN9IGFzIHN5c3RlbSBncm91cHMuCj4gQEAg LTE5Mzc3LDYgKzE5NDAzLDExIEBAIEJhc2UgU2VydmljZXMKPiDCoEBlbmQgbGlzcAo+IMKgQGVu ZCBkZWZmbgo+IMKgCj4gK0BkZWZmbiB7UHJvY2VkdXJlfSB1ZGV2LWhhcmR3YXJlLXNlcnZpY2Ug QHZhcntuYW1lfSBAdmFye2hhcmR3YXJlfQo+ICtSZXR1cm4gYSBzZXJ2aWNlIHRoYXQgZXh0ZW5k cyBAY29kZXt1ZGV2LXNlcnZpY2UtdHlwZX0gd2l0aAo+ICtAdmFye2hhcmR3YXJlfS7CoCBUaGUg c2VydmljZSBuYW1lIGlzIEBjb2Rle0B2YXJ7bmFtZX0tdWRldi0KPiBoYXJkd2FyZX0uCj4gK0Bl bmQgZGVmZm4KPiArCj4gwqBAZGVmZm4ge1Byb2NlZHVyZX0gZmlsZS0+dWRldi1ydWxlIEB2YXJ7 ZmlsZS1uYW1lfSBAdmFye2ZpbGV9Cj4gwqBSZXR1cm4gYSB1ZGV2LXJ1bGUgZmlsZSBuYW1lZCBA dmFye2ZpbGUtbmFtZX0gY29udGFpbmluZyB0aGUgcnVsZXMKPiDCoGRlZmluZWQgd2l0aGluIEB2 YXJ7ZmlsZX0sIGEgZmlsZS1saWtlIG9iamVjdC4KPiBAQCAtMTk0MDEsMTIgKzE5NDMyLDE2IEBA IEJhc2UgU2VydmljZXMKPiDCoEBlbmQgbGlzcAo+IMKgQGVuZCBkZWZmbgo+IMKgCj4gLUFkZGl0 aW9uYWxseSwgR3VpeCBwYWNrYWdlIGRlZmluaXRpb25zIGNhbiBiZSBpbmNsdWRlZCBpbgo+IEB2 YXJ7cnVsZXN9IGluCj4gLW9yZGVyIHRvIGV4dGVuZCB0aGUgdWRldiBydWxlcyB3aXRoIHRoZSBk ZWZpbml0aW9ucyBmb3VuZCB1bmRlcgo+IHRoZWlyCj4gLUBmaWxle2xpYi91ZGV2L3J1bGVzLmR9 IHN1Yi1kaXJlY3RvcnkuwqAgSW4gbGlldSBvZiB0aGUgcHJldmlvdXMKPiAtQHZhcntmaWxlLT51 ZGV2LXJ1bGV9IGV4YW1wbGUsIHdlIGNvdWxkIGhhdmUgdXNlZCB0aGUKPiAtQHZhcnthbmRyb2lk LXVkZXYtcnVsZXN9IHBhY2thZ2Ugd2hpY2ggZXhpc3RzIGluIEd1aXggaW4gdGhlCj4gQGNvZGV7 KGdudQo+IC1wYWNrYWdlcyBhbmRyb2lkKX0gbW9kdWxlLgo+ICtTaW5jZSBndWl4IHBhY2thZ2Ug ZGVmaW5pdGlvbnMgY2FuIGJlIGluY2x1ZGVkIGluIEB2YXJ7cnVsZXN9IGluCj4gb3JkZXIKPiAr dG8gdXNlIGFsbCB0aGVpciBydWxlcyB1bmRlciB0aGUgQGZpbGV7bGliL3VkZXYvcnVsZXMuZH0g c3ViLQo+IGRpcmVjdG9yeSwKPiArdGhlbiBpbiBsaWV1IG9mIHRoZSBwcmV2aW91cyBAdmFye2Zp bGUtPnVkZXYtcnVsZX0gZXhhbXBsZSwgd2UgY291bGQKPiAraGF2ZSB1c2VkIHRoZSBAdmFye2Fu ZHJvaWQtdWRldi1ydWxlc30gcGFja2FnZSB3aGljaCBleGlzdHMgaW4gR3VpeAo+IGluCj4gK3Ro ZSBAY29kZXsoZ251IHBhY2thZ2VzIGFuZHJvaWQpfSBtb2R1bGUuCj4gKwo+ICtAZGVmZm4ge1By b2NlZHVyZX0gZmlsZS0+dWRldi1oYXJkd2FyZSBAdmFye2ZpbGUtbmFtZX0gQHZhcntmaWxlfQo+ ICtSZXR1cm4gYSB1ZGV2IGhhcmR3YXJlIGRlc2NyaXB0aW9uIGZpbGUgbmFtZWQgQHZhcntmaWxl LW5hbWV9Cj4gY29udGFpbmluZwo+ICt0aGUgcnVsZXMgZGVmaW5lZCB3aXRoaW4gQHZhcntmaWxl fSwgYSBmaWxlLWxpa2Ugb2JqZWN0Lgo+ICtAZW5kIGRlZmZuCj4gwqAKPiDCoFRoZSBmb2xsb3dp bmcgZXhhbXBsZSBzaG93cyBob3cgdG8gdXNlIHRoZSBAdmFye2FuZHJvaWQtdWRldi1ydWxlc30K PiDCoHBhY2thZ2Ugc28gdGhhdCB0aGUgQW5kcm9pZCB0b29sIEBjb21tYW5ke2FkYn0gY2FuIGRl dGVjdCBkZXZpY2VzCj4gZGlmZiAtLWdpdCBhL2dudS9zZXJ2aWNlcy9iYXNlLnNjbSBiL2dudS9z ZXJ2aWNlcy9iYXNlLnNjbQo+IGluZGV4IDBiZjA1NjhhNGUuLjBjYTdmMmFmNGEgMTAwNjQ0Cj4g LS0tIGEvZ251L3NlcnZpY2VzL2Jhc2Uuc2NtCj4gKysrIGIvZ251L3NlcnZpY2VzL2Jhc2Uuc2Nt Cj4gQEAgLTgxLDYgKzgxLDcgQEAgKGRlZmluZS1tb2R1bGUgKGdudSBzZXJ2aWNlcyBiYXNlKQo+ IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICM6c2VsZWN0IChtb3VudC1mbGFncy0+ Yml0LW1hc2sKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgIHN3YXAtc3BhY2UtPmZsYWdzLWJpdC1tYXNrKSkKPiDCoMKgICM6dXNlLW1vZHVsZSAo Z3VpeCBnZXhwKQo+ICvCoCAjOnVzZS1tb2R1bGUgKChndWl4IHBhY2thZ2VzKSAjOnNlbGVjdCAo cGFja2FnZS12ZXJzaW9uKSkKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ3VpeCByZWNvcmRzKQo+IMKg wqAgIzp1c2UtbW9kdWxlIChndWl4IG1vZHVsZXMpCj4gwqDCoCAjOnVzZS1tb2R1bGUgKGd1aXgg cGtpKQo+IEBAIC0xNTAsMTEgKzE1MSwxNSBAQCAoZGVmaW5lLW1vZHVsZSAoZ251IHNlcnZpY2Vz IGJhc2UpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIHVkZXYtY29uZmlndXJhdGlvbgo+IMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoCB1ZGV2LWNvbmZpZ3VyYXRpb24/Cj4gwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgIHVkZXYtY29uZmlndXJhdGlvbi1ydWxlcwo+ICvCoMKgwqDCoMKgwqDCoMKg wqDCoMKgIHVkZXYtY29uZmlndXJhdGlvbi1oYXJkd2FyZQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoCB1ZGV2LXNlcnZpY2UtdHlwZQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCB1ZGV2LXNl cnZpY2XCoCA7IGRlcHJlY2F0ZWQKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgdWRldi1ydWxl Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqAgdWRldi1oYXJkd2FyZQo+IMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCBmaWxlLT51ZGV2LXJ1bGUKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBmaWxl LT51ZGV2LWhhcmR3YXJlCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIHVkZXYtcnVsZXMtc2Vy dmljZQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIHVkZXYtaGFyZHdhcmUtc2VydmljZQo+IMKg Cj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGxvZ2luLWNvbmZpZ3VyYXRpb24KPiDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgbG9naW4tY29uZmlndXJhdGlvbj8KPiBAQCAtMjE4MSw4ICsyMTg2 LDEwIEBAIChkZWZpbmUtcmVjb3JkLXR5cGUqIDx1ZGV2LWNvbmZpZ3VyYXRpb24+Cj4gwqDCoCB1 ZGV2LWNvbmZpZ3VyYXRpb24/Cj4gwqDCoCAodWRldsKgwqAgdWRldi1jb25maWd1cmF0aW9uLXVk ZXbCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7ZmlsZS1saWtlCj4gwqDCoMKgwqDC oMKgwqDCoMKgwqAgKGRlZmF1bHQgZXVkZXYpKQo+IC3CoCAocnVsZXPCoCB1ZGV2LWNvbmZpZ3Vy YXRpb24tcnVsZXPCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgO2xpc3Qgb2YgZmlsZS1s aWtlCj4gLcKgwqDCoMKgwqDCoMKgwqDCoCAoZGVmYXVsdCAnKCkpKSkKPiArwqAgKHJ1bGVzwqAg dWRldi1jb25maWd1cmF0aW9uLXJ1bGVzwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDtw YWNrYWdlLWxpa2UKPiBmaWxlLWxpa2UKPiArwqDCoMKgwqDCoMKgwqDCoMKgIChkZWZhdWx0ICco KSkpCj4gK8KgIChoYXJkd2FyZcKgIHVkZXYtY29uZmlndXJhdGlvbi1oYXJkd2FyZcKgwqDCoMKg wqDCoMKgwqDCoCA7cGFja2FnZS1saWtlCj4gZmlsZS1saWtlCj4gK8KgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCAoZGVmYXVsdCAnKCkpKSkKbGlzdCBvZiBmaWxlLWxpa2UgZm9yIGJvdGgKCj4gwqAK PiDCoChkZWZpbmUgKHVkZXYtY29uZmlndXJhdGlvbnMtdW5pb24gc3ViZGlyZWN0b3J5IHBhY2th Z2VzKQo+IMKgwqAgIlJldHVybiB0aGUgdW5pb24gb2YgdGhlIGxpYi91ZGV2L1NVQkRJUkVDVE9S WS5kIGRpcmVjdG9yaWVzIGZvdW5kCj4gaW4gZWFjaAo+IEBAIC0yMjI0LDYgKzIyMzEsMTAgQEAg KGRlZmluZSAodWRldi1ydWxlIGZpbGUtbmFtZSBjb250ZW50cykKPiDCoMKgICJSZXR1cm4gYSBk aXJlY3Rvcnkgd2l0aCBhIHVkZXYgcnVsZSBmaWxlIEZJTEUtTkFNRSBjb250YWluaW5nCj4gQ09O VEVOVFMuIgo+IMKgwqAgKHVkZXYtY29uZmlndXJhdGlvbi1maWxlICJydWxlcyIgZmlsZS1uYW1l IGNvbnRlbnRzKSkKPiDCoAo+ICsoZGVmaW5lICh1ZGV2LWhhcmR3YXJlIGZpbGUtbmFtZSBjb250 ZW50cykKPiArwqAgIlJldHVybiBhIGRpcmVjdG9yeSB3aXRoIGEgdWRldiBoYXJkd2FyZSBmaWxl IEZJTEUtTkFNRSBjb250YWluaW5nCj4gQ09OVEVOVFMuIgo+ICvCoCAodWRldi1jb25maWd1cmF0 aW9uLWZpbGUgImh3ZGIiIGZpbGUtbmFtZSBjb250ZW50cykpCj4gKwo+IMKgKGRlZmluZSAoZmls ZS0+dWRldi1jb25maWd1cmF0aW9uLWZpbGUgc3ViZGlyZWN0b3J5IGZpbGUtbmFtZSBmaWxlKQo+ IMKgwqAgIlJldHVybiBhIGRpcmVjdG9yeSB3aXRoIGEgdWRldiBjb25maWd1cmF0aW9uIGZpbGUg RklMRS1OQU1FIHdoaWNoCj4gaXMgYSBjb3B5Cj4gwqAgb2YgRklMRS4iCj4gQEAgLTIyNDgsNiAr MjI1OSwxMCBAQCAoZGVmaW5lIChmaWxlLT51ZGV2LXJ1bGUgZmlsZS1uYW1lIGZpbGUpCj4gwqDC oCAiUmV0dXJuIGEgZGlyZWN0b3J5IHdpdGggYSB1ZGV2IHJ1bGUgZmlsZSBGSUxFLU5BTUUgd2hp Y2ggaXMgYQo+IGNvcHkgb2YgRklMRS4iCj4gwqDCoCAoZmlsZS0+dWRldi1jb25maWd1cmF0aW9u LWZpbGUgInJ1bGVzIiBmaWxlLW5hbWUgZmlsZSkpCj4gwqAKPiArKGRlZmluZSAoZmlsZS0+dWRl di1oYXJkd2FyZSBmaWxlLW5hbWUgZmlsZSkKPiArwqAgIlJldHVybiBhIGRpcmVjdG9yeSB3aXRo IGEgdWRldiBoYXJkd2FyZSBmaWxlIEZJTEUtTkFNRSB3aGljaCBpcyBhCj4gY29weSBvZiBGSUxF LiIKPiArwqAgKGZpbGUtPnVkZXYtY29uZmlndXJhdGlvbi1maWxlICJod2RiIiBmaWxlLW5hbWUg ZmlsZSkpCj4gKwo+IMKgKGRlZmluZSBrdm0tdWRldi1ydWxlCj4gwqDCoCA7OyBSZXR1cm4gYSBk aXJlY3Rvcnkgd2l0aCBhIHVkZXYgcnVsZSB0aGF0IGNoYW5nZXMgdGhlIGdyb3VwIG9mCj4gL2Rl di9rdm0gdG8KPiDCoMKgIDs7ICJrdm0iIGFuZCBtYWtlcyBpdCAjbzY2MC7CoCBBcHBhcmVudGx5 IFFFTVUtS1ZNIHVzZWQgdG8gc2hpcAo+IHRoaXMgcnVsZSwKPiBAQCAtMjM1NSwxMyArMjM3MCwz MCBAQCAoZGVmaW5lIHVkZXYuY29uZgo+IMKgCj4gwqAoZGVmaW5lICh1ZGV2LWV0YyBjb25maWcp Cj4gwqDCoCAobWF0Y2gtcmVjb3JkIGNvbmZpZyA8dWRldi1jb25maWd1cmF0aW9uPgo+IC3CoMKg wqAgKHVkZXYgcnVsZXMpCj4gK8KgwqDCoCAodWRldiBydWxlcyBoYXJkd2FyZSkKPiArwqDCoMKg IChsZXQqICgoaHdkYi5kCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHVkZXYtY29uZmlndXJh dGlvbnMtdW5pb24gImh3ZGIiIChjb25zKiB1ZGV2Cj4gaGFyZHdhcmUpKSkKPiArwqDCoMKgwqDC oMKgwqDCoMKgwqAgKGh3ZGIuYmluCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGNvbXB1dGVk LWZpbGUKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJod2RiLmJpbiIKPiArwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgICh3aXRoLWltcG9ydGVkLW1vZHVsZXMgJygoZ3VpeCBidWlsZCB1dGls cykpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgI34oYmVnaW4KPiArwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICh1c2UtbW9kdWxlcyAoZ3VpeCBidWlsZCB1dGls cykpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc2V0ZW52ICJVREVW X0hXREJfUEFUSCIgIyRod2RiLmQpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoCAoaW52b2tlICMrKGZpbGUtYXBwZW5kIHVkZXYgIi9iaW4vdWRldmFkbSIpCj4gK8KgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgImh3ZGIiCj4g K8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgIi0t dXBkYXRlIgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgICItbyIgIyRvdXRwdXQpKSkpKSkKPiDCoMKgwqDCoCBgKCgidWRldiIKPiDCoMKgwqDC oMKgwqDCoCAsKGZpbGUtdW5pb24gInVkZXYiCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCBgKCgidWRldi5jb25mIiAsdWRldi5jb25mKQo+IMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICgicnVsZXMuZCIKPiDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICwodWRldi1ydWxlcy11bmlvbiAoY29u cyogdWRldiBrdm0tdWRldi1ydWxlCj4gLcKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCBydWxlcykpKSkpKSkpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgcnVsZXMpKSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgICgiaHdkYi5kIiAsaHdkYi5kKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgLEAoaWYgaHdkYi5iaW4KPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGAoKCJod2RiLmJpbiIgLGh3ZGIuYmluKSkK PiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg ICcoKSkpKSkpKSkpCkRvIHdlIG5lZWQgdG8ga2VlcCBod2RiLmQgd2l0aCBod2RiLmJpbiBvciBp cyB0aGF0IGR1cGxpY2F0ZWQgaW5mbz8KPiDCoAo+IMKgKGRlZmluZSB1ZGV2LXNlcnZpY2UtdHlw ZQo+IMKgwqAgKHNlcnZpY2UtdHlwZSAobmFtZSAndWRldikKPiBAQCAtMjM3MCwxMiArMjQwMiwx NSBAQCAoZGVmaW5lIHVkZXYtc2VydmljZS10eXBlCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgIHVkZXYtc2hlcGhlcmQtc2VydmljZSkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgIChzZXJ2aWNlLWV4dGVuc2lvbiBldGMtc2VydmljZS10eXBlIHVk ZXYtCj4gZXRjKSkpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGNvbXBvc2Ug Y29uY2F0ZW5hdGUpwqDCoMKgwqDCoMKgwqDCoMKgwqAgO2NvbmNhdGVuYXRlIHRoZQo+IGxpc3Qg b2YgcnVsZXMKPiAtwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChleHRlbmQgKGxhbWJk YSAoY29uZmlnIHJ1bGVzKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGV4dGVu ZCAobGFtYmRhIChjb25maWcgZXh0ZW5zaW9ucykKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChsZXQgKChpbml0aWFsLXJ1bGVzCj4gLcKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAgKHVkZXYtY29uZmlndXJhdGlvbi1ydWxlcyBjb25maWcpKSkKPiArwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAodWRldi1j b25maWd1cmF0aW9uLXJ1bGVzIGNvbmZpZykpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChpbml0aWFsLWhhcmR3YXJlCj4g K8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgKHVkZXYtY29uZmlndXJhdGlvbi1oYXJkd2FyZQo+IGNvbmZpZykpKQo+IMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICh1ZGV2 LWNvbmZpZ3VyYXRpb24KPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgIChpbmhlcml0IGNvbmZpZykKPiAtwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHJ1bGVzIChhcHBlbmQgaW5p dGlhbC1ydWxlcwo+IHJ1bGVzKSkpKSkpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChydWxlcyAoYXBwZW5kIGluaXRpYWwtcnVsZXMK PiBleHRlbnNpb25zKSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgKGhhcmR3YXJlIChhcHBlbmQgaW5pdGlhbC1oYXJkd2FyZQo+IGV4 dGVuc2lvbnMpKSkpKSkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoZGVmYXVs dC12YWx1ZSAodWRldi1jb25maWd1cmF0aW9uKSkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCAoZGVzY3JpcHRpb24KPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg ICJSdW4gQGNvbW1hbmR7dWRldn0sIHdoaWNoIHBvcHVsYXRlcyB0aGUKPiBAZmlsZXsvZGV2fQo+ IEBAIC0yNDEwLDYgKzI0NDUsMTkgQEAgKGRlZmluZSogKHVkZXYtcnVsZXMtc2VydmljZSBuYW1l IHJ1bGVzICM6a2V5Cj4gKGdyb3VwcyAnKCkpKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgIChkZXNjcmlwdGlvbiAiVGhpcyBzZXJ2aWNlIGFkZHMgdWRldiBydWxlcy4iKSkpKQo+ IMKgwqDCoMKgIChzZXJ2aWNlIHR5cGUgI2YpKSkKPiDCoAo+ICsoZGVmaW5lICh1ZGV2LWhhcmR3 YXJlLXNlcnZpY2UgbmFtZSBoYXJkd2FyZS1maWxlcykKPiArwqAgIlJldHVybiBhIHNlcnZpY2Ug dGhhdCBleHRlbmRzIHVkZXYtc2VydmljZS10eXBlIHdpdGggSEFSRFdBUkUtCj4gRklMRVMsIG5h bWVkCj4gK05BTUUtdWRldi1oYXJkd2FyZS4iCj4gK8KgIChsZXQqICgobmFtZSAoc3ltYm9sLWFw cGVuZCBuYW1lICctdWRldi1oYXJkd2FyZSkpCj4gK8KgwqDCoMKgwqDCoMKgwqAgKHVkZXYtZXh0 ZW5zaW9uIChjb25zdCAobGlzdCBoYXJkd2FyZS1maWxlcykpKQo+ICvCoMKgwqDCoMKgwqDCoMKg ICh0eXBlIChzZXJ2aWNlLXR5cGUKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChu YW1lIG5hbWUpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoZXh0ZW5zaW9ucyAo bGlzdAo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCAoc2VydmljZS1leHRlbnNpb24KPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCB1ZGV2LXNlcnZpY2UtdHlwZSB1ZGV2LWV4 dGVuc2lvbikpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGRlc2NyaXB0aW9u ICJUaGlzIHNlcnZpY2UgYWRkcyB1ZGV2IGhhcmR3YXJlCj4gZmlsZXMuIikpKSkKPiArwqDCoMKg IChzZXJ2aWNlIHR5cGUgI2YpKSkKPiArCj4gwqAoZGVmaW5lIChzd2FwLXNwYWNlLT5zaGVwaGVy ZC1zZXJ2aWNlLW5hbWUgc3BhY2UpCj4gwqDCoCAobGV0ICgodGFyZ2V0IChzd2FwLXNwYWNlLXRh cmdldCBzcGFjZSkpKQo+IMKgwqDCoMKgIChzeW1ib2wtYXBwZW5kICdzd2FwLQoK From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 06 14:48:51 2023 Received: (at 66099) by debbugs.gnu.org; 6 Oct 2023 18:48:51 +0000 Received: from localhost ([127.0.0.1]:52678 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qopsY-0002jj-W1 for submit@debbugs.gnu.org; Fri, 06 Oct 2023 14:48:51 -0400 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]:50298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qopsX-0002iw-7H for 66099@debbugs.gnu.org; Fri, 06 Oct 2023 14:48:49 -0400 Received: by mail-ej1-x641.google.com with SMTP id a640c23a62f3a-9b1ebc80d0aso431655966b.0 for <66099@debbugs.gnu.org>; Fri, 06 Oct 2023 11:48:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696618104; x=1697222904; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=x4Y+L73TkdSx/zy+qG6ILs02cL5fmsnatMpsdOU9uRM=; b=KxYkDkRhSTh0IR0gUxO1Mw8sGxFeYuBJcYTpfjBxdu466M+/dzg82J/T2PoXcM1JPA TIHhwIB3HV3JZVswRcJGc0LczJ5dmc5gziVnX7Yq+lIB57s2CpTA5f+B6YrIkb0RjzoU KA0iPx/idp0ukvjm3aSoNtlg0OJLw/QIVc/2fdtabnu2SaPvuKaM5Hxi3mawW0TDudXg 9zUdtz4yg9zl1VfZ+K9ZtdTO8/j7+NT5MHDGfo2ufme/46TImyiMOMtF5ekgrjfS4Tlf sAbqG7uflT0l/mr+STl6sZn+yIlGxMKRr2+QQgzkR6te+nVlCtUQfikOjxYrts6kCgrU naYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696618104; x=1697222904; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=x4Y+L73TkdSx/zy+qG6ILs02cL5fmsnatMpsdOU9uRM=; b=mZ89Yml2W3mnpduUPl7uIfTyrFKrzGcMmfgUcUMSHrJPIpf1kwvU9xcdE5KHuHMwOw AXcNgtNN6u/eWLAsiAG+QAvrImSs93XUs/up+O1kulUGFwgwE1gLs8KHbMOHlIrJCFrs 6KwvUEIsLB9v5Cdu5M9Z5x6Hv6OrSTBigL+E3as/mQ/le6O2Sdy5awvLTkjL0K9+z111 bCifpyzslBoUL2j7isl4twby5nZv/oROBKg4ivf5S5uyCJYVJ9RwsoixQ3wFrvoMcYGU w2CJ6t7A+WjXipooH468svqkkfGPLGyktzcjlaEmSK6PKhExz/BANpnJ5jD5n1P9e52W 6N9w== X-Gm-Message-State: AOJu0YzocrEoRjBvx9pJqcfhH1rxkFi38SLbo/JGC1Z3l/BgF8F8Engd tzNmuh5INIA84+PwlU4k4FgslWUqY6fzWg== X-Google-Smtp-Source: AGHT+IFsK8oFzJeI5cc08tBtWYnNmNDTezkAEaUFltk683ZOY7EOaQft1ts0SbQ0IMGlJCV++h9yjg== X-Received: by 2002:a17:907:75e5:b0:9a5:852f:10ae with SMTP id jz5-20020a17090775e500b009a5852f10aemr7835420ejc.60.1696618104241; Fri, 06 Oct 2023 11:48:24 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id dc4-20020a170906c7c400b0098e34446464sm3292224ejb.25.2023.10.06.11.48.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 11:48:22 -0700 (PDT) Message-ID: <34cc0e2a780cca469d65222421e17f85414df8b2.camel@gmail.com> Subject: Re: [PATCH gnome-team v8 6/6] gnu: upower: Update to 1.90.2. From: Liliana Marie Prikler To: Vivien Kraus , Maxim Cournoyer , 66099@debbugs.gnu.org Date: Fri, 06 Oct 2023 20:48:21 +0200 In-Reply-To: References: <0825bf42daa34ee464c5237b04ad6bf90942e489.camel@gmail.com> , ,<1a1089275d13e02b4485c5de6e908ece88f5d2b6.camel@gmail.com> <87y1ghryel.fsf@gmail.com>,<87pm1try6q.fsf@gmail.com> ,<87lechrvhl.fsf@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Dienstag, dem 19.09.2023 um 13:32 +0200 schrieb Vivien Kraus: > The new eudev now can install hwdb files. Upower has some, but they > should get installed in upower=E2=80=99s output, not eudev=E2=80=99s. Gratuitous information. > The phases needed a rework. Now the 32-bit-specific test fix is > always there, except it may be empty. Also gratuitous info, but only because it doesn't explain why. =C2=A0 =E3=81=A0=E3=81=8B=E3=82=89=E3=81=A9=E3=81=86=E3=81=97=E3=81=A6=EF=BC=9F > test_bluetooth_hidpp_mouse fails, after calling into a bluez dbus > method. >=20 > * gnu/packages/gnome.scm (upower): Update to 1.90.2. > [#:configure-flags]: Set udevhwdbdir. > [#:phases] : Add this phase > unconditionnally > : Disable test_bluetooth_hidpp_mouse. > [inputs]: Remove dbus-glib. > [native-inputs]: Add dbus. > --- Otherwise LGTM. From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 07 10:45:41 2023 Received: (at 66099) by debbugs.gnu.org; 7 Oct 2023 14:45:41 +0000 Received: from localhost ([127.0.0.1]:55626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qp8Yn-0005d8-99 for submit@debbugs.gnu.org; Sat, 07 Oct 2023 10:45:41 -0400 Received: from mail-qk1-x735.google.com ([2607:f8b0:4864:20::735]:44058) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qp8Ym-0005cr-2P for 66099@debbugs.gnu.org; Sat, 07 Oct 2023 10:45:40 -0400 Received: by mail-qk1-x735.google.com with SMTP id af79cd13be357-77386822cfbso205573585a.0 for <66099@debbugs.gnu.org>; Sat, 07 Oct 2023 07:45:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696689915; x=1697294715; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=yPhO+IeTfDjsIvlzXSNxLjUH3sENbGzeMwjXFrvZtC8=; b=NvobHeuPCr2IL74nUcOnSBFhsp4o1aKoHXoTc28iT5Y+ySG/yUIn6U3lTzuiwr0zvL 7Ag9BrB+j4gg+fAWZpcgNbqftW4LwOXszNGe8pmVAqch+Aq09MDvy/FM1Xg5P7ImH9NU 60Ptn5MAXix0evd5bqGYdTo0xH2kMbV3x4C5nxdfetxB5ZztYKUEfu1ddDXKlKOGVkXj Wu4DFiRHAR7ic9iLscv6j+9tQBpdT8BF/b22PLPlv60cf3knv8I3lgqpatCDsAZViNk1 CAHEeoZtA1OcBkIyTa/jG3Uie+ybMERBK/YnSA7iYUkNNNZga+iABDB1d9STYLawV8u6 VMCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696689915; x=1697294715; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=yPhO+IeTfDjsIvlzXSNxLjUH3sENbGzeMwjXFrvZtC8=; b=t866gBimON6cUJ3o9A9ioY9Styl1R/B1Nc/ho5wS3DPg6WOXS4SvZ8/ZdVJcqbxBNS CWEr7/aih5z+GE8/RCz/6q2SwB+CHcpcSYrCGl8Ef/Gm6MZlW/Dde+gAXL07wk/5Fq4t fZCAw7dinDEGmpPjBPePlH/HJxKYe+1sCYlFIJuwARVoGoMxiTrL43RDWRgc24k+Zg3d UXZYZVg0OQBh12k5eBzUFelyfqh+apfdAsD3w0qnbgX8WT6bFQw3aixJx284oAy2bbNq 31za29eMCGvDkYOh5pKcg/BT22rS4b+p+mIXJyISKgboCeIhL313nFsUXmYEu4xWWhbD 6uuA== X-Gm-Message-State: AOJu0Yy5lv6+RrPlpwlf/9z7IdzO2CqGUwWDCl1ChI3Yz+6C8hQrbAgs oQzZlP/Zw+lIgnQGfQJeoUYpvO1Y+dI= X-Google-Smtp-Source: AGHT+IFJ9Wuwu9itxdN6+KBD0TcmEYryZpvtSPU7HZvt/IldULcLqur9gpzfQLPTuyCsbSSGbltNQQ== X-Received: by 2002:ae9:e90e:0:b0:775:7703:ace5 with SMTP id x14-20020ae9e90e000000b007757703ace5mr10414576qkf.56.1696689914812; Sat, 07 Oct 2023 07:45:14 -0700 (PDT) Received: from hurd (dsl-158-21.b2b2c.ca. [66.158.158.21]) by smtp.gmail.com with ESMTPSA id vv8-20020a05620a562800b007676f3859fasm2132846qkn.30.2023.10.07.07.45.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Oct 2023 07:45:14 -0700 (PDT) From: Maxim Cournoyer To: Vivien Kraus Subject: Re: [PATCH gnome-team v8 3/6] services: udev: Make udev-rule helper functions generic. In-Reply-To: <1e9635cac8aa08da17be6f1270552e3f4dfbdd40.1696610746.git.vivien@planete-kraus.eu> (Vivien Kraus's message of "Thu, 5 Oct 2023 19:24:56 +0200") References: <0825bf42daa34ee464c5237b04ad6bf90942e489.camel@gmail.com> <1a1089275d13e02b4485c5de6e908ece88f5d2b6.camel@gmail.com> <87y1ghryel.fsf@gmail.com> <87pm1try6q.fsf@gmail.com> <87lechrvhl.fsf@gmail.com> <1e9635cac8aa08da17be6f1270552e3f4dfbdd40.1696610746.git.vivien@planete-kraus.eu> Date: Sat, 07 Oct 2023 10:45:13 -0400 Message-ID: <87ttr2ij9i.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: 66099@debbugs.gnu.org, Liliana Marie Prikler , rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Vivien Kraus writes: [...] > - (define rules.d > - (string-append #$output "/lib/udev/rules.d")) > + (define conf.d > + (string-append #$output > + "/lib/udev/" > + #$subdirectory > + ".d")) > > (define file-copy-dest > - (string-append rules.d "/" #$file-name)) > + (string-append conf.d "/" #$file-name)) > > - (mkdir-p rules.d) > + (mkdir-p conf.d) Since conf.d doesn't map to a directory of the same name, I'd use something more abstract like config-directory or similar. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 08 06:56:53 2023 Received: (at 66099) by debbugs.gnu.org; 8 Oct 2023 10:56:53 +0000 Received: from localhost ([127.0.0.1]:56368 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpRSu-000417-RT for submit@debbugs.gnu.org; Sun, 08 Oct 2023 06:56:53 -0400 Received: from planete-kraus.eu ([89.234.140.182]:58228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpRSs-00040x-LJ for 66099@debbugs.gnu.org; Sun, 08 Oct 2023 06:56:51 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 356700a8; Sun, 8 Oct 2023 10:56:28 +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:mime-version :content-type:content-transfer-encoding:to:cc; s=albinoniB; bh=q ZPTHh6Vgdm4wK95wo+cT+sAXp0=; b=NpUocKmxmUl0WA3aMt4dAqgsgb7j0oPK/ RGkkIhteHlYe4crWTDviDgFXa91US/y9x04MN+8V8FbYHRTfc0mUegUPdVAnLcMs 0lqZNBde5qhHBmXpfT8/F4LDtKQMc/djA2zvnhNjpifNRQFcdTmi71rqWgSB+doQ bLlH7d/w9pU0g9fJwQiapYOn+jkk4F5OK0Uc9Ls58eqBLviGqZHyJAdmj0yAvTYZ l2T37V/tVId8VSm8Oy0i/FJuQMxcBZeWaAa/UiiYiils5xl70Rjmlcc4RnaHU1UC g573WKUvKAewNrsS/PfVqaO1lk5zvyvuk755smCT0mTi5wn24VHzg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 11f782f2 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 8 Oct 2023 10:56:27 +0000 (UTC) Message-ID: In-Reply-To: , <10e334a07e0d45ff7bce0a18b56fd68f13ad2ce8.camel@gmail.com>, <9dcb22311514913d7b0fe41fd957e24423b8fa9b.camel@gmail.com>, <34cc0e2a780cca469d65222421e17f85414df8b2.camel@gmail.com>, <87ttr2ij9i.fsf@gmail.com> References: ,<10e334a07e0d45ff7bce0a18b56fd68f13ad2ce8.camel@gmail.com> ,<9dcb22311514913d7b0fe41fd957e24423b8fa9b.camel@gmail.com> ,<34cc0e2a780cca469d65222421e17f85414df8b2.camel@gmail.com> ,<87ttr2ij9i.fsf@gmail.com> From: Vivien Kraus Date: Sun, 8 Oct 2023 12:49:29 +0200 Subject: [PATCH gnome-team v9 0/7] Update eudev, upower, udev-service-type, with /lib/udev/hardware MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: Liliana Marie Prikler ,Maxim Cournoyer ,66099@debbugs.gnu.org User-Agent: Evolution 3.46.4 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Dear guix, I find it surprising that we should rename /lib/udev/hwdb.d to /lib/udev/hardware, but the impact is minimal (udevadm on Guix for the udev-service-type relies only on UDEV_HWDB_PATH, which can accept /hardware easily), and you insist, so, let’s do that. I changed the installation directories for the packages I found with a grep 'hwdb.d', but I may have let some slip through. I removed the publication of /etc/udev/hwdb.d in the udev service, because these files would have the highest priority, so a user could not override them. Since eudev is in the system profile, UDEV_HWDB_PATH is set with the system profile hardware files anyway (not exactly all that compose /etc/udev/hwdb.bin). The VM works. > > The hwdb.bin file used to be generated in /etc/udev/hwdb.bin, > > but since the sysconf dir is now directly /etc, the hwdb.bin index > > will not be found under /etc/udev/hwdb.bin. > While we choose to do this via sysconfdir, the proper fix would be to read > the path to the hwdb file from /etc/udev/udev.conf and fall back to > $prefix/etc/udev/hwdb.bin if it's undefined. That saves us some hacks. Unfortunately, eudev does not support this I think. Vivien Kraus (7): gnu: eudev: Update to 3.2.14. services: udev: Rewrite udev-rule to use file->udev-rule. services: udev: Make udev-rule helper functions generic. gnu: udev-service-type: accept hardware description file extensions. gnu: libgudev: Update to 238. gnu: upower: Update to 1.90.2. services: udev: Install hardware files in /lib/udev/hardware. doc/guix.texi | 57 +++++++-- gnu/packages/freedesktop.scm | 2 +- gnu/packages/gnome.scm | 43 ++++--- gnu/packages/libusb.scm | 8 +- gnu/packages/linux.scm | 57 ++++++--- .../patches/eudev-rules-directory.patch | 9 +- gnu/packages/xdisorg.scm | 9 +- gnu/services/base.scm | 116 +++++++++++++----- 8 files changed, 215 insertions(+), 86 deletions(-) base-commit: b18b2d13488f2a92331ccad2dc8cbb54ee15582f -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 08 06:57:06 2023 Received: (at 66099) by debbugs.gnu.org; 8 Oct 2023 10:57:06 +0000 Received: from localhost ([127.0.0.1]:56371 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpRT4-00041a-74 for submit@debbugs.gnu.org; Sun, 08 Oct 2023 06:57:06 -0400 Received: from planete-kraus.eu ([89.234.140.182]:58228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpRSy-00040x-Ak for 66099@debbugs.gnu.org; Sun, 08 Oct 2023 06:57:00 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id deb2be7e; Sun, 8 Oct 2023 10:56:35 +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=tA/4fa/SB4pwMHoKU4Fnw0Gyj9c=; b=y bOGM9DhNr6KWUPU2wjAxCkeYOlKq4ABEyDkbsHe1u2ez2beHd/I+UfVWI0dXkcoP ra+vdo2NsZOK29k0IZ82ddvc0/12HRiADzRFyiYVA/Y/YUTbxZVQHKU2IpPLhx0Q 3RoHsnQIc0hyAA5H03wdDXgqSyhEeIikAk6ony9aElMslTdLqRvBPk2lre8fZN4m e88GO4A0uksJTO7CFrPnWJIo+KVIZViC5DbDXTutC0uUpwC3wKl7YL70SnJ+cw90 v58w+MQiHRrvHDv4Cb9DDSK11a3ja3NJ0cvQAxBwqSpYpMMh6K21QegkgpY1I4Mk zDfFmfDKslxVHmirldYvQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id c12c0d76 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 8 Oct 2023 10:56:34 +0000 (UTC) Message-ID: <92bf9bd6e7bb4ef8eb2564a1faca3d434abe0e76.1696762169.git.vivien@planete-kraus.eu> In-Reply-To: References: , <10e334a07e0d45ff7bce0a18b56fd68f13ad2ce8.camel@gmail.com>, <9dcb22311514913d7b0fe41fd957e24423b8fa9b.camel@gmail.com>, <34cc0e2a780cca469d65222421e17f85414df8b2.camel@gmail.com>, <87ttr2ij9i.fsf@gmail.com> From: Vivien Kraus Date: Tue, 19 Sep 2023 13:23:22 +0200 Subject: [PATCH gnome-team v9 1/7] gnu: eudev: Update to 3.2.14. To: Liliana Marie Prikler ,Maxim Cournoyer ,66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Eudev now has a hardware database /etc/udev/hwdb.bin made up of descriptions installed in the /lib/udev/hwdb.d directory of each package, and more generally, UDEV_HWDB_PATH. This database index is com [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Eudev now has a hardware database /etc/udev/hwdb.bin made up of descriptions installed in the /lib/udev/hwdb.d directory of each package, and more generally, UDEV_HWDB_PATH. This database index is com [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Eudev now has a hardware database /etc/udev/hwdb.bin made up of descriptions installed in the /lib/udev/hwdb.d directory of each package, and more generally, UDEV_HWDB_PATH. This database index is compiled with udevadm hwdb --update. The udev-service-type collects the files and compiles the index. Previously, the hardware description files provided by eudev would be compiled into $prefix/etc/udev/hwdb.bin in the eudev output. * gnu/packages/linux.scm (eudev): Update to 3.2.14. [modules]: Import (guix build utils). [#:phases] : New phase. : New phase. : Remove phase. [#:configure-flags]: Set sysconfdir to avoid a prefix. [native-search-paths]: Add UDEV_HWDB_PATH. * gnu/packages/patches/eudev-rules-directory.patch: Rebase it. --- gnu/packages/linux.scm | 57 +++++++++++++------ .../patches/eudev-rules-directory.patch | 9 +-- 2 files changed, 45 insertions(+), 21 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 85e3d9845d..f552ccccae 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4262,10 +4262,9 @@ (define-public earlyoom (license license:expat))) (define-public eudev - ;; The post-systemd fork, maintained by Gentoo. (package (name "eudev") - (version "3.2.11") + (version "3.2.14") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/gentoo/eudev") @@ -4273,8 +4272,9 @@ (define-public eudev (file-name (git-file-name name version)) (sha256 (base32 - "0dzaqwjnl55f69ird57wb6skahc6l7zs1slsrzqqfhww33icp6av")) - (patches (search-patches "eudev-rules-directory.patch")))) + "1f6lz57igi7iw2ls3fpzgw42bfznam4nf9368h7x8yf1mb737yxz")) + (patches (search-patches "eudev-rules-directory.patch")) + (modules '((guix build utils))))) (build-system gnu-build-system) (arguments (list @@ -4285,6 +4285,31 @@ (define-public eudev (substitute* "man/make.sh" (("/usr/bin/xsltproc") (search-input-file (or native-inputs inputs) "/bin/xsltproc"))))) + (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. + (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 "include ./files.am"))) + (substitute* "hwdb/files.am" + (("dist_udevhwdb_DATA =") + "dist_hardwarelib_DATA =")) + ;; Do not install the empty udev.conf template. + (substitute* "src/udev/Makefile.am" + (("dist_udevconf_DATA =") + "dist_noinst_DATA =")) + ;; Do not ensure that /etc/udev/rules.d exists. + (substitute* "rules/Makefile.am" + (("\\$\\(MKDIR_P\\) \\$\\(DESTDIR\\)\\$\\(udevconfdir\\)/rules\\.d") + "true")))) (add-after 'install 'move-static-library (lambda _ (let ((source (string-append #$output "/lib/libudev.a")) @@ -4296,19 +4321,17 @@ (define-public eudev ;; such that Libtool looks for it in the usual places. (substitute* (string-append #$output "/lib/libudev.la") (("old_library=.*") - "old_library=''\n"))))) - (add-after 'install 'build-hwdb - (lambda _ - ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and - ;; similar tools to display product names. - ;; - ;; XXX: This can't be done when cross-compiling. Find another way - ;; to generate hwdb.bin for cross-built systems. - #$@(if (%current-target-system) - #~(#t) - #~((invoke (string-append #$output "/bin/udevadm") - "hwdb" "--update")))))) - #:configure-flags #~(list "--enable-manpages"))) + "old_library=''\n")))))) + #:configure-flags + #~(list "--enable-manpages" + ;; By default, autoconf uses $prefix/etc. The udev-service-type + ;; makes sure /etc is set up with rules and hardware file + ;; descriptions. + "--sysconfdir=/etc"))) + (native-search-paths + (list (search-path-specification + (variable "UDEV_HWDB_PATH") + (files '("lib/udev/hwdb.d"))))) (native-inputs (list autoconf automake diff --git a/gnu/packages/patches/eudev-rules-directory.patch b/gnu/packages/patches/eudev-rules-directory.patch index 54fc01c6d5..c4b1cfae39 100644 --- a/gnu/packages/patches/eudev-rules-directory.patch +++ b/gnu/packages/patches/eudev-rules-directory.patch @@ -4,9 +4,9 @@ The old udev 182 supported $UDEV_CONFIG_FILE, which in turn allowed the search path to be customized, but eudev no longer has this, hence this hack. ---- eudev-3.1.5/src/udev/udev-rules.c 2015-10-13 06:22:14.000000000 +0800 -+++ eudev-3.1.5/src/udev/udev-rules.c 2015-10-16 20:45:38.491934336 +0800 -@@ -47,15 +47,11 @@ +--- a/src/udev/udev-rules.c ++++ b/src/udev/udev-rules.c +@@ -48,16 +48,11 @@ struct uid_gid { }; }; @@ -20,11 +20,12 @@ this hack. - "/lib/udev/rules.d", - "/usr/lib/udev/rules.d", -#endif +- "/usr/local/lib/udev/rules.d", + NULL, /* placeholder for $EUDEV_RULES_DIRECTORY */ NULL}; struct udev_rules { -@@ -1704,6 +1700,9 @@ +@@ -1718,6 +1713,9 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) { udev_rules_check_timestamp(rules); -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 08 06:57:06 2023 Received: (at 66099) by debbugs.gnu.org; 8 Oct 2023 10:57:06 +0000 Received: from localhost ([127.0.0.1]:56375 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpRT8-000423-2m for submit@debbugs.gnu.org; Sun, 08 Oct 2023 06:57:06 -0400 Received: from planete-kraus.eu ([89.234.140.182]:58228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpRT6-00040x-An for 66099@debbugs.gnu.org; Sun, 08 Oct 2023 06:57:04 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id e90ff463; Sun, 8 Oct 2023 10:56:43 +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=k+d97SLb+vlGEuQb3iYvz11PVP4=; b=c +LtRgwTHc8d9jz35+Y2wIhUfEDwOVzgUcwC6MXvMj2N2ks6eWB/4u6+cW1gW/Ho2 DAzKZsHs5JLmPrTWtfgKo/5Z1aIAD3IEpS1kEUPHTFedtFZvzgNFDR5+OxvReDaT SD+aj5SkGE67LQLF0xEiHgsNP3AoFYWpawFazIQxICuU3wsA91GnVu9UHNLim4p1 KpOoG38W/XSta0JqVjRlG2wDoG9u17VJQ/VgiVev4myjRAou1fgOGf/fIDOy42FX nEzyiGB1EeSUYhiIx3V8LVpTZNwNtHozDhtOnrQKoYsYImi/YoDZceHKCVPM+aXT G30dDxA6cnohDEKGnt9lQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id deb97268 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 8 Oct 2023 10:56:42 +0000 (UTC) Message-ID: <6a569fafbb3d54b2ca7bfa0e072e85728ac98120.1696762169.git.vivien@planete-kraus.eu> In-Reply-To: References: , <10e334a07e0d45ff7bce0a18b56fd68f13ad2ce8.camel@gmail.com>, <9dcb22311514913d7b0fe41fd957e24423b8fa9b.camel@gmail.com>, <34cc0e2a780cca469d65222421e17f85414df8b2.camel@gmail.com>, <87ttr2ij9i.fsf@gmail.com> From: Vivien Kraus Date: Thu, 5 Oct 2023 19:33:24 +0200 Subject: [PATCH gnome-team v9 2/7] services: udev: Rewrite udev-rule to use file->udev-rule. To: Liliana Marie Prikler ,Maxim Cournoyer ,66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/services/base.scm (udev-rule): Use file->udev-rule. --- gnu/services/base.scm | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index b3f2d2e8b8..30372bf1b5 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2212,19 +2212,7 @@ (define (udev-rules-union packages) (define (udev-rule file-name contents) "Return a directory with a udev rule file FILE-NAME containing CONTENTS." - (computed-file file-name - (with-imported-modules '((guix build utils)) - #~(begin - (use-modules (guix build utils)) - - (define rules.d - (string-append #$output "/lib/udev/rules.d")) - - (mkdir-p rules.d) - (call-with-output-file - (string-append rules.d "/" #$file-name) - (lambda (port) - (display #$contents port))))))) + (file->udev-rule file-name (plain-file file-name contents))) (define (file->udev-rule file-name file) "Return a directory with a udev rule file FILE-NAME which is a copy of FILE." -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 08 06:57:10 2023 Received: (at 66099) by debbugs.gnu.org; 8 Oct 2023 10:57:10 +0000 Received: from localhost ([127.0.0.1]:56378 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpRTC-00042Q-DJ for submit@debbugs.gnu.org; Sun, 08 Oct 2023 06:57:10 -0400 Received: from planete-kraus.eu ([89.234.140.182]:58228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpRTA-00040x-Ar for 66099@debbugs.gnu.org; Sun, 08 Oct 2023 06:57:08 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id a5f29406; Sun, 8 Oct 2023 10:56:47 +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=F3i39rm1fx/rOafJ+tAEYogPeI8=; b=F cShY2593ExkC6Vf+pXD26UI48YqzBIGZlz4RYgDGm7oTvB7RwKa0bkaF3eAwy/fe +NggMlw++6Rw5U7GvP/IkKbBh8zmfgjrWbF60Cg5+1WyePvGDWL7F6vnh+gMqUIl 3evNoypRWFllHlQH1+juP+umVYhL3rCsmIm9P6psH2mLABy10bfqICf2XnpICUmV pAk1TkMsKvEYmEj4nZM8x23331TAMMhnag7jCcVKxLFdGUvUsNzjBh1bNSKFqDgC PE+WekEq7cytlmrYj/7u5oBqQTE/+0ddvDdqe57ndCLv0C8hwrTdx3PnyM7Zu5j7 VgZYYKwBlw+4VMiFVYcFA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 117ca547 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 8 Oct 2023 10:56:46 +0000 (UTC) Message-ID: <32db725fbb258635a0896b77a6daffca89ac7878.1696762169.git.vivien@planete-kraus.eu> In-Reply-To: References: , <10e334a07e0d45ff7bce0a18b56fd68f13ad2ce8.camel@gmail.com>, <9dcb22311514913d7b0fe41fd957e24423b8fa9b.camel@gmail.com>, <34cc0e2a780cca469d65222421e17f85414df8b2.camel@gmail.com>, <87ttr2ij9i.fsf@gmail.com> From: Vivien Kraus Date: Thu, 5 Oct 2023 19:24:56 +0200 Subject: [PATCH gnome-team v9 3/7] services: udev: Make udev-rule helper functions generic. To: Liliana Marie Prikler ,Maxim Cournoyer ,66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/services/base.scm (udev-configurations-union): New function. (udev-configuration-file): New function, use file->udev-configuration-file. (file->udev-configuration-file): New function. (udev-rules-union): Use udev-configurations-union. (udev-rule): Use udev-configuration-file. (file->udev-rule): Use file->udev-configuration-file. --- gnu/services/base.scm | 50 +++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 30372bf1b5..f674d48496 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2184,9 +2184,9 @@ (define-record-type* (rules udev-configuration-rules ;list of file-like (default '()))) -(define (udev-rules-union packages) - "Return the union of the @code{lib/udev/rules.d} directories found in each -item of @var{packages}." +(define (udev-configurations-union subdirectory packages) + "Return the union of the lib/udev/SUBDIRECTORY.d directories found in each +item of PACKAGES." (define build (with-imported-modules '((guix build union) (guix build utils)) @@ -2197,39 +2197,57 @@ (define (udev-rules-union packages) (srfi srfi-26)) (define %standard-locations - '("/lib/udev/rules.d" "/libexec/udev/rules.d")) + '(#$(string-append "/lib/udev/" subdirectory ".d") + #$(string-append "/libexec/udev/" subdirectory ".d"))) - (define (rules-sub-directory directory) - ;; Return the sub-directory of DIRECTORY containing udev rules, or - ;; #f if none was found. + (define (configuration-sub-directory directory) + ;; Return the sub-directory of DIRECTORY containing udev + ;; configurations, or #f if none was found. (find directory-exists? (map (cut string-append directory <>) %standard-locations))) (union-build #$output - (filter-map rules-sub-directory '#$packages))))) + (filter-map configuration-sub-directory '#$packages))))) + + (computed-file (string-append "udev-" subdirectory) build)) - (computed-file "udev-rules" build)) +(define (udev-rules-union packages) + "Return the union of the lib/udev/rules.d directories found in each +item of PACKAGES." + (udev-configurations-union "rules" packages)) + +(define (udev-configuration-file subdirectory file-name contents) + "Return a directory with a udev configuration file FILE-NAME containing CONTENTS." + (file->udev-configuration-file subdirectory file-name (plain-file file-name contents))) (define (udev-rule file-name contents) "Return a directory with a udev rule file FILE-NAME containing CONTENTS." - (file->udev-rule file-name (plain-file file-name contents))) + (udev-configuration-file "rules" file-name contents)) -(define (file->udev-rule file-name file) - "Return a directory with a udev rule file FILE-NAME which is a copy of FILE." +(define (file->udev-configuration-file subdirectory file-name file) + "Return a directory with a udev configuration file FILE-NAME which is a copy + of FILE." (computed-file file-name (with-imported-modules '((guix build utils)) #~(begin (use-modules (guix build utils)) - (define rules.d - (string-append #$output "/lib/udev/rules.d")) + (define configuration-directory + (string-append #$output + "/lib/udev/" + #$subdirectory + ".d")) (define file-copy-dest - (string-append rules.d "/" #$file-name)) + (string-append configuration-directory "/" #$file-name)) - (mkdir-p rules.d) + (mkdir-p configuration-directory) (copy-file #$file file-copy-dest))))) +(define (file->udev-rule file-name file) + "Return a directory with a udev rule file FILE-NAME which is a copy of FILE." + (file->udev-configuration-file "rules" file-name file)) + (define kvm-udev-rule ;; Return a directory with a udev rule that changes the group of /dev/kvm to ;; "kvm" and makes it #o660. Apparently QEMU-KVM used to ship this rule, -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 08 06:57:17 2023 Received: (at 66099) by debbugs.gnu.org; 8 Oct 2023 10:57:17 +0000 Received: from localhost ([127.0.0.1]:56381 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpRTI-00042j-Ry for submit@debbugs.gnu.org; Sun, 08 Oct 2023 06:57:17 -0400 Received: from planete-kraus.eu ([89.234.140.182]:58228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpRTG-00040x-BF for 66099@debbugs.gnu.org; Sun, 08 Oct 2023 06:57:15 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 234a8905; Sun, 8 Oct 2023 10:56:53 +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=yuGIrP9riNBYP9OzxeuiNw7dVec=; b=w D5GaabaAJIPLOlqT2XkNhvhz78oNs8R/NN+x6wunMgsG1LV+PEHnAd2gxlIw2Tlg LhXBGyq6Mbka4oWFKbPNZeumdHNIgemqeuEUgYk3fyfZW6t+GbwG/FtxjZ+EpNIR OdTYriQu8+DvuMYKr7YvLhtI5tTqwkITBQs+u+DwvN7j+xRmV3E2Wp0OSj4C4NYP 3w/N1qiRdJv/u4GrS+dUmG2G3KvDKnJ9lVIvslUVarK0zzzIZxj/n1lT/8hZVAqE 9JaFMwEBtrVEkaKr+ijdxZ6Xukxm8OAoHnzFqW3Vh4YCpQv8Qq2xmNNd8//f0L7O zuYpg5RvqbWJymxHYRTWQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 8a768e12 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 8 Oct 2023 10:56:52 +0000 (UTC) Message-ID: <129a803ebee4657c63a7f87d8a14f71f17bf9a19.1696762169.git.vivien@planete-kraus.eu> In-Reply-To: References: , <10e334a07e0d45ff7bce0a18b56fd68f13ad2ce8.camel@gmail.com>, <9dcb22311514913d7b0fe41fd957e24423b8fa9b.camel@gmail.com>, <34cc0e2a780cca469d65222421e17f85414df8b2.camel@gmail.com>, <87ttr2ij9i.fsf@gmail.com> From: Vivien Kraus Date: Mon, 2 Oct 2023 21:08:49 +0200 Subject: [PATCH gnome-team v9 4/7] gnu: udev-service-type: accept hardware description file extensions. To: Liliana Marie Prikler ,Maxim Cournoyer ,66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The udev-configuration record now has a hardware field. The contents of the /etc/udev directory now includes hwdb.bin, which is computed when the system is instanciated (prior to system activation). The hardware description files used to generate hwdb.bin [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The udev-configuration record now has a hardware field. The contents of the /etc/udev directory now includes hwdb.bin, which is computed when the system is instanciated (prior to system activation). The hardware description files used to generate hwdb.bin [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager The udev-configuration record now has a hardware field. The contents of the /etc/udev directory now includes hwdb.bin, which is computed when the system is instanciated (prior to system activation). The hardware description files used to generate hwdb.bin are not installed in /etc, because they are not required at run-time. The documentation has been reworked so as to explain why creating udev rules or hardware needs helper functions for configuration or extension. * gnu/services/base.scm (udev-hardware): New function. (file->udev-hardware): New function. (udev-hardware-service): New function. (udev-etc): Add hwdb.d and hwdb.bin. (module): Export udev-hardware, file->udev-hardware, and udev-hardware-service. (): Add the native-udev field. (udev-service-type) [extend]: Populate the hardware field. * doc/guix.texi (Base Services)[udev-service-type]: Explain configuration and extension values. * doc/guix.texi (Base Services)[udev-hardware]: Document it. [udev-hardware-service]: Same. * doc/guix.texi (Base Services)[udev-configuration]: Document the native-udev field. --- doc/guix.texi | 57 +++++++++++++++++++++++++++------- gnu/services/base.scm | 72 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 104 insertions(+), 25 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 46591b2f64..ec0bd688f0 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -19322,9 +19322,23 @@ Base Services @file{/dev} directory dynamically, whose value is a @code{} object. -This service type can be @emph{extended} using procedures -@code{udev-rules-service} along with @code{file->udev-rule} or -@code{udev-rule} which simplify the process of writing udev rules. +Since the file names for udev rules and hardware description files +matter, the configuration items for rules and hardware cannot simply be +plain file-like objects with the rules content, because the name would +be ignored. Instead, they are directory file-like objects that contain +optional rules in @file{lib/udev/rules.d} and optional hardware files in +@file{lib/udev/hwdb.d}. This way, the service can be configured with +whole packages from which to take rules and hwdb files. + +The @code{udev-service-type} can be @emph{extended} with file-like +directories that respect this hierarchy. For convenience, the +@code{udev-rule} and @code{file->udev-rule} can be used to construct +udev rules, while @code{udev-hardware} and @code{file->udev-hardware} +can be used to construct hardware description files. + +In an @code{operating-system} declaration, this service type can be +@emph{extended} using procedures @code{udev-rules-service} and +@code{udev-hardware-service}. @end defvar @deftp {Data Type} udev-configuration @@ -19332,10 +19346,17 @@ Base Services @table @asis @item @code{udev} (default: @code{eudev}) (type: file-like) -Package object of the udev service. +Package object of the udev service. This package is used at run-time, +when compiled for the target system. In order to generate the +@file{hwdb.bin} hardware index, it is also used when generating the +system definition, compiled for the current system. @item @code{rules} (default: @var{'()}) (type: list-of-file-like) -List of file-like objects denoting udev-rule files. +List of file-like objects denoting udev rule files under a sub-directory. + +@item @code{hardware} (default: @var{'()}) (type: list-of-file-like) +List of file-like objects denoting udev hardware description files under +a sub-directory. @end table @end deftp @@ -19358,6 +19379,11 @@ Base Services @end lisp @end deffn +@deffn {Procedure} udev-hardware @var{file-name} @var{contents} +Return a udev hardware description file named @var{file-name} containing +the hardware information @var{contents}. +@end deffn + @deffn {Procedure} udev-rules-service @var{name} @var{rules} [#:groups '()] Return a service that extends @code{udev-service-type} with @var{rules} and @code{account-service-type} with @var{groups} as system groups. @@ -19377,6 +19403,11 @@ Base Services @end lisp @end deffn +@deffn {Procedure} udev-hardware-service @var{name} @var{hardware} +Return a service that extends @code{udev-service-type} with +@var{hardware}. The service name is @code{@var{name}-udev-hardware}. +@end deffn + @deffn {Procedure} file->udev-rule @var{file-name} @var{file} Return a udev-rule file named @var{file-name} containing the rules defined within @var{file}, a file-like object. @@ -19401,12 +19432,16 @@ Base Services @end lisp @end deffn -Additionally, Guix package definitions can be included in @var{rules} in -order to extend the udev rules with the definitions found under their -@file{lib/udev/rules.d} sub-directory. In lieu of the previous -@var{file->udev-rule} example, we could have used the -@var{android-udev-rules} package which exists in Guix in the @code{(gnu -packages android)} module. +Since guix package definitions can be included in @var{rules} in order +to use all their rules under the @file{lib/udev/rules.d} sub-directory, +then in lieu of the previous @var{file->udev-rule} example, we could +have used the @var{android-udev-rules} package which exists in Guix in +the @code{(gnu packages android)} module. + +@deffn {Procedure} file->udev-hardware @var{file-name} @var{file} +Return a udev hardware description file named @var{file-name} containing +the rules defined within @var{file}, a file-like object. +@end deffn The following example shows how to use the @var{android-udev-rules} package so that the Android tool @command{adb} can detect devices diff --git a/gnu/services/base.scm b/gnu/services/base.scm index f674d48496..32a89fb190 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -81,6 +81,7 @@ (define-module (gnu services base) #:select (mount-flags->bit-mask swap-space->flags-bit-mask)) #:use-module (guix gexp) + #:use-module ((guix packages) #:select (package-version)) #:use-module (guix records) #:use-module (guix modules) #:use-module (guix pki) @@ -150,11 +151,15 @@ (define-module (gnu services base) udev-configuration udev-configuration? udev-configuration-rules + udev-configuration-hardware udev-service-type udev-service ; deprecated udev-rule + udev-hardware file->udev-rule + file->udev-hardware udev-rules-service + udev-hardware-service login-configuration login-configuration? @@ -2182,10 +2187,12 @@ (define-record-type* (udev udev-configuration-udev ;file-like (default eudev)) (rules udev-configuration-rules ;list of file-like - (default '()))) + (default '())) + (hardware udev-configuration-hardware ;list of file-like + (default '()))) (define (udev-configurations-union subdirectory packages) - "Return the union of the lib/udev/SUBDIRECTORY.d directories found in each + "Return the union of the lib/udev/SUBDIRECTORY directories found in each item of PACKAGES." (define build (with-imported-modules '((guix build union) @@ -2197,8 +2204,8 @@ (define (udev-configurations-union subdirectory packages) (srfi srfi-26)) (define %standard-locations - '(#$(string-append "/lib/udev/" subdirectory ".d") - #$(string-append "/libexec/udev/" subdirectory ".d"))) + '(#$(string-append "/lib/udev/" subdirectory) + #$(string-append "/libexec/udev/" subdirectory))) (define (configuration-sub-directory directory) ;; Return the sub-directory of DIRECTORY containing udev @@ -2214,7 +2221,7 @@ (define (udev-configurations-union subdirectory packages) (define (udev-rules-union packages) "Return the union of the lib/udev/rules.d directories found in each item of PACKAGES." - (udev-configurations-union "rules" packages)) + (udev-configurations-union "rules.d" packages)) (define (udev-configuration-file subdirectory file-name contents) "Return a directory with a udev configuration file FILE-NAME containing CONTENTS." @@ -2222,7 +2229,11 @@ (define (udev-configuration-file subdirectory file-name contents) (define (udev-rule file-name contents) "Return a directory with a udev rule file FILE-NAME containing CONTENTS." - (udev-configuration-file "rules" file-name contents)) + (udev-configuration-file "rules.d" 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)) (define (file->udev-configuration-file subdirectory file-name file) "Return a directory with a udev configuration file FILE-NAME which is a copy @@ -2235,8 +2246,7 @@ (define (file->udev-configuration-file subdirectory file-name file) (define configuration-directory (string-append #$output "/lib/udev/" - #$subdirectory - ".d")) + #$subdirectory)) (define file-copy-dest (string-append configuration-directory "/" #$file-name)) @@ -2246,7 +2256,11 @@ (define (file->udev-configuration-file subdirectory file-name file) (define (file->udev-rule file-name file) "Return a directory with a udev rule file FILE-NAME which is a copy of FILE." - (file->udev-configuration-file "rules" file-name file)) + (file->udev-configuration-file "rules.d" 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)) (define kvm-udev-rule ;; Return a directory with a udev rule that changes the group of /dev/kvm to @@ -2355,13 +2369,27 @@ (define udev.conf (define (udev-etc config) (match-record config - (udev rules) + (udev rules hardware) + (let* ((hardware + (udev-configurations-union "hwdb.d" (cons* udev hardware))) + (hwdb.bin + (computed-file + "hwdb.bin" + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + (setenv "UDEV_HWDB_PATH" #$hardware) + (invoke #+(file-append udev "/bin/udevadm") + "hwdb" + "--update" + "-o" #$output)))))) `(("udev" ,(file-union "udev" `(("udev.conf" ,udev.conf) ("rules.d" ,(udev-rules-union (cons* udev kvm-udev-rule - rules))))))))) + rules))) + ("hwdb.bin" ,hwdb.bin)))))))) (define udev-service-type (service-type (name 'udev) @@ -2370,12 +2398,15 @@ (define udev-service-type udev-shepherd-service) (service-extension etc-service-type udev-etc))) (compose concatenate) ;concatenate the list of rules - (extend (lambda (config rules) + (extend (lambda (config extensions) (let ((initial-rules - (udev-configuration-rules config))) + (udev-configuration-rules config)) + (initial-hardware + (udev-configuration-hardware config))) (udev-configuration (inherit config) - (rules (append initial-rules rules)))))) + (rules (append initial-rules extensions)) + (hardware (append initial-hardware extensions)))))) (default-value (udev-configuration)) (description "Run @command{udev}, which populates the @file{/dev} @@ -2410,6 +2441,19 @@ (define* (udev-rules-service name rules #:key (groups '())) (description "This service adds udev rules.")))) (service type #f))) +(define (udev-hardware-service name hardware-files) + "Return a service that extends udev-service-type with HARDWARE-FILES, named +NAME-udev-hardware." + (let* ((name (symbol-append name '-udev-hardware)) + (udev-extension (const (list hardware-files))) + (type (service-type + (name name) + (extensions (list + (service-extension + udev-service-type udev-extension))) + (description "This service adds udev hardware files.")))) + (service type #f))) + (define (swap-space->shepherd-service-name space) (let ((target (swap-space-target space))) (symbol-append 'swap- -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 08 06:57:25 2023 Received: (at 66099) by debbugs.gnu.org; 8 Oct 2023 10:57:25 +0000 Received: from localhost ([127.0.0.1]:56384 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpRTQ-000434-Mj for submit@debbugs.gnu.org; Sun, 08 Oct 2023 06:57:24 -0400 Received: from planete-kraus.eu ([89.234.140.182]:58228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpRTO-00040x-Bg for 66099@debbugs.gnu.org; Sun, 08 Oct 2023 06:57:23 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 8adc1c38; Sun, 8 Oct 2023 10:57:01 +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=8IllG/iUYeuMh4Fe17WtACJeN8U=; b=a 3GKP/t55RQxLJuf/LlYryS8U/ZKj3waazgVv7xsVY14qUVVx18v9NWQCBo/BdPyq 7FXxiCsWuJKaVU7nImwsuKkrAWwT2Ygz5nQPhVG/VYU4h7fdJHnXz1+P/P2+Y38+ 3LGij9lswEwis+nqwgcOMyHG5UQyfCAalmWs29HmzbpPZCCnJ2HbSDwdDuWQf91b eW5PZLotJglrPqWAGQwZuM3dBlEWx60eEfdRwPVMXrANXeRyE3uh3U1qfJ1mjDoT fjjJvqku1ZZXqGoeMGqkhvqm7RfGFdfLOr3EIIxlHjDsxPwIQI4+Ebiuck0zEvFC So4JMrpMPkLsId0ABVRsg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 8cc1deb4 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 8 Oct 2023 10:57:00 +0000 (UTC) Message-ID: <5fb6a280784285de08c22a6c87eab1256271d391.1696762169.git.vivien@planete-kraus.eu> In-Reply-To: References: , <10e334a07e0d45ff7bce0a18b56fd68f13ad2ce8.camel@gmail.com>, <9dcb22311514913d7b0fe41fd957e24423b8fa9b.camel@gmail.com>, <34cc0e2a780cca469d65222421e17f85414df8b2.camel@gmail.com>, <87ttr2ij9i.fsf@gmail.com> From: Vivien Kraus Date: Tue, 19 Sep 2023 13:32:26 +0200 Subject: [PATCH gnome-team v9 5/7] gnu: libgudev: Update to 238. To: Liliana Marie Prikler ,Maxim Cournoyer ,66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ea3dc455a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-pl [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ea3dc455a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-pl [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ea3dc455a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-plugins (define-public libgudev (package (name "libgudev") - (version "236") + (version "238") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "094mgjmwgsgqrr1i0vd20ynvlkihvs3vgbmpbrhswjsrdp86j0z5")))) + "1laxgdkgmr30aw44sm4rgpsdybwxx5rszcm8c2y3vmy9myqnl9k1")))) (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 08 06:57:30 2023 Received: (at 66099) by debbugs.gnu.org; 8 Oct 2023 10:57:30 +0000 Received: from localhost ([127.0.0.1]:56387 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpRTW-00043N-0N for submit@debbugs.gnu.org; Sun, 08 Oct 2023 06:57:30 -0400 Received: from planete-kraus.eu ([89.234.140.182]:58228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpRTT-00040x-Bj for 66099@debbugs.gnu.org; Sun, 08 Oct 2023 06:57:28 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 9fc43901; Sun, 8 Oct 2023 10:57:06 +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:mime-version :content-type:content-transfer-encoding:to:cc; s=albinoniB; bh=w JRCi4o6VNJJOB65aJihU+xgrDg=; b=bElkcORN3Dc5TLrFCx2clK6N85IGC9Qxx 5kjsVucJ1+QBVXU+C4f0DgOr5xGEye3trs5IOZ/YnGOm9X7UXOnCHblFfZsBHan4 6D2WTRgwpp95rjylSB2n2Ws6KpFZ4w7lmXC5H7hR2YvtwRKlXHsXsKjF+jT+/4Rw 8VbxcyHTKjoGhRn6DypJbx9Js7kKZuRchB/vNU0smmgeOxqojydZ3iNSEyegEWvX Pzfo9ldZdK+lWZGJv+qCCzK46s1m+xKY4oqj2wzTMOMohXkuTtfA6kbBY9Zn4JE5 JKa/AlGPHKby+m0bD9youE9iEw8ePpXjXNCB+QpFpq+QWOfbYZc+g== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 2ea45e4f (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 8 Oct 2023 10:57:05 +0000 (UTC) Message-ID: <2e8d1b767600ca21951d45db7ffb7e24cc20b912.1696762169.git.vivien@planete-kraus.eu> In-Reply-To: References: , <10e334a07e0d45ff7bce0a18b56fd68f13ad2ce8.camel@gmail.com>, <9dcb22311514913d7b0fe41fd957e24423b8fa9b.camel@gmail.com>, <34cc0e2a780cca469d65222421e17f85414df8b2.camel@gmail.com>, <87ttr2ij9i.fsf@gmail.com> From: Vivien Kraus Date: Tue, 19 Sep 2023 13:32:46 +0200 Subject: [PATCH gnome-team v9 6/7] gnu: upower: Update to 1.90.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: Liliana Marie Prikler ,Maxim Cournoyer ,66099@debbugs.gnu.org User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Upower has an extra hardware description file for use with udev. It should be installed under upower’s output, not eudev’s. A test is disabled, for calling an unimplemented bluez method. The conditional 'adjust-test-for-excess-precision phase is included in the new 'adjust-test-suite, so that the list of phases is always t [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Upower has an extra hardware description file for use with udev. It should be installed under upower’s output, not eudev’s. A test is disabled, for calling an unimplemented bluez method. The conditional 'adjust-test-for-excess-precision phase is included in the new 'adjust-test-suite, so that the list of phases is always t [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Upower has an extra hardware description file for use with udev. It should be installed under upower’s output, not eudev’s. A test is disabled, for calling an unimplemented bluez method. The conditional 'adjust-test-for-excess-precision phase is included in the new 'adjust-test-suite, so that the list of phases is always the same. * gnu/packages/gnome.scm (upower): Update to 1.90.2. [#:configure-flags]: Set udevhwdbdir. [#:phases] : Add this phase unconditionnally : Disable test_bluetooth_hidpp_mouse. [inputs]: Remove dbus-glib. [native-inputs]: Add dbus. --- gnu/packages/gnome.scm | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4ea3dc455a..3f773aae8a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5727,7 +5727,7 @@ (define-public geocode-glib-with-libsoup2 (define-public upower (package (name "upower") - (version "1.90.0") + (version "1.90.2") (source (origin (method git-fetch) @@ -5736,7 +5736,7 @@ (define-public upower (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1g17rm91p8vfpjyb0k2shylrs55nccn3fa890vlk4n9s71sghbzq")) + (base32 "13xp423ycv8imf2cmgf6lii9f01p7x2v19cny7acrmczkc0cqv7d")) (modules '((guix build utils))) (snippet ;; Upstream commit . - (substitute* "src/linux/integration-test.py" - (("assertEqual(.*)40\\.0" _ middle) - (string-append - "assertAlmostEqual" middle "40.0")))))) - #~%standard-phases))) + (string-append "-Dudevrulesdir=" #$output "/bin/udev/rules.d") + (string-append "-Dudevhwdbdir=" #$output "/lib/udev/hwdb.d")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'adjust-test-suite + (lambda _ + ;; This test calls an unimplemented bluez dbus method. + (substitute* "src/linux/integration-test.py" + (("test_bluetooth_hidpp_mouse") + "disabled_test_bluetooth_hidpp_mouse")) + #$@(if (target-x86-32?) + ;; Address test failure caused by excess precision + ;; on i686: + ;; . + '((substitute* "src/linux/integration-test.py" + (("assertEqual(.*)40\\.0" _ middle) + (string-append + "assertAlmostEqual" middle "40.0")))) + '())))))) (native-inputs (list `(,glib "bin") ; for gdbus-codegen gobject-introspection @@ -5785,12 +5791,13 @@ (define-public upower python-packaging python-pygobject umockdev + dbus ;; For man pages. docbook-xsl libxslt ; for 'xsltproc' libxml2)) ; for 'XML_CATALOG_FILES' (inputs - (list dbus-glib libgudev libusb)) + (list libgudev libusb)) (propagated-inputs ;; In Requires of upower-glib.pc. (list glib)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 08 06:57:38 2023 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> From: Vivien Kraus Date: Sun, 8 Oct 2023 12:00:39 +0200 Subject: [PATCH gnome-team v9 7/7] services: udev: Install hardware files in /lib/udev/hardware. To: Liliana Marie Prikler ,Maxim Cournoyer ,66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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" -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 08 08:27:57 2023 Received: (at 66099) by debbugs.gnu.org; 8 Oct 2023 12:27:58 +0000 Received: from localhost ([127.0.0.1]:56469 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpSt3-0003dA-Jo for submit@debbugs.gnu.org; Sun, 08 Oct 2023 08:27:57 -0400 Received: from mail-qt1-x832.google.com ([2607:f8b0:4864:20::832]:56659) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpSt0-0003cu-RW for 66099@debbugs.gnu.org; Sun, 08 Oct 2023 08:27:56 -0400 Received: by mail-qt1-x832.google.com with SMTP id d75a77b69052e-41820eecff2so23849081cf.1 for <66099@debbugs.gnu.org>; Sun, 08 Oct 2023 05:27:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696768049; x=1697372849; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=97IbWMVCVgkpswjY5S8dzz+vLyfby5NMoeYawprjY2U=; b=jlKsaqt04s0RINCtWIdFcdRitD9fWD66yQ13ziDt1KDE9WXwYyQfds/gVm2Mb+JDhP lLdkK5yA/cyIYC7RVV/jyGc/XHS3c8nHcAFdRueApQ44S025DbWGMTjJ8o/6yv+TLa6F o4w9Nqyya8/FTnkd1F9umvfP3P3odxvCkRsKXEFCB5o7cEaycTM+bCfPJllwzQCCBFrr cNEGerSS1qB5UiLriMMbzAe052hUuON9Oj3kIuiLs3mSQ9+XyKQDzP2YjibADzBP1JRe vql28tT6xffKnJ9SsFofsycSAhpja06GVSxiVF4ke2H5f4Y92waPgfc1PVSNlRtYcRxt bNfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696768049; x=1697372849; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=97IbWMVCVgkpswjY5S8dzz+vLyfby5NMoeYawprjY2U=; b=w91Dh/r8B/UuBqCq+VIRtlQZcyWWjkF1sdLPipWOR4o54Lzy0ihUWFUdUC067sa75N p9zzjp0hNt3w4mlLh5eZ0+ZYLehTPj/lhPwN4Q/FpEbiVVhXnZMYICkgDK0jHuwOAdVA i0XAa0u7vSmG/MY560WA6QsVaTxQRth6AXsiVbJNF0FdF+AqbY7Ke7Ma25rifkmuDrRa 2yNooVoB+lJSPPXqjo9D15g0gbdwD/wDFjTrLM6i5g5PCiTgyikHRGIbHGLfpn/H2p2A wONOVfA8fCvb519qCPrEHY1LUCf9O2cq8vmAxxnBNs9YGyI6hoXBkk3+na8BDt95Qzoi lr6Q== X-Gm-Message-State: AOJu0Yydo2C6MjBFjRp2Ih4/TwXjg7ip/fBF/anSLjwOWQExsRdywQNz wXsYdInHLJGrdKHBg940sho= X-Google-Smtp-Source: AGHT+IGrx9oPF2cdEKeIkhut9tKHqK8w+KHITItlysU5yrxH/r01qDazPnKdSi+1/4M0bfr2kDxC6g== X-Received: by 2002:ac8:7c52:0:b0:405:396e:f059 with SMTP id o18-20020ac87c52000000b00405396ef059mr17875433qtv.33.1696768049112; Sun, 08 Oct 2023 05:27:29 -0700 (PDT) Received: from hurd (dsl-158-21.b2b2c.ca. [66.158.158.21]) by smtp.gmail.com with ESMTPSA id jx23-20020a05622a811700b0041819df2050sm2824744qtb.69.2023.10.08.05.27.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Oct 2023 05:27:28 -0700 (PDT) From: Maxim Cournoyer To: Vivien Kraus Subject: Re: [PATCH gnome-team v9 0/7] Update eudev, upower, udev-service-type, with /lib/udev/hardware In-Reply-To: (Vivien Kraus's message of "Sun, 8 Oct 2023 12:49:29 +0200") References: <10e334a07e0d45ff7bce0a18b56fd68f13ad2ce8.camel@gmail.com> <9dcb22311514913d7b0fe41fd957e24423b8fa9b.camel@gmail.com> <34cc0e2a780cca469d65222421e17f85414df8b2.camel@gmail.com> <87ttr2ij9i.fsf@gmail.com> Date: Sun, 08 Oct 2023 08:27:27 -0400 Message-ID: <87r0m5e1u8.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: 66099@debbugs.gnu.org, Liliana Marie Prikler , rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Vivien, Vivien Kraus writes: > Dear guix, > > I find it surprising that we should rename /lib/udev/hwdb.d to > /lib/udev/hardware, but the impact is minimal (udevadm on Guix for the > udev-service-type relies only on UDEV_HWDB_PATH, which can accept /hardwa= re > easily), and you insist, so, let=E2=80=99s do that. I thought I mentioned it earlier (can't find it in my replies now) but I'd prefer sticking to eudev's naming of choice (hwdb.d); going against this will necessarily cause some friction and maintenance in the future, for no gain (also, it may be more readable but unexpected by eudev's users). I'd say it's an extraneous change. Sorry for the back and forth. --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 08 08:29:19 2023 Received: (at 66099) by debbugs.gnu.org; 8 Oct 2023 12:29:19 +0000 Received: from localhost ([127.0.0.1]:56478 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpSuN-0003fu-EQ for submit@debbugs.gnu.org; Sun, 08 Oct 2023 08:29:19 -0400 Received: from mail-qv1-xf32.google.com ([2607:f8b0:4864:20::f32]:54665) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpSuL-0003ff-Ox for 66099@debbugs.gnu.org; Sun, 08 Oct 2023 08:29:18 -0400 Received: by mail-qv1-xf32.google.com with SMTP id 6a1803df08f44-65af7d102b3so24382666d6.1 for <66099@debbugs.gnu.org>; Sun, 08 Oct 2023 05:28:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696768132; x=1697372932; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=+9uOkdvPhsKYwYCEqGXQbpW5qf6tNodqs49UlE+SceE=; b=KtgrjNa0ZwlnR63txZZu8DpPvXl8sEHtT5gFm4BHmyTO6bbJW4zIKGvftAJGjuwznE bVWxQcs17JJyrVqUbDv6cGGFaF4adZfXJFpDKTWDBVd7UheHdrrnvhCB7aiO/ufngHw4 ure5HGuRFvku4HiaQbTPMI5Xbo/4Z5eLAew/0tUNZYOkuaquZfntDGDWgzEFFyleDbh3 xDQH856fz63v+SKy2Mllx4qmurdnTJtajL/1wTOWx6L7ZSZFErr+fV6BEUc8eDPSAcEM tFtti/dGoi4TdopvyyD8P2nWdI53nDhYUm9jTW8d6YKnZoic74kwvUMvY6HX8yYgUzVy hDGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696768132; x=1697372932; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=+9uOkdvPhsKYwYCEqGXQbpW5qf6tNodqs49UlE+SceE=; b=AP6ZIlRBb7CyHzQx8Z0PZkqP2rozfLLaZWzqQm16dgyoYbbJoQel9XX1OvBx1ppHAq B0FP0xZG7A6Q0ioR1ZD6+jEoLK98ZrSgDVm7HepuYIdcHF9oWzXlr0EhhOnk6vpnSqjc 8so2OK1aRe/eCxHHja703m5L51PC6/aNgmQO2Lc/q7FZPd8F/MngliuyJGl4Wn/jgc1f /t+etqHWIuRL3t3/fI/fkosb0sx59vUHPqoMTd6KMkuDCSMP6+RwCpwFS9LVPXo30D4W 9l8o9kpJuOOmRVpgXtdrs0X1fCgu1rNEMtkG0IILxLv/8ADEbmDKDH8pFod/x7Lyztsl 64xA== X-Gm-Message-State: AOJu0Yz0CEQg+N35+sD8rUQcPn4ZnsO/jm+v0PsYqMimVbJyUDMI4F7o Pu34XMQqvrD2XrEVvMNc7ji9lpD0W8o= X-Google-Smtp-Source: AGHT+IEli9sZqbz83zRoGw4hRBpOj6lnRmGtESiN0DxdST2AF3+b1gmirXYMbY1uywoUNht5nZ3Oag== X-Received: by 2002:a05:6214:330:b0:64f:4d8e:574e with SMTP id j16-20020a056214033000b0064f4d8e574emr13370641qvu.7.1696768132175; Sun, 08 Oct 2023 05:28:52 -0700 (PDT) Received: from hurd (dsl-158-21.b2b2c.ca. [66.158.158.21]) by smtp.gmail.com with ESMTPSA id q9-20020a0c8cc9000000b0064c9f754794sm3018679qvb.86.2023.10.08.05.28.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Oct 2023 05:28:51 -0700 (PDT) From: Maxim Cournoyer To: Vivien Kraus Subject: Re: [PATCH gnome-team v9 7/7] services: udev: Install hardware files in /lib/udev/hardware. In-Reply-To: (Vivien Kraus's message of "Sun, 8 Oct 2023 12:00:39 +0200") References: <10e334a07e0d45ff7bce0a18b56fd68f13ad2ce8.camel@gmail.com> <9dcb22311514913d7b0fe41fd957e24423b8fa9b.camel@gmail.com> <34cc0e2a780cca469d65222421e17f85414df8b2.camel@gmail.com> <87ttr2ij9i.fsf@gmail.com> Date: Sun, 08 Oct 2023 08:28:50 -0400 Message-ID: <87mswte1rx.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: 66099@debbugs.gnu.org, Liliana Marie Prikler , rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Apart from the hwdb.d -> hardware renaming, this series rest LGTM! -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 08 08:33:28 2023 Received: (at 66099) by debbugs.gnu.org; 8 Oct 2023 12:33:28 +0000 Received: from localhost ([127.0.0.1]:56482 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpSyO-0003nn-1n for submit@debbugs.gnu.org; Sun, 08 Oct 2023 08:33:28 -0400 Received: from planete-kraus.eu ([89.234.140.182]:53692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpSyL-0003ne-Qd for 66099@debbugs.gnu.org; Sun, 08 Oct 2023 08:33:26 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 00a85258; Sun, 8 Oct 2023 12:33:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:cc:date:in-reply-to:references :content-type:content-transfer-encoding:mime-version; s= albinoniB; bh=uJhBwisJmL+BilbQiuwnKT2+sVs=; b=sS0FHTlgHbL2oC5AOc Hdcshi5EK9ybiW22m/Ei/uTaxaXBCqHCTJc26avQU/RiLV6/07SuhsKCLrvOS9yD l7XLOad9kC9S3LgBKJj0uXWHXuqn9NkYP0bovRdnDeaoAL7gJfBgJDyqn73CSTbo O+578tzMt6XGQiTrGpVpk6vbggmZvkSETENtrHjRZ3dfeXTiZdC7ywBvcOKaXzmY 6f9XGA/gjj/Uz5z2s/9d8wkAiWMJDD3TWYEqYTAhg1FhnrMx9+n9EnCAqGTiz2Z4 QEHXdTHuTNqxKtaU7K9z6llDtsQGGVxpuhgyuFllRkIoyWDgwAeAF/F3FSU7QNKU nF6Q== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id f67be33c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 8 Oct 2023 12:33:04 +0000 (UTC) Message-ID: Subject: Re: [PATCH gnome-team v9 0/7] Update eudev, upower, udev-service-type, with /lib/udev/hardware From: Vivien Kraus To: Maxim Cournoyer Date: Sun, 08 Oct 2023 14:33:02 +0200 In-Reply-To: <87r0m5e1u8.fsf@gmail.com> References: <10e334a07e0d45ff7bce0a18b56fd68f13ad2ce8.camel@gmail.com> <9dcb22311514913d7b0fe41fd957e24423b8fa9b.camel@gmail.com> <34cc0e2a780cca469d65222421e17f85414df8b2.camel@gmail.com> <87ttr2ij9i.fsf@gmail.com> <87r0m5e1u8.fsf@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: 66099@debbugs.gnu.org, Liliana Marie Prikler , rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le dimanche 08 octobre 2023 =C3=A0 08:27 -0400, Maxim Cournoyer a =C3=A9cri= t=C2=A0: > > I find it surprising that we should rename /lib/udev/hwdb.d to > > /lib/udev/hardware, but the impact is minimal (udevadm on Guix for > > the > > udev-service-type relies only on UDEV_HWDB_PATH, which can accept > > /hardware > > easily), and you insist, so, let=E2=80=99s do that. >=20 > I thought I mentioned it earlier (can't find it in my replies now) > but > I'd prefer sticking to eudev's naming of choice (hwdb.d); going > against > this will necessarily cause some friction and maintenance in the > future, > for no gain (also, it may be more readable but unexpected by eudev's > users).=C2=A0 I'd say it's an extraneous change. >=20 > Sorry for the back and forth. No problem, I=E2=80=99ll remove it in the next iteration, and if this is th= e last, then the commiter can just ignore the last patch. Best regards, Vivien From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 10 15:33:17 2023 Received: (at 66099) by debbugs.gnu.org; 10 Oct 2023 19:33:17 +0000 Received: from localhost ([127.0.0.1]:36915 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqITk-0008Kk-U4 for submit@debbugs.gnu.org; Tue, 10 Oct 2023 15:33:17 -0400 Received: from planete-kraus.eu ([89.234.140.182]:33880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqITh-0008KX-AJ for 66099@debbugs.gnu.org; Tue, 10 Oct 2023 15:33:15 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id a2bc8da5; Tue, 10 Oct 2023 19:32:49 +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=ZfjY9C0RBM0X9574VDm412TMowk=; b=W rzpMSX4qq691BLhSgbcmADLNmUHzZIUurFc0eVPh1jOiit2ASlICUbrBXRLPCQ+e 1gtmvCoeix2TUcKrl8lU/I/B6TzApFAmF3KJW+Ui2DXBufY+pScXqKeVxDtmWKLJ KOkE75YwyA97JAQLaxKlexHOLmc7UlsNYPhqLkkj3TQt6a9xiEPduxmadUVQHpq4 4ZJJnuO6S12TtRN1j6TtiW3Gyk82Ra7Gohi+WEj0qd2UFMLwnE2mgH9QD69f9QRi B/hOBvjrtflSG5uLFI3mQKhli8dtw5zjfC/niANEhMcK4l4DYGADUmlZnkcYEhCQ LO+E+k3uw+oCw5WR6BvIw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 922d3063 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 10 Oct 2023 19:32:49 +0000 (UTC) Message-ID: In-Reply-To: References: <87mswte1rx.fsf@gmail.com> <4744acd296e1c2f5d3f9f14c7cfba3e3696dcac7.1696966139.git.vivien@planete-kraus.eu> <70ae450282e2411c5506447c79adf6a62345344c.1696966139.git.vivien@planete-kraus.eu> From: Vivien Kraus Date: Mon, 2 Oct 2023 21:08:49 +0200 Subject: [PATCH gnome-team v10 4/6] gnu: udev-service-type: accept hardware description file extensions. To: Maxim Cournoyer ,Liliana Marie Prikler ,66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The udev-configuration record now has a hardware field. The contents of the /etc/udev directory now includes hwdb.bin, which is computed when the system is instanciated (prior to system activation). The hardware description files used to generate hwdb.bin [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The udev-configuration record now has a hardware field. The contents of the /etc/udev directory now includes hwdb.bin, which is computed when the system is instanciated (prior to system activation). The hardware description files used to generate hwdb.bin [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager The udev-configuration record now has a hardware field. The contents of the /etc/udev directory now includes hwdb.bin, which is computed when the system is instanciated (prior to system activation). The hardware description files used to generate hwdb.bin are not installed in /etc, because they are not required at run-time. The documentation has been reworked so as to explain why creating udev rules or hardware needs helper functions for configuration or extension. * gnu/services/base.scm (udev-hardware): New function. (file->udev-hardware): New function. (udev-hardware-service): New function. (udev-etc): Add hwdb.d and hwdb.bin. (module): Export udev-hardware, file->udev-hardware, and udev-hardware-service. (): Add the native-udev field. (udev-service-type) [extend]: Populate the hardware field. * doc/guix.texi (Base Services)[udev-service-type]: Explain configuration and extension values. * doc/guix.texi (Base Services)[udev-hardware]: Document it. [udev-hardware-service]: Same. * doc/guix.texi (Base Services)[udev-configuration]: Document the native-udev field. --- doc/guix.texi | 57 +++++++++++++++++++++++++++------- gnu/services/base.scm | 72 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 104 insertions(+), 25 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index ad26a29513..3530d317ec 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -19362,9 +19362,23 @@ Base Services @file{/dev} directory dynamically, whose value is a @code{} object. -This service type can be @emph{extended} using procedures -@code{udev-rules-service} along with @code{file->udev-rule} or -@code{udev-rule} which simplify the process of writing udev rules. +Since the file names for udev rules and hardware description files +matter, the configuration items for rules and hardware cannot simply be +plain file-like objects with the rules content, because the name would +be ignored. Instead, they are directory file-like objects that contain +optional rules in @file{lib/udev/rules.d} and optional hardware files in +@file{lib/udev/hwdb.d}. This way, the service can be configured with +whole packages from which to take rules and hwdb files. + +The @code{udev-service-type} can be @emph{extended} with file-like +directories that respect this hierarchy. For convenience, the +@code{udev-rule} and @code{file->udev-rule} can be used to construct +udev rules, while @code{udev-hardware} and @code{file->udev-hardware} +can be used to construct hardware description files. + +In an @code{operating-system} declaration, this service type can be +@emph{extended} using procedures @code{udev-rules-service} and +@code{udev-hardware-service}. @end defvar @deftp {Data Type} udev-configuration @@ -19372,10 +19386,17 @@ Base Services @table @asis @item @code{udev} (default: @code{eudev}) (type: file-like) -Package object of the udev service. +Package object of the udev service. This package is used at run-time, +when compiled for the target system. In order to generate the +@file{hwdb.bin} hardware index, it is also used when generating the +system definition, compiled for the current system. @item @code{rules} (default: @var{'()}) (type: list-of-file-like) -List of file-like objects denoting udev-rule files. +List of file-like objects denoting udev rule files under a sub-directory. + +@item @code{hardware} (default: @var{'()}) (type: list-of-file-like) +List of file-like objects denoting udev hardware description files under +a sub-directory. @end table @end deftp @@ -19398,6 +19419,11 @@ Base Services @end lisp @end deffn +@deffn {Procedure} udev-hardware @var{file-name} @var{contents} +Return a udev hardware description file named @var{file-name} containing +the hardware information @var{contents}. +@end deffn + @deffn {Procedure} udev-rules-service @var{name} @var{rules} [#:groups '()] Return a service that extends @code{udev-service-type} with @var{rules} and @code{account-service-type} with @var{groups} as system groups. @@ -19417,6 +19443,11 @@ Base Services @end lisp @end deffn +@deffn {Procedure} udev-hardware-service @var{name} @var{hardware} +Return a service that extends @code{udev-service-type} with +@var{hardware}. The service name is @code{@var{name}-udev-hardware}. +@end deffn + @deffn {Procedure} file->udev-rule @var{file-name} @var{file} Return a udev-rule file named @var{file-name} containing the rules defined within @var{file}, a file-like object. @@ -19441,12 +19472,16 @@ Base Services @end lisp @end deffn -Additionally, Guix package definitions can be included in @var{rules} in -order to extend the udev rules with the definitions found under their -@file{lib/udev/rules.d} sub-directory. In lieu of the previous -@var{file->udev-rule} example, we could have used the -@var{android-udev-rules} package which exists in Guix in the @code{(gnu -packages android)} module. +Since guix package definitions can be included in @var{rules} in order +to use all their rules under the @file{lib/udev/rules.d} sub-directory, +then in lieu of the previous @var{file->udev-rule} example, we could +have used the @var{android-udev-rules} package which exists in Guix in +the @code{(gnu packages android)} module. + +@deffn {Procedure} file->udev-hardware @var{file-name} @var{file} +Return a udev hardware description file named @var{file-name} containing +the rules defined within @var{file}, a file-like object. +@end deffn The following example shows how to use the @var{android-udev-rules} package so that the Android tool @command{adb} can detect devices diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 10e7383475..db22ac848e 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -82,6 +82,7 @@ (define-module (gnu services base) #:select (mount-flags->bit-mask swap-space->flags-bit-mask)) #:use-module (guix gexp) + #:use-module ((guix packages) #:select (package-version)) #:use-module (guix records) #:use-module (guix modules) #:use-module (guix pki) @@ -152,11 +153,15 @@ (define-module (gnu services base) udev-configuration udev-configuration? udev-configuration-rules + udev-configuration-hardware udev-service-type udev-service ; deprecated udev-rule + udev-hardware file->udev-rule + file->udev-hardware udev-rules-service + udev-hardware-service login-configuration login-configuration? @@ -2232,10 +2237,12 @@ (define-record-type* (udev udev-configuration-udev ;file-like (default eudev)) (rules udev-configuration-rules ;list of file-like - (default '()))) + (default '())) + (hardware udev-configuration-hardware ;list of file-like + (default '()))) (define (udev-configurations-union subdirectory packages) - "Return the union of the lib/udev/SUBDIRECTORY.d directories found in each + "Return the union of the lib/udev/SUBDIRECTORY directories found in each item of PACKAGES." (define build (with-imported-modules '((guix build union) @@ -2247,8 +2254,8 @@ (define (udev-configurations-union subdirectory packages) (srfi srfi-26)) (define %standard-locations - '(#$(string-append "/lib/udev/" subdirectory ".d") - #$(string-append "/libexec/udev/" subdirectory ".d"))) + '(#$(string-append "/lib/udev/" subdirectory) + #$(string-append "/libexec/udev/" subdirectory))) (define (configuration-sub-directory directory) ;; Return the sub-directory of DIRECTORY containing udev @@ -2264,7 +2271,7 @@ (define (udev-configurations-union subdirectory packages) (define (udev-rules-union packages) "Return the union of the lib/udev/rules.d directories found in each item of PACKAGES." - (udev-configurations-union "rules" packages)) + (udev-configurations-union "rules.d" packages)) (define (udev-configuration-file subdirectory file-name contents) "Return a directory with a udev configuration file FILE-NAME containing CONTENTS." @@ -2272,7 +2279,11 @@ (define (udev-configuration-file subdirectory file-name contents) (define (udev-rule file-name contents) "Return a directory with a udev rule file FILE-NAME containing CONTENTS." - (udev-configuration-file "rules" file-name contents)) + (udev-configuration-file "rules.d" 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)) (define (file->udev-configuration-file subdirectory file-name file) "Return a directory with a udev configuration file FILE-NAME which is a copy @@ -2285,8 +2296,7 @@ (define (file->udev-configuration-file subdirectory file-name file) (define configuration-directory (string-append #$output "/lib/udev/" - #$subdirectory - ".d")) + #$subdirectory)) (define file-copy-dest (string-append configuration-directory "/" #$file-name)) @@ -2296,7 +2306,11 @@ (define (file->udev-configuration-file subdirectory file-name file) (define (file->udev-rule file-name file) "Return a directory with a udev rule file FILE-NAME which is a copy of FILE." - (file->udev-configuration-file "rules" file-name file)) + (file->udev-configuration-file "rules.d" 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)) (define kvm-udev-rule ;; Return a directory with a udev rule that changes the group of /dev/kvm to @@ -2405,13 +2419,27 @@ (define udev.conf (define (udev-etc config) (match-record config - (udev rules) + (udev rules hardware) + (let* ((hardware + (udev-configurations-union "hwdb.d" (cons* udev hardware))) + (hwdb.bin + (computed-file + "hwdb.bin" + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + (setenv "UDEV_HWDB_PATH" #$hardware) + (invoke #+(file-append udev "/bin/udevadm") + "hwdb" + "--update" + "-o" #$output)))))) `(("udev" ,(file-union "udev" `(("udev.conf" ,udev.conf) ("rules.d" ,(udev-rules-union (cons* udev kvm-udev-rule - rules))))))))) + rules))) + ("hwdb.bin" ,hwdb.bin)))))))) (define udev-service-type (service-type (name 'udev) @@ -2420,12 +2448,15 @@ (define udev-service-type udev-shepherd-service) (service-extension etc-service-type udev-etc))) (compose concatenate) ;concatenate the list of rules - (extend (lambda (config rules) + (extend (lambda (config extensions) (let ((initial-rules - (udev-configuration-rules config))) + (udev-configuration-rules config)) + (initial-hardware + (udev-configuration-hardware config))) (udev-configuration (inherit config) - (rules (append initial-rules rules)))))) + (rules (append initial-rules extensions)) + (hardware (append initial-hardware extensions)))))) (default-value (udev-configuration)) (description "Run @command{udev}, which populates the @file{/dev} @@ -2460,6 +2491,19 @@ (define* (udev-rules-service name rules #:key (groups '())) (description "This service adds udev rules.")))) (service type #f))) +(define (udev-hardware-service name hardware-files) + "Return a service that extends udev-service-type with HARDWARE-FILES, named +NAME-udev-hardware." + (let* ((name (symbol-append name '-udev-hardware)) + (udev-extension (const (list hardware-files))) + (type (service-type + (name name) + (extensions (list + (service-extension + udev-service-type udev-extension))) + (description "This service adds udev hardware files.")))) + (service type #f))) + (define (swap-space->shepherd-service-name space) (let ((target (swap-space-target space))) (symbol-append 'swap- -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 10 15:33:22 2023 Received: (at 66099) by debbugs.gnu.org; 10 Oct 2023 19:33:22 +0000 Received: from localhost ([127.0.0.1]:36919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqITp-0008L1-Ng for submit@debbugs.gnu.org; Tue, 10 Oct 2023 15:33:21 -0400 Received: from planete-kraus.eu ([89.234.140.182]:33880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqITl-0008KX-Gv for 66099@debbugs.gnu.org; Tue, 10 Oct 2023 15:33:18 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 1d48f7c3; Tue, 10 Oct 2023 19:32:54 +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=0AUk4LfgvemuRiq7Ywyf4FhmA3g=; b=P 74CcKjXiG1zMT7TkHSpeqn5tkdpDBuEl3TtOlQMd/wEl1PLBMUgDXf0CA5tyk9AC 487xa9dB9NOOiO20l3UuG3pfOvUtreb0CHr43MM4htltd8Did+tRmqCYJkLXPJhg sMdMDMMvBWcIDc272D6hXpJIWl6huqgBMTaC2fo4/gwYi8Zr7leWZsLJZPMnIG+M oJL0/BJSkLQAEXO2DfSasAbi9TzgGR7TMxGpQl01zOBTn5JP3ENHTHJnpVMzfQI5 MK/Mx8XjyocCfBMAOX+kIphp5i4CL8cgLt7UIxxrxRC9iKdkwrd8DAO5scVdM2Da uDH/u3k0vA0a13qSD1emg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id ad5eed02 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 10 Oct 2023 19:32:54 +0000 (UTC) Message-ID: <70ae450282e2411c5506447c79adf6a62345344c.1696966139.git.vivien@planete-kraus.eu> In-Reply-To: <4744acd296e1c2f5d3f9f14c7cfba3e3696dcac7.1696966139.git.vivien@planete-kraus.eu> References: <87mswte1rx.fsf@gmail.com> <4744acd296e1c2f5d3f9f14c7cfba3e3696dcac7.1696966139.git.vivien@planete-kraus.eu> From: Vivien Kraus Date: Thu, 5 Oct 2023 19:33:24 +0200 Subject: [PATCH gnome-team v10 2/6] services: udev: Rewrite udev-rule to use file->udev-rule. To: Maxim Cournoyer ,Liliana Marie Prikler ,66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/services/base.scm (udev-rule): Use file->udev-rule. --- gnu/services/base.scm | 14 + 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 98d59fd36d..8b54f30ef6 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2262,19 +2262,7 @@ (define (udev-rules-union [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/services/base.scm (udev-rule): Use file->udev-rule. --- gnu/services/base.scm | 14 + 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 98d59fd36d..8b54f30ef6 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2262,19 +2262,7 @@ (define (udev-rules-union [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/services/base.scm (udev-rule): Use file->udev-rule. --- gnu/services/base.scm | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 98d59fd36d..8b54f30ef6 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2262,19 +2262,7 @@ (define (udev-rules-union packages) (define (udev-rule file-name contents) "Return a directory with a udev rule file FILE-NAME containing CONTENTS." - (computed-file file-name - (with-imported-modules '((guix build utils)) - #~(begin - (use-modules (guix build utils)) - - (define rules.d - (string-append #$output "/lib/udev/rules.d")) - - (mkdir-p rules.d) - (call-with-output-file - (string-append rules.d "/" #$file-name) - (lambda (port) - (display #$contents port))))))) + (file->udev-rule file-name (plain-file file-name contents))) (define (file->udev-rule file-name file) "Return a directory with a udev rule file FILE-NAME which is a copy of FILE." -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 10 15:33:29 2023 Received: (at 66099) by debbugs.gnu.org; 10 Oct 2023 19:33:30 +0000 Received: from localhost ([127.0.0.1]:36922 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqITu-0008LN-2H for submit@debbugs.gnu.org; Tue, 10 Oct 2023 15:33:29 -0400 Received: from planete-kraus.eu ([89.234.140.182]:33880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqITo-0008KX-H5 for 66099@debbugs.gnu.org; Tue, 10 Oct 2023 15:33:24 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id fa083662; Tue, 10 Oct 2023 19:32:57 +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=Qr+lhBDDPXg/PsFm3Seq8eSXinQ=; b=V LOJMKsa4XfhmsWc4pVAj4+DDGThq8pyjoSHrs44sp1gmjR9inYhnDaiFC4TuRb35 uS/2uLcJ9V0Us8+YRVyEHAhwwcEKJ5FxBbwiIniP2zmHjr8oHSTCHQ4ltpQRoAFT zVo8cqUsN6popvbjZWYxrd5Tv+gMcIJZaP1TY/HT0agdEs3ZoW0b6pC1zCeftYnw tWKc2WosFmXe4DvTOaLT7bW+6Fi5ByrKPECh7OcbPe/Sf7cmUdWQ/31gqp8+xw2C PYsq17y+uzkvFbn7fl0wCmg+9GaKajYEmYQ+cRyks0eN67XaGEzZcNsUVzzHBmxS 4IQCuFQjQo4Amj6ovj5rQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 18b4b678 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 10 Oct 2023 19:32:57 +0000 (UTC) Message-ID: <4744acd296e1c2f5d3f9f14c7cfba3e3696dcac7.1696966139.git.vivien@planete-kraus.eu> In-Reply-To: References: <87mswte1rx.fsf@gmail.com> From: Vivien Kraus Date: Tue, 19 Sep 2023 13:23:22 +0200 Subject: [PATCH gnome-team v10 1/6] gnu: eudev: Update to 3.2.14. To: Maxim Cournoyer ,Liliana Marie Prikler ,66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Eudev now has a hardware database /etc/udev/hwdb.bin made up of descriptions installed in the /lib/udev/hwdb.d directory of each package, and more generally, UDEV_HWDB_PATH. This database index is com [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Eudev now has a hardware database /etc/udev/hwdb.bin made up of descriptions installed in the /lib/udev/hwdb.d directory of each package, and more generally, UDEV_HWDB_PATH. This database index is com [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Eudev now has a hardware database /etc/udev/hwdb.bin made up of descriptions installed in the /lib/udev/hwdb.d directory of each package, and more generally, UDEV_HWDB_PATH. This database index is compiled with udevadm hwdb --update. The udev-service-type collects the files and compiles the index. Previously, the hardware description files provided by eudev would be compiled into $prefix/etc/udev/hwdb.bin in the eudev output. * gnu/packages/linux.scm (eudev): Update to 3.2.14. [modules]: Import (guix build utils). [#:phases] : New phase. : New phase. : Remove phase. [#:configure-flags]: Set sysconfdir to avoid a prefix. [native-search-paths]: Add UDEV_HWDB_PATH. * gnu/packages/patches/eudev-rules-directory.patch: Rebase it. --- gnu/packages/linux.scm | 57 +++++++++++++------ .../patches/eudev-rules-directory.patch | 9 +-- 2 files changed, 45 insertions(+), 21 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c993e7b9bb..c5049843eb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4327,10 +4327,9 @@ (define-public earlyoom (license license:expat))) (define-public eudev - ;; The post-systemd fork, maintained by Gentoo. (package (name "eudev") - (version "3.2.11") + (version "3.2.14") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/gentoo/eudev") @@ -4338,8 +4337,9 @@ (define-public eudev (file-name (git-file-name name version)) (sha256 (base32 - "0dzaqwjnl55f69ird57wb6skahc6l7zs1slsrzqqfhww33icp6av")) - (patches (search-patches "eudev-rules-directory.patch")))) + "1f6lz57igi7iw2ls3fpzgw42bfznam4nf9368h7x8yf1mb737yxz")) + (patches (search-patches "eudev-rules-directory.patch")) + (modules '((guix build utils))))) (build-system gnu-build-system) (arguments (list @@ -4350,6 +4350,31 @@ (define-public eudev (substitute* "man/make.sh" (("/usr/bin/xsltproc") (search-input-file (or native-inputs inputs) "/bin/xsltproc"))))) + (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. + (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 "include ./files.am"))) + (substitute* "hwdb/files.am" + (("dist_udevhwdb_DATA =") + "dist_hardwarelib_DATA =")) + ;; Do not install the empty udev.conf template. + (substitute* "src/udev/Makefile.am" + (("dist_udevconf_DATA =") + "dist_noinst_DATA =")) + ;; Do not ensure that /etc/udev/rules.d exists. + (substitute* "rules/Makefile.am" + (("\\$\\(MKDIR_P\\) \\$\\(DESTDIR\\)\\$\\(udevconfdir\\)/rules\\.d") + "true")))) (add-after 'install 'move-static-library (lambda _ (let ((source (string-append #$output "/lib/libudev.a")) @@ -4361,19 +4386,17 @@ (define-public eudev ;; such that Libtool looks for it in the usual places. (substitute* (string-append #$output "/lib/libudev.la") (("old_library=.*") - "old_library=''\n"))))) - (add-after 'install 'build-hwdb - (lambda _ - ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and - ;; similar tools to display product names. - ;; - ;; XXX: This can't be done when cross-compiling. Find another way - ;; to generate hwdb.bin for cross-built systems. - #$@(if (%current-target-system) - #~(#t) - #~((invoke (string-append #$output "/bin/udevadm") - "hwdb" "--update")))))) - #:configure-flags #~(list "--enable-manpages"))) + "old_library=''\n")))))) + #:configure-flags + #~(list "--enable-manpages" + ;; By default, autoconf uses $prefix/etc. The udev-service-type + ;; makes sure /etc is set up with rules and hardware file + ;; descriptions. + "--sysconfdir=/etc"))) + (native-search-paths + (list (search-path-specification + (variable "UDEV_HWDB_PATH") + (files '("lib/udev/hwdb.d"))))) (native-inputs (list autoconf automake diff --git a/gnu/packages/patches/eudev-rules-directory.patch b/gnu/packages/patches/eudev-rules-directory.patch index 54fc01c6d5..c4b1cfae39 100644 --- a/gnu/packages/patches/eudev-rules-directory.patch +++ b/gnu/packages/patches/eudev-rules-directory.patch @@ -4,9 +4,9 @@ The old udev 182 supported $UDEV_CONFIG_FILE, which in turn allowed the search path to be customized, but eudev no longer has this, hence this hack. ---- eudev-3.1.5/src/udev/udev-rules.c 2015-10-13 06:22:14.000000000 +0800 -+++ eudev-3.1.5/src/udev/udev-rules.c 2015-10-16 20:45:38.491934336 +0800 -@@ -47,15 +47,11 @@ +--- a/src/udev/udev-rules.c ++++ b/src/udev/udev-rules.c +@@ -48,16 +48,11 @@ struct uid_gid { }; }; @@ -20,11 +20,12 @@ this hack. - "/lib/udev/rules.d", - "/usr/lib/udev/rules.d", -#endif +- "/usr/local/lib/udev/rules.d", + NULL, /* placeholder for $EUDEV_RULES_DIRECTORY */ NULL}; struct udev_rules { -@@ -1704,6 +1700,9 @@ +@@ -1718,6 +1713,9 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) { udev_rules_check_timestamp(rules); -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 10 15:33:30 2023 Received: (at 66099) by debbugs.gnu.org; 10 Oct 2023 19:33:30 +0000 Received: from localhost ([127.0.0.1]:36925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqITx-0008LT-Tz for submit@debbugs.gnu.org; Tue, 10 Oct 2023 15:33:30 -0400 Received: from planete-kraus.eu ([89.234.140.182]:33880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqITt-0008KX-3c for 66099@debbugs.gnu.org; Tue, 10 Oct 2023 15:33:25 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 135f774c; Tue, 10 Oct 2023 19:33:02 +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:mime-version :content-type:content-transfer-encoding:to:cc; s=albinoniB; bh=k kBNyYHA0aRWs6O3ft4gRdcb8NA=; b=sc9V4E3nObmJUulnMKHKhXIuDlXEXGBHL JOvcFLnK8uSpsjnvg/nW3Gh2XqTMlQxS1l3uWNEn8z22eHKMnIJ2cfpzADlwwyhm st3Nkoqh0Zvs1OxPE1l6TNAzspovBPKgbNvNUTg+v7GtgFeGYBtHkISnozLO20HM hQT4ucU62J0I7v1kxf+T7fFI8NiUet6kVlo76HGlTM2SFBpJxkizG1+y+5DHSHyS 0IZrR4mE8rE7tJGbQQJAdbhNq8eUffQfyf2Mv8XmP7uJsHxP6bCewYW5N7x18C5f oBiGre/6YI1FbvWVxmk5tJmPGLEC5meJU1mIZvDb0JOFSGR4bQBtw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 10bfa047 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 10 Oct 2023 19:33:01 +0000 (UTC) Message-ID: In-Reply-To: <87mswte1rx.fsf@gmail.com> References: <87mswte1rx.fsf@gmail.com> From: Vivien Kraus Date: Tue, 10 Oct 2023 21:28:58 +0200 Subject: [PATCH gnome-team v10 0/6] Exact same, without the last patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: Maxim Cournoyer ,Liliana Marie Prikler ,66099@debbugs.gnu.org User-Agent: Evolution 3.46.4 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Dear guix, Here is the exact same series, rebased on top of gnome-team, without the last patch: the hwdb.d directory is kept as-is. (the base-commit tag below has been updated too) Best regards, Vivien Vivien Kraus (6): gnu: eudev: Update to 3.2.14. services: udev: Rewrite udev-rule to use file->udev-rule. services: udev: Make udev-rule helper functions generic. gnu: udev-service-type: accept hardware description file extensions. gnu: libgudev: Update to 238. gnu: upower: Update to 1.90.2. doc/guix.texi | 57 +++++++-- gnu/packages/gnome.scm | 43 ++++--- gnu/packages/linux.scm | 57 ++++++--- .../patches/eudev-rules-directory.patch | 9 +- gnu/services/base.scm | 116 +++++++++++++----- 5 files changed, 199 insertions(+), 83 deletions(-) base-commit: d6462be6a83bf33b569980734fb7ee23836c91a0 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 10 15:33:35 2023 Received: (at 66099) by debbugs.gnu.org; 10 Oct 2023 19:33:36 +0000 Received: from localhost ([127.0.0.1]:36928 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqIU3-0008Lw-Bd for submit@debbugs.gnu.org; Tue, 10 Oct 2023 15:33:35 -0400 Received: from planete-kraus.eu ([89.234.140.182]:33880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqITx-0008KX-HX for 66099@debbugs.gnu.org; Tue, 10 Oct 2023 15:33:30 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 64571b6c; Tue, 10 Oct 2023 19:33:06 +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=PVY0dkxKH7fADxZD/9kSDthztj4=; b=Z iZn0fI4ywJ/QLCvb6ltP1RZo7k9mpjeA/dFZhUdQloRJHsejitYVu5ckNAFqRRep ZDXs3ilEubFxUuMIOebNYfHrRkBgL3SPPjFSWwke63ruukkCH9bvmtFcGEGae0ms GkbQAGJyddE2H4zJv1CmdskAeSfjn3lCv/QrdMkzwudpoiYaEgGTs2MR8ihCBf2K qTAGe0zqbcJ0CVAYnsN7WH8Gu13yJ4GmReklKIULkkS/YDfeo6kvzNJyHeLUQf5v DDLYGwnrQ1bM9fkFUpkjNmCIPiGPsL20jfoWk/UzEgellCUmRNx0BEW9U6LSb3qj Sox704PvclRaEdBQfiQqg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 8ce46c0e (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 10 Oct 2023 19:33:06 +0000 (UTC) Message-ID: In-Reply-To: <70ae450282e2411c5506447c79adf6a62345344c.1696966139.git.vivien@planete-kraus.eu> References: <87mswte1rx.fsf@gmail.com> <4744acd296e1c2f5d3f9f14c7cfba3e3696dcac7.1696966139.git.vivien@planete-kraus.eu> <70ae450282e2411c5506447c79adf6a62345344c.1696966139.git.vivien@planete-kraus.eu> From: Vivien Kraus Date: Thu, 5 Oct 2023 19:24:56 +0200 Subject: [PATCH gnome-team v10 3/6] services: udev: Make udev-rule helper functions generic. To: Maxim Cournoyer ,Liliana Marie Prikler ,66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/services/base.scm (udev-configurations-union): New function. (udev-configuration-file): New function, use file->udev-configuration-file. (file->udev-configuration-file): New function. (udev-rule [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/services/base.scm (udev-configurations-union): New function. (udev-configuration-file): New function, use file->udev-configuration-file. (file->udev-configuration-file): New function. (udev-rule [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/services/base.scm (udev-configurations-union): New function. (udev-configuration-file): New function, use file->udev-configuration-file. (file->udev-configuration-file): New function. (udev-rules-union): Use udev-configurations-union. (udev-rule): Use udev-configuration-file. (file->udev-rule): Use file->udev-configuration-file. --- gnu/services/base.scm | 50 +++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 8b54f30ef6..10e7383475 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2234,9 +2234,9 @@ (define-record-type* (rules udev-configuration-rules ;list of file-like (default '()))) -(define (udev-rules-union packages) - "Return the union of the @code{lib/udev/rules.d} directories found in each -item of @var{packages}." +(define (udev-configurations-union subdirectory packages) + "Return the union of the lib/udev/SUBDIRECTORY.d directories found in each +item of PACKAGES." (define build (with-imported-modules '((guix build union) (guix build utils)) @@ -2247,39 +2247,57 @@ (define (udev-rules-union packages) (srfi srfi-26)) (define %standard-locations - '("/lib/udev/rules.d" "/libexec/udev/rules.d")) + '(#$(string-append "/lib/udev/" subdirectory ".d") + #$(string-append "/libexec/udev/" subdirectory ".d"))) - (define (rules-sub-directory directory) - ;; Return the sub-directory of DIRECTORY containing udev rules, or - ;; #f if none was found. + (define (configuration-sub-directory directory) + ;; Return the sub-directory of DIRECTORY containing udev + ;; configurations, or #f if none was found. (find directory-exists? (map (cut string-append directory <>) %standard-locations))) (union-build #$output - (filter-map rules-sub-directory '#$packages))))) + (filter-map configuration-sub-directory '#$packages))))) + + (computed-file (string-append "udev-" subdirectory) build)) - (computed-file "udev-rules" build)) +(define (udev-rules-union packages) + "Return the union of the lib/udev/rules.d directories found in each +item of PACKAGES." + (udev-configurations-union "rules" packages)) + +(define (udev-configuration-file subdirectory file-name contents) + "Return a directory with a udev configuration file FILE-NAME containing CONTENTS." + (file->udev-configuration-file subdirectory file-name (plain-file file-name contents))) (define (udev-rule file-name contents) "Return a directory with a udev rule file FILE-NAME containing CONTENTS." - (file->udev-rule file-name (plain-file file-name contents))) + (udev-configuration-file "rules" file-name contents)) -(define (file->udev-rule file-name file) - "Return a directory with a udev rule file FILE-NAME which is a copy of FILE." +(define (file->udev-configuration-file subdirectory file-name file) + "Return a directory with a udev configuration file FILE-NAME which is a copy + of FILE." (computed-file file-name (with-imported-modules '((guix build utils)) #~(begin (use-modules (guix build utils)) - (define rules.d - (string-append #$output "/lib/udev/rules.d")) + (define configuration-directory + (string-append #$output + "/lib/udev/" + #$subdirectory + ".d")) (define file-copy-dest - (string-append rules.d "/" #$file-name)) + (string-append configuration-directory "/" #$file-name)) - (mkdir-p rules.d) + (mkdir-p configuration-directory) (copy-file #$file file-copy-dest))))) +(define (file->udev-rule file-name file) + "Return a directory with a udev rule file FILE-NAME which is a copy of FILE." + (file->udev-configuration-file "rules" file-name file)) + (define kvm-udev-rule ;; Return a directory with a udev rule that changes the group of /dev/kvm to ;; "kvm" and makes it #o660. Apparently QEMU-KVM used to ship this rule, -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 10 15:33:36 2023 Received: (at 66099) by debbugs.gnu.org; 10 Oct 2023 19:33:36 +0000 Received: from localhost ([127.0.0.1]:36930 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqIU3-0008Lz-QI for submit@debbugs.gnu.org; Tue, 10 Oct 2023 15:33:36 -0400 Received: from planete-kraus.eu ([89.234.140.182]:33880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqIU1-0008KX-Hc for 66099@debbugs.gnu.org; Tue, 10 Oct 2023 15:33:34 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 4abada53; Tue, 10 Oct 2023 19:33:10 +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=HYztRqrZPcoGi5Fi7TnaZjA46pE=; b=h PETakZwSAYsNKYCz9Kt5fO4ZLufHX5K636XxvQFi08xa6tzq1z416vDyDXq6NwyN 3bJqxe+KNfKcf2pJhVU62R69WvRTMehZceZDPKmMDiW8snZAbNsW9so/1O54aQE4 QEwTWl8RlUD0sgCcbYt9V6U0dAkZoWa0GGnuAqFCX8rKVYJ6CkfJLdzRG59aYV8r yD/7W79lA935wfydKgDJ57YhIf/gqZIFjgR98x6/QoP2wwIHDhGfk1pUj7qxf2p7 RIsoyqUdzJof9mHU5/5emM6FWMVrDAbaFRbckzwMu5fI3WmCtqb3Y76HAg3kN5U/ QJv0cbUrjCnqno8KitmrA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 0774ef54 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 10 Oct 2023 19:33:09 +0000 (UTC) Message-ID: <1fafc7eb50f13e1e500871ae9189876e3861b45b.1696966139.git.vivien@planete-kraus.eu> In-Reply-To: References: <87mswte1rx.fsf@gmail.com> <4744acd296e1c2f5d3f9f14c7cfba3e3696dcac7.1696966139.git.vivien@planete-kraus.eu> <70ae450282e2411c5506447c79adf6a62345344c.1696966139.git.vivien@planete-kraus.eu> From: Vivien Kraus Date: Tue, 19 Sep 2023 13:32:26 +0200 Subject: [PATCH gnome-team v10 5/6] gnu: libgudev: Update to 238. To: Maxim Cournoyer ,Liliana Marie Prikler ,66099@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4ed22d4da0..d8cdd11bd4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-pl [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4ed22d4da0..d8cdd11bd4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-pl [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4ed22d4da0..d8cdd11bd4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-plugins (define-public libgudev (package (name "libgudev") - (version "236") + (version "238") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "094mgjmwgsgqrr1i0vd20ynvlkihvs3vgbmpbrhswjsrdp86j0z5")))) + "1laxgdkgmr30aw44sm4rgpsdybwxx5rszcm8c2y3vmy9myqnl9k1")))) (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 10 15:33:44 2023 Received: (at 66099) by debbugs.gnu.org; 10 Oct 2023 19:33:44 +0000 Received: from localhost ([127.0.0.1]:36933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqIUC-0008MO-6Z for submit@debbugs.gnu.org; Tue, 10 Oct 2023 15:33:44 -0400 Received: from planete-kraus.eu ([89.234.140.182]:33880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqIU6-0008KX-Hl for 66099@debbugs.gnu.org; Tue, 10 Oct 2023 15:33:39 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 7772bdbb; Tue, 10 Oct 2023 19:33:15 +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:mime-version :content-type:content-transfer-encoding:to:cc; s=albinoniB; bh=p E1Kwtt6HSrQboztKcDKXFr0xrc=; b=unCYHe3aCxskhHBXqvKc1/MoFE02Zk3Sp tjF0pvFsY+QNSulA2GXGLruJCE7WWyl3Zko5l/QwJWuyx7GcAddKhK0dS17hXpHQ R8vANAb00ye6INb+qP5/FClLMNoL/JfEoEaxBDhaBJe/yTefODwm8eTQh7H5nJGC iMTUbqQ+4WJSVIHQTDrqbbSR1i5qi/v2VQIdrSKNrlXbWZTKF0b1zre6GpN9WDU/ 9XMIJvmE4B7gpyIce1aPgcvbNnvttMaOA1ry10Zd4MXTHZm/b4G0BfZpbs7zrG07 vtZTi/USMsEfiXMVwbyu7AvQ95dQaie1XPdDw0J438lF4gqFYRCVA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id d19e9222 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 10 Oct 2023 19:33:15 +0000 (UTC) Message-ID: <7ae77396bb22ea658a297e484204ed66e4636a12.1696966139.git.vivien@planete-kraus.eu> In-Reply-To: <1fafc7eb50f13e1e500871ae9189876e3861b45b.1696966139.git.vivien@planete-kraus.eu> References: <87mswte1rx.fsf@gmail.com> <4744acd296e1c2f5d3f9f14c7cfba3e3696dcac7.1696966139.git.vivien@planete-kraus.eu> <70ae450282e2411c5506447c79adf6a62345344c.1696966139.git.vivien@planete-kraus.eu> <1fafc7eb50f13e1e500871ae9189876e3861b45b.1696966139.git.vivien@planete-kraus.eu> From: Vivien Kraus Date: Tue, 19 Sep 2023 13:32:46 +0200 Subject: [PATCH gnome-team v10 6/6] gnu: upower: Update to 1.90.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: Maxim Cournoyer ,Liliana Marie Prikler ,66099@debbugs.gnu.org User-Agent: Evolution 3.46.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Upower has an extra hardware description file for use with udev. It should be installed under upower’s output, not eudev’s. A test is disabled, for calling an unimplemented bluez method. The conditional 'adjust-test-for-excess-precision phase is included in the new 'adjust-test-suite, so that the list of phases is always t [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 66099 Cc: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Upower has an extra hardware description file for use with udev. It should be installed under upower’s output, not eudev’s. A test is disabled, for calling an unimplemented bluez method. The conditional 'adjust-test-for-excess-precision phase is included in the new 'adjust-test-suite, so that the list of phases is always t [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Upower has an extra hardware description file for use with udev. It should be installed under upower’s output, not eudev’s. A test is disabled, for calling an unimplemented bluez method. The conditional 'adjust-test-for-excess-precision phase is included in the new 'adjust-test-suite, so that the list of phases is always the same. * gnu/packages/gnome.scm (upower): Update to 1.90.2. [#:configure-flags]: Set udevhwdbdir. [#:phases] : Add this phase unconditionnally : Disable test_bluetooth_hidpp_mouse. [inputs]: Remove dbus-glib. [native-inputs]: Add dbus. --- gnu/packages/gnome.scm | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d8cdd11bd4..6e3933ec96 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5727,7 +5727,7 @@ (define-public geocode-glib-with-libsoup2 (define-public upower (package (name "upower") - (version "1.90.0") + (version "1.90.2") (source (origin (method git-fetch) @@ -5736,7 +5736,7 @@ (define-public upower (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1g17rm91p8vfpjyb0k2shylrs55nccn3fa890vlk4n9s71sghbzq")) + (base32 "13xp423ycv8imf2cmgf6lii9f01p7x2v19cny7acrmczkc0cqv7d")) (modules '((guix build utils))) (snippet ;; Upstream commit . - (substitute* "src/linux/integration-test.py" - (("assertEqual(.*)40\\.0" _ middle) - (string-append - "assertAlmostEqual" middle "40.0")))))) - #~%standard-phases))) + (string-append "-Dudevrulesdir=" #$output "/bin/udev/rules.d") + (string-append "-Dudevhwdbdir=" #$output "/lib/udev/hwdb.d")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'adjust-test-suite + (lambda _ + ;; This test calls an unimplemented bluez dbus method. + (substitute* "src/linux/integration-test.py" + (("test_bluetooth_hidpp_mouse") + "disabled_test_bluetooth_hidpp_mouse")) + #$@(if (target-x86-32?) + ;; Address test failure caused by excess precision + ;; on i686: + ;; . + '((substitute* "src/linux/integration-test.py" + (("assertEqual(.*)40\\.0" _ middle) + (string-append + "assertAlmostEqual" middle "40.0")))) + '())))))) (native-inputs (list `(,glib "bin") ; for gdbus-codegen gobject-introspection @@ -5785,12 +5791,13 @@ (define-public upower python-packaging python-pygobject umockdev + dbus ;; For man pages. docbook-xsl libxslt ; for 'xsltproc' libxml2)) ; for 'XML_CATALOG_FILES' (inputs - (list dbus-glib libgudev libusb)) + (list libgudev libusb)) (propagated-inputs ;; In Requires of upower-glib.pc. (list glib)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 10 19:45:06 2023 Received: (at 66099) by debbugs.gnu.org; 10 Oct 2023 23:45:06 +0000 Received: from localhost ([127.0.0.1]:37167 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqMPS-000381-6o for submit@debbugs.gnu.org; Tue, 10 Oct 2023 19:45:06 -0400 Received: from mail-qv1-xf2d.google.com ([2607:f8b0:4864:20::f2d]:42392) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqMPP-00037F-Sa for 66099@debbugs.gnu.org; Tue, 10 Oct 2023 19:45:04 -0400 Received: by mail-qv1-xf2d.google.com with SMTP id 6a1803df08f44-65af8d30b33so3577106d6.1 for <66099@debbugs.gnu.org>; Tue, 10 Oct 2023 16:44:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696981476; x=1697586276; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=dNwYa+qZ48cpJKHEFiD3bcSPHBkhb6/n94CKE6n/tM8=; b=fDZId8OFOQGf/sAXLJ8HApIU0cla6dmZgGC/6LdbhGhgb6+lUwaSUtsuKwnm4Frh7K q3VS6JwoTVxHpN5Jk1iC5dk9V6w0Jo+Ay++7SdllMdmVc59WefvwqsbbbT0dbXqwZRVQ 3Vn+PjyhOYVROxKQpyFL9fiqp4EMOOjm9mwelj/JzmavFh011yr+cUQM24RlTZsJLRwc 4oEURo1NT9p9fsQ5zeYmKKELudsGNWzS+XpB11GS16X7uzDKO9mUCqRGDh/z9pYhXK4t TMkZkZx+5ML+mFjvk+R+i50ZQS8h33FVYwE0IWgq3fPWg/gHlnE18mKOAGvFNWLr/Izo /TcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696981476; x=1697586276; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=dNwYa+qZ48cpJKHEFiD3bcSPHBkhb6/n94CKE6n/tM8=; b=ZRo+bvz/iHyRTbjlbUB9h9GRHfdH1C9pRN4EHUkZKKRE2RjHIn5JV+Mr1vVCoCuJQh 8GbuL1DSzN6/O+9IyMDmF9Vh2v92KfJkLEWZEXW7SLjhsRQrN3DS64zhdF9fNnw6JKvB UlaQkG78Hq9RAWlLgkeBwxRyQuLIvEXLpYOa3ljjinDIeXKKgLH9/ghWw5alWWlYthfJ pGvhXn4CrK73eEasZgROvgN7OcvBVU1BwTTZu1sVGyOcXkDI+CnJ3FBYVVJKXGGHksYw WCKyDWYFp5i/Z5c92D0KG4U7+11+hcRpfi6P2WZCCOlzgXRc49QYsOmmy51PaFJR6Fxe 63Iw== X-Gm-Message-State: AOJu0Yyk2BS97f9HU32g2lyN4TkY0rEAspxpLAqDX5ZoYlB0pQ3zBhw8 ROk+1ok4+M93L5j/uRwGBqHwTmlRTOOqFQ== X-Google-Smtp-Source: AGHT+IG7DJefYbuhxb9m3Itwe6hUCrt9GbrPnT/IjVzNggu/9HCo4M3x8qjbM+BP2rUtJrw+UWS/jQ== X-Received: by 2002:a0c:ac45:0:b0:65a:f253:24d with SMTP id m5-20020a0cac45000000b0065af253024dmr21326435qvb.20.1696981476550; Tue, 10 Oct 2023 16:44:36 -0700 (PDT) Received: from hurd (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id a13-20020a0ce34d000000b006516780a0a5sm5129052qvm.117.2023.10.10.16.44.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 16:44:35 -0700 (PDT) From: Maxim Cournoyer To: Vivien Kraus Subject: Re: [PATCH gnome-team v10 0/6] Exact same, without the last patch In-Reply-To: (Vivien Kraus's message of "Tue, 10 Oct 2023 21:28:58 +0200") References: <87mswte1rx.fsf@gmail.com> Date: Tue, 10 Oct 2023 19:44:34 -0400 Message-ID: <87mswqf3fh.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099 Cc: 66099@debbugs.gnu.org, Liliana Marie Prikler , rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Vivien Kraus writes: > Dear guix, > > Here is the exact same series, rebased on top of gnome-team, without the last > patch: the hwdb.d directory is kept as-is. > > (the base-commit tag below has been updated too) > > Best regards, > > Vivien > > Vivien Kraus (6): > gnu: eudev: Update to 3.2.14. > services: udev: Rewrite udev-rule to use file->udev-rule. > services: udev: Make udev-rule helper functions generic. > gnu: udev-service-type: accept hardware description file extensions. > gnu: libgudev: Update to 238. > gnu: upower: Update to 1.90.2. This series LGTM! -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 11 00:19:11 2023 Received: (at 66099-done) by debbugs.gnu.org; 11 Oct 2023 04:19:11 +0000 Received: from localhost ([127.0.0.1]:37299 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqQgg-000764-Va for submit@debbugs.gnu.org; Wed, 11 Oct 2023 00:19:11 -0400 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]:56631) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqQgc-00075S-Vh for 66099-done@debbugs.gnu.org; Wed, 11 Oct 2023 00:19:09 -0400 Received: by mail-ej1-x641.google.com with SMTP id a640c23a62f3a-9b974955474so1065706166b.1 for <66099-done@debbugs.gnu.org>; Tue, 10 Oct 2023 21:18:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696997919; x=1697602719; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=rBf/pFnWxkW1SbRRZigDYo4d4IH1VIoKmhJOxl/WQLQ=; b=ZItOQw9TT4DvC+sgiuI5oFJwO4W3JxqkJHcH2W40/CCp/RhRgI9oOx3kjvcmrOwDNo VrWqaalKwtPG17vVpEnxEh1/9QG84gVxBPFgBm6VNF/AKYQBdcGIGhBEomzUwBrWXSWl GBiKprvy+ZVJEEsQ5/0Vb0vdfpupTPjZ4KMGDBPfTpeF3/bSbwGUgWkofEzY/N6OnHQR CdzTzlqnucLIkw/41CTvt0dwPXbzJ5aYCZztxpqINZPyilSIWFk2qOOs/1PCO0/Ml6uK ixdIbdN52PiY8ts/aHWTh4ZCBQn4rZmspJNsL8z+OLRX3JzaHhtOjF3WIWG1BTXNYv5U r2iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696997919; x=1697602719; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=rBf/pFnWxkW1SbRRZigDYo4d4IH1VIoKmhJOxl/WQLQ=; b=RerWDxmi9EudlFn2IU+Fnrxf2XUYbatejfrAaui/BsvaBHyfX+l1IikU2es3ndQoIb i3Ial64Tn8JXej7+ROibr1JRkcOre23j3TNiQeQs0oPqKKMYAJ3VomGAJPpGe8BdeE4/ 3wwkVhmM5MwyeGFWiALroeQjFvabI5dOrPOo3OF7an7i3jUlxdwYDRJm5U65tq32TLOT q+h/VyobJmO5U30RT9r4b/2Bg2GZKGUZ2r5ownPOcomdMzBUM3/fNIoasfxVvZHelPag gAhLiLojt072Kb3CLM/D6XFBlmt2CsIEv/tZo9gc6Q1QFfsa7oStNo8nWIt7MIanRf5S g6yA== X-Gm-Message-State: AOJu0YwtyXHBS2p5qDrndAi4jZmoG4UoPp8YRxFx25ktQhRrzQS/b708 1CIRCL47BeBfBuJRt+gw1kZyB/cCesJKWA== X-Google-Smtp-Source: AGHT+IE0L6Ezj+/jAsOkv+LMhbh5Gy7u2kx8/4gofvTWtOkIqbBhNvmSKYaPaAQzm2qbKtBUu236LA== X-Received: by 2002:a17:906:1daa:b0:9b8:b683:5854 with SMTP id u10-20020a1709061daa00b009b8b6835854mr17084793ejh.61.1696997918815; Tue, 10 Oct 2023 21:18:38 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id x26-20020a170906711a00b0099329b3ab67sm9256276ejj.71.2023.10.10.21.18.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 21:18:37 -0700 (PDT) Message-ID: Subject: Re: [PATCH gnome-team v10 0/6] Exact same, without the last patch From: Liliana Marie Prikler To: Maxim Cournoyer , Vivien Kraus Date: Wed, 11 Oct 2023 06:18:36 +0200 In-Reply-To: <87mswqf3fh.fsf@gmail.com> References: <87mswte1rx.fsf@gmail.com> <87mswqf3fh.fsf@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66099-done Cc: rg@raghavgururajan.name, 66099-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Dienstag, dem 10.10.2023 um 19:44 -0400 schrieb Maxim Cournoyer: > Hi, >=20 > Vivien Kraus writes: >=20 > > Dear guix, > >=20 > > Here is the exact same series, rebased on top of gnome-team, > > without the last patch: the hwdb.d directory is kept as-is. > >=20 > > (the base-commit tag below has been updated too) > >=20 > > Best regards, > >=20 > > Vivien > >=20 > > Vivien Kraus (6): > > =C2=A0 gnu: eudev: Update to 3.2.14. > > =C2=A0 services: udev: Rewrite udev-rule to use file->udev-rule. > > =C2=A0 services: udev: Make udev-rule helper functions generic. > > =C2=A0 gnu: udev-service-type: accept hardware description file > > extensions. > > =C2=A0 gnu: libgudev: Update to 238. > > =C2=A0 gnu: upower: Update to 1.90.2. >=20 > This series LGTM! Pushed to gnome-teams now. Thanks From unknown Fri Jun 20 07:09:54 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 08 Nov 2023 12:24:10 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator