diff options
author | Ludovic Courtès <ludo@gnu.org> | 2016-03-09 15:26:09 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2016-03-09 15:26:09 +0100 |
commit | 255f730879ec6b3b655a54b44374a3b0a905145c (patch) | |
tree | 8f91f18c5193c7fda669d6bb8b22568a942e8fdb /gnu/packages/linux.scm | |
parent | 297a36abfc2b177915206f5d1a49e008d96add3b (diff) | |
download | gnu-guix-255f730879ec6b3b655a54b44374a3b0a905145c.tar gnu-guix-255f730879ec6b3b655a54b44374a3b0a905145c.tar.gz |
gnu: eudev: Add dependency on blkid.
* gnu/packages/linux.scm (eudev)[inputs]: Add UTIL-LINUX.
(eudev-with-blkid): Remove.
* gnu/services/base.scm (udev-service): Use EUDEV instead of
EUDEV-WITH-BLKID.
* gnu/system.scm (%base-packages): Likewise.
Diffstat (limited to 'gnu/packages/linux.scm')
-rw-r--r-- | gnu/packages/linux.scm | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 37f161451e..688e1d43b5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1562,7 +1562,6 @@ from the module-init-tools project.") (define-public eudev ;; The post-systemd fork, maintained by Gentoo. - ;; TODO: Merge with 'eudev-with-blkid' below at an opportune time. (package (name "eudev") (version "3.1.5") @@ -1581,7 +1580,11 @@ from the module-init-tools project.") ("perl" ,perl) ("gperf" ,gperf))) (inputs - `(("kmod" ,kmod))) + ;; When linked against libblkid, eudev can populate /dev/disk/by-label + ;; and similar; it also installs the '60-persistent-storage.rules' file, + ;; which contains the rules to do that. + `(("util-linux" ,util-linux) ;for blkid + ("kmod" ,kmod))) (home-page "https://wiki.gentoo.org/wiki/Project:Eudev") (synopsis "Userspace device management") (description "Udev is a daemon which dynamically creates and removes @@ -1589,18 +1592,6 @@ device nodes from /dev/, handles hotplug events and loads drivers at boot time.") (license license:gpl2+))) -(define-public eudev-with-blkid - ;; TODO: Merge with 'eudev' above at an opportune time. - (package - (inherit eudev) - (name "eudev-with-blkid") - (inputs - ;; When linked against libblkid, eudev can populate /dev/disk/by-label - ;; and similar; it also installs the '60-persistent-storage.rules' file, - ;; which contains the rules to do that. - `(("util-linux" ,util-linux) ;for blkid - ,@(package-inputs eudev))))) - (define-public lvm2 (package (name "lvm2") |