From ddfc2fd8e0b4a4d2aa647c7ebf98e521bcd9dc2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 12 Sep 2014 17:25:39 +0200 Subject: gnu: e2fsprogs: Build with --disable-blkid. * gnu/packages/linux.scm (e2fsprogs)[arguments]: Pass --disable-blkid. --- gnu/packages/linux.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7be0d076ec..74a57e6d9b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -500,7 +500,12 @@ slabtop, and skill.") (native-inputs `(("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) ; for the libext2fs Info manual (arguments - '(#:phases (alist-cons-before + '(;; The 'blkid' command and library are already provided by util-linux, + ;; which is the preferred source for them (see, e.g., + ;; .) + #:configure-flags '("--disable-blkid") + + #:phases (alist-cons-before 'configure 'patch-shells (lambda _ (substitute* "configure" -- cgit v1.2.3 From c9a8ad847712dfa4811608efae2d48cb8500f72f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 12 Sep 2014 22:05:50 +0200 Subject: gnu: util-linux: Don't install 'logger'. * gnu/packages/linux.scm (util-linux)[source]: Add 'snippet'. --- gnu/packages/linux.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 74a57e6d9b..756b342b2f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -378,7 +378,16 @@ providing the system administrator with some help in common tasks.") (sha256 (base32 "1rpgghf7n0zx0cdy8hibr41wvkm2qp1yvd8ab1rxr193l1jmgcir")) - (patches (list (search-patch "util-linux-perl.patch"))))) + (patches (list (search-patch "util-linux-perl.patch"))) + (modules '((guix build utils))) + (snippet + ;; We take the 'logger' program from GNU Inetutils, so remove + ;; it from here. + '(substitute* "misc-utils/Makefile.in" + (("PROGRAMS =(.*) logger(.*)" _ before after) + (string-append "PROGRAMS =" before " " after)) + (("MANS =(.*) logger\\.1(.*)" _ before after) + (string-append "MANS =" before " " after)))))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-use-tty-group" -- cgit v1.2.3 From 7fa715e783af36dc98e3f53aa7ebf3d91076d779 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 12 Sep 2014 22:12:33 +0200 Subject: gnu: Add eudev. * gnu/packages/linux.scm (eudev): New variable. --- gnu/packages/linux.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 756b342b2f..b76d1897ab 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1326,6 +1326,7 @@ from the module-init-tools project.") (license gpl2+))) ; library under lgpl2.1+ (define-public udev + ;; The last pre-systemd version. (package (name "udev") (version "182") @@ -1370,6 +1371,21 @@ device nodes from /dev/, handles hotplug events and loads drivers at boot time.") (license gpl2+))) ; libudev is under lgpl2.1+ +(define-public eudev + ;; The post-systemd fork, maintained by Gentoo. + (package (inherit udev) + (name "eudev") + (version "1.9") + (source (origin + (method url-fetch) + (uri (string-append + "http://dev.gentoo.org/~blueness/eudev/eudev-" + version ".tar.gz")) + (sha256 + (base32 + "1w6f8h7fhjz3prs630f8gawv7jx74zi600z0pm997kkp24pyj5wg")))) + (home-page "http://www.gentoo.org/proj/en/eudev/"))) + (define-public lvm2 (package (name "lvm2") -- cgit v1.2.3 From b0e652d836fe14bc229194d9b214e4d6340a25c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 12 Sep 2014 22:19:33 +0200 Subject: Revert "gnu: util-linux: Don't install 'logger'." This reverts commit c9a8ad847712dfa4811608efae2d48cb8500f72f. --- gnu/packages/linux.scm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b76d1897ab..bbfc1f6b0d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -378,16 +378,7 @@ providing the system administrator with some help in common tasks.") (sha256 (base32 "1rpgghf7n0zx0cdy8hibr41wvkm2qp1yvd8ab1rxr193l1jmgcir")) - (patches (list (search-patch "util-linux-perl.patch"))) - (modules '((guix build utils))) - (snippet - ;; We take the 'logger' program from GNU Inetutils, so remove - ;; it from here. - '(substitute* "misc-utils/Makefile.in" - (("PROGRAMS =(.*) logger(.*)" _ before after) - (string-append "PROGRAMS =" before " " after)) - (("MANS =(.*) logger\\.1(.*)" _ before after) - (string-append "MANS =" before " " after)))))) + (patches (list (search-patch "util-linux-perl.patch"))))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-use-tty-group" -- cgit v1.2.3 From 9a4efac9efe1f257a0f905ff8b99c90b002d1a29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 13 Sep 2014 10:32:47 +0200 Subject: gnu: fuse: Install udev rules in lib/udev/rules.d. * gnu/packages/linux.scm (fuse): Change UDEV_RULES_PATH suffix to /lib/udev/rules.d. --- gnu/packages/linux.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bbfc1f6b0d..70c4cb5c61 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1009,9 +1009,11 @@ processes currently causing I/O.") (string-append "INIT_D_PATH=" (assoc-ref %outputs "out") "/etc/init.d") + + ;; The rule makes /dev/fuse 666. (string-append "UDEV_RULES_PATH=" (assoc-ref %outputs "out") - "/etc/udev")) + "/lib/udev/rules.d")) #:phases (alist-cons-before 'build 'set-file-names (lambda* (#:key inputs #:allow-other-keys) -- cgit v1.2.3 From dc2d59afa946eb7540ca6fb6233026780f99104e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 13 Sep 2014 10:46:10 +0200 Subject: gnu: eudev: Build with libkmod support. * gnu/packages/linux.scm (eudev)[arguments]: New field. --- gnu/packages/linux.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 70c4cb5c61..8550dc0d33 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -49,6 +49,7 @@ #:use-module (gnu packages gtk) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix build-system python) @@ -1377,6 +1378,10 @@ time.") (sha256 (base32 "1w6f8h7fhjz3prs630f8gawv7jx74zi600z0pm997kkp24pyj5wg")))) + (arguments + (substitute-keyword-arguments (package-arguments udev) + ((#:configure-flags flags) + `(cons "--enable-libkmod" ,flags)))) (home-page "http://www.gentoo.org/proj/en/eudev/"))) (define-public lvm2 -- cgit v1.2.3 From c19ce3a711fea24c173d615a4a7b162dbc86ce68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 13 Sep 2014 10:47:58 +0200 Subject: gnu: eudev: Honor $EUDEV_RULES_DIRECTORY. * gnu/packages/patches/eudev-rules-directory.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/linux.scm (eudev): Use it. --- gnu/packages/linux.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8550dc0d33..ff6de2b077 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1377,7 +1377,8 @@ time.") version ".tar.gz")) (sha256 (base32 - "1w6f8h7fhjz3prs630f8gawv7jx74zi600z0pm997kkp24pyj5wg")))) + "1w6f8h7fhjz3prs630f8gawv7jx74zi600z0pm997kkp24pyj5wg")) + (patches (list (search-patch "eudev-rules-directory.patch"))))) (arguments (substitute-keyword-arguments (package-arguments udev) ((#:configure-flags flags) -- cgit v1.2.3 From 9e771e3bb67361b509a6d4e9c00b9d21d7f9b123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 13 Sep 2014 15:50:30 +0200 Subject: gnu: Adjust synopses as recommended by 'guix lint'. Remove leading articles and trailing periods in package synopses. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ff6de2b077..1baf4fdfea 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -714,7 +714,7 @@ packet filter.") (home-page "http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2") (synopsis - "A collection of utilities for controlling TCP/IP networking and traffic control in Linux") + "Utilities for controlling TCP/IP networking and traffic in Linux") (description "Iproute2 is a collection of utilities for controlling TCP/IP networking and traffic with the Linux kernel. -- cgit v1.2.3