diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-02-11 21:26:43 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-02-20 22:18:34 -0500 |
| commit | 5fed33113e52a2daf7e6a15c9826013ece1bda0e (patch) | |
| tree | 7758f6b25c269562aba4b11a5fca8d6f9bcda1f3 | |
| parent | 3d457dc5b1fa94f32d0fd0137b4926dbf0cc1bb0 (diff) | |
gnu: eudev: Update to 3.2.14.
* gnu/packages/linux.scm (eudev): Update to 3.2.14.
[arguments] <phases>: Specify --root argument for `udevadm' invocation.
[inputs]: Add zlib and zstd:lib.
* gnu/packages/patches/eudev-rules-directory.patch: Refresh patch.
Change-Id: I284be1574c0b22cd841acf5130bb0d1abd6c706b
| -rw-r--r-- | gnu/packages/linux.scm | 11 | ||||
| -rw-r--r-- | gnu/packages/patches/eudev-rules-directory.patch | 13 |
2 files changed, 15 insertions, 9 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4923552050..8b3001b5de 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4308,7 +4308,7 @@ to the in-kernel OOM killer.") ;; 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") @@ -4316,7 +4316,7 @@ to the in-kernel OOM killer.") (file-name (git-file-name name version)) (sha256 (base32 - "0dzaqwjnl55f69ird57wb6skahc6l7zs1slsrzqqfhww33icp6av")) + "1f6lz57igi7iw2ls3fpzgw42bfznam4nf9368h7x8yf1mb737yxz")) (patches (search-patches "eudev-rules-directory.patch")))) (build-system gnu-build-system) (arguments @@ -4350,7 +4350,7 @@ to the in-kernel OOM killer.") #$@(if (%current-target-system) #~(#t) #~((invoke (string-append #$output "/bin/udevadm") - "hwdb" "--update")))))) + "hwdb" "--update" "--root" #$output)))))) #:configure-flags #~(list "--enable-manpages"))) (native-inputs (list autoconf @@ -4370,7 +4370,10 @@ to the in-kernel OOM killer.") ;; and similar; it also installs the '60-persistent-storage.rules' file, ;; which contains the rules to do that. (list `(,util-linux "lib") ;for blkid - kmod)) + kmod + ;; These are for the static archives. + zlib + `(,zstd "lib"))) (outputs '("out" "static")) (home-page "https://wiki.gentoo.org/wiki/Project:Eudev") (synopsis "Userspace device management") diff --git a/gnu/packages/patches/eudev-rules-directory.patch b/gnu/packages/patches/eudev-rules-directory.patch index 54fc01c6d5..4a9bc33826 100644 --- a/gnu/packages/patches/eudev-rules-directory.patch +++ b/gnu/packages/patches/eudev-rules-directory.patch @@ -4,9 +4,11 @@ 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 @@ +diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c +index 3856686c8..0362abb04 100644 +--- a/src/udev/udev-rules.c ++++ b/src/udev/udev-rules.c +@@ -48,16 +48,11 @@ struct uid_gid { }; }; @@ -20,11 +22,12 @@ this hack. - "/lib/udev/rules.d", - "/usr/lib/udev/rules.d", -#endif -+ NULL, /* placeholder for $EUDEV_RULES_DIRECTORY */ +- "/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); |