From 255f730879ec6b3b655a54b44374a3b0a905145c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 9 Mar 2016 15:26:09 +0100 Subject: 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. --- gnu/packages/linux.scm | 19 +++++-------------- gnu/services/base.scm | 4 ++-- gnu/system.scm | 2 +- 3 files changed, 8 insertions(+), 17 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") diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 9b3dc73831..545fe60b1a 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -29,7 +29,7 @@ #:use-module (gnu system file-systems) ; 'file-system', etc. #:use-module (gnu packages admin) #:use-module ((gnu packages linux) - #:select (eudev-with-blkid kbd e2fsprogs lvm2 fuse alsa-utils crda gpm)) + #:select (eudev kbd e2fsprogs lvm2 fuse alsa-utils crda gpm)) #:use-module ((gnu packages base) #:select (canonical-package glibc)) #:use-module (gnu packages package-management) @@ -1170,7 +1170,7 @@ item of @var{packages}." (udev udev) (rules (append initial-rules rules))))))))) -(define* (udev-service #:key (udev eudev-with-blkid) (rules '())) +(define* (udev-service #:key (udev eudev) (rules '())) "Run @var{udev}, which populates the @file{/dev} directory dynamically. Get extra rules from the packages listed in @var{rules}." (service udev-service-type diff --git a/gnu/system.scm b/gnu/system.scm index 5be24ba586..9b16011d1d 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -374,7 +374,7 @@ explicitly appear in OS." ;; Get 'insmod' & co. from kmod, not module-init-tools, since udev ;; already depends on it anyway. - kmod eudev-with-blkid + kmod eudev e2fsprogs kbd -- cgit v1.2.3