diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-08-13 12:19:25 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-08-14 00:34:47 +0200 |
| commit | 66269d47868407926ba6832d7b391857c709a709 (patch) | |
| tree | 5dbbe397557141bdb5c0d9d8c9872519b07d5b9e /gnu/packages/linux.scm | |
| parent | 2f7f32003f0714914baf01b9255c4b1ff24c307a (diff) | |
| download | patches-66269d47868407926ba6832d7b391857c709a709.tar patches-66269d47868407926ba6832d7b391857c709a709.tar.gz | |
gnu: lvm2: Upgrade, use udev, improve synopsis and description.
* gnu/packages/linux.scm (lvm2): New variable.
* gnu/packages/lvm.scm: Remove.
* gnu-system.am (GNU_SYSTEM_MODULES): Remove it.
* gnu/packages/cryptsetup.scm: Adjust accordingly.
Diffstat (limited to 'gnu/packages/linux.scm')
| -rw-r--r-- | gnu/packages/linux.scm | 61 |
1 files changed, 60 insertions, 1 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 42e82fb88e..73409cc29d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> -;;; Copyright © 2014 Andreas Enge <andreas@enge.fr> +;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; @@ -1344,6 +1344,65 @@ device nodes from /dev/, handles hotplug events and loads drivers at boot time.") (license gpl2+))) ; libudev is under lgpl2.1+ +(define-public lvm2 + (package + (name "lvm2") + (version "2.02.109") + (source (origin + (method url-fetch) + (uri (string-append "ftp://sources.redhat.com/pub/lvm2/releases/LVM2." + version ".tgz")) + (sha256 + (base32 + "1rv5ivg0l1w3nwzwdkqixm96h5bzg7ib4rr196ysb2lw42jmpjbv")) + (modules '((guix build utils))) + (snippet + '(begin + (use-modules (guix build utils)) + + ;; Honor sysconfdir. + (substitute* "make.tmpl.in" + (("confdir = .*$") + "confdir = @sysconfdir@\n") + (("DEFAULT_SYS_DIR = @DEFAULT_SYS_DIR@") + "DEFAULT_SYS_DIR = @sysconfdir@")))))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("procps" ,procps))) ;tests use 'pgrep' + (inputs + `(("udev" ,udev))) + (arguments + '(#:phases (alist-cons-after + 'configure 'set-makefile-shell + (lambda _ + ;; Use 'sh', not 'bash', so that '. lib/utils.sh' works as + ;; expected. + (setenv "SHELL" (which "sh")) + + ;; Replace /bin/sh with the right file name. + (patch-makefile-SHELL "make.tmpl")) + %standard-phases) + + #:configure-flags (list (string-append "--sysconfdir=" + (assoc-ref %outputs "out") + "/etc/lvm") + "--enable-udev_sync" + "--enable-udev_rules") + + ;; The tests use 'mknod', which requires root access. + #:tests? #f)) + (home-page "http://sourceware.org/lvm2/") + (synopsis "Logical volume management for Linux") + (description + "LVM2 is the logical volume management tool set for Linux-based systems. +This package includes the user-space libraries and tools, including the device +mapper. Kernel components are part of Linux-libre.") + + ;; Libraries (liblvm2, libdevmapper) are LGPLv2.1. + ;; Command-line tools are GPLv2. + (license (list gpl2 lgpl2.1)))) + (define-public wireless-tools (package (name "wireless-tools") |