diff options
Diffstat (limited to 'gnu/packages/linux.scm')
| -rw-r--r-- | gnu/packages/linux.scm | 81 |
1 files changed, 47 insertions, 34 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d48a8e9633..50e90f0da3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -28,6 +28,7 @@ #:use-module (gnu packages gcc) #:use-module (gnu packages flex) #:use-module (gnu packages bison) + #:use-module (gnu packages admin) #:use-module (gnu packages gperf) #:use-module (gnu packages libusb) #:use-module (gnu packages ncurses) @@ -36,6 +37,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages slang) #:use-module (gnu packages algebra) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -50,6 +52,8 @@ #:use-module (gnu packages rrdtool) #:use-module (gnu packages elf) #:use-module (gnu packages gtk) + #:use-module (gnu packages docbook) + #:use-module (gnu packages asciidoc) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) @@ -378,41 +382,43 @@ providing the system administrator with some help in common tasks.") (define-public util-linux (package (name "util-linux") - (version "2.21") + (version "2.25.2") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/" - name "/v" version "/" - name "-" version ".2" ".tar.xz")) + name "/v" (version-major+minor version) "/" + name "-" version ".tar.xz")) (sha256 (base32 - "1rpgghf7n0zx0cdy8hibr41wvkm2qp1yvd8ab1rxr193l1jmgcir")) - (patches (list (search-patch "util-linux-perl.patch"))) + "1miwwdq1zwvhf0smrxx3fjddq3mz22s8rc5cw54s7x3kbdqpyig0")) + (patches (list (search-patch "util-linux-tests.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)))))) + ;; We take the 'logger' program from GNU Inetutils and 'kill' + ;; from GNU Coreutils. + '(substitute* "configure" + (("build_logger=yes") "build_logger=no") + (("build_kill=yes") "build_kill=no"))))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-use-tty-group" "--enable-ddate") - #:phases (alist-cons-after - 'install 'patch-chkdupexe - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* (string-append out "/bin/chkdupexe") - ;; Allow 'patch-shebang' to do its work. - (("@PERL@") "/bin/perl")))) + #:phases (alist-cons-before + 'check 'pre-check + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (net (assoc-ref inputs "net-base"))) + ;; Change the test to refer to the right file. + (substitute* "tests/ts/misc/mcookie" + (("/etc/services") + (string-append net "/etc/services"))) + #t)) %standard-phases))) (inputs `(("zlib" ,guix:zlib) ("ncurses" ,ncurses))) (native-inputs - `(("perl" ,perl))) + `(("perl" ,perl) + ("net-base" ,net-base))) ;for tests (home-page "https://www.kernel.org/pub/linux/utils/util-linux/") (synopsis "Collection of utilities for the Linux kernel") (description @@ -505,14 +511,14 @@ slabtop, and skill.") (define-public e2fsprogs (package (name "e2fsprogs") - (version "1.42.7") + (version "1.42.11") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/e2fsprogs/e2fsprogs-" version ".tar.gz")) (sha256 (base32 - "0ibkkvp6kan0hn0d1anq4n2md70j5gcm7mwna515w82xwyr02rfw")) + "0xhbj7494g3y2w2miyrzdz6nciaffxajrs6wqm73yp4jnrqagn2b")) (modules '((guix build utils))) (snippet '(substitute* "MCONFIG.in" @@ -523,10 +529,12 @@ slabtop, and skill.") (native-inputs `(("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) ;for the libext2fs Info manual (arguments - '(;; The 'blkid' command and library are already provided by util-linux, - ;; which is the preferred source for them (see, e.g., + '(;; util-linux is not the preferred source for some of the libraries and + ;; commands, so disable them (see, e.g., ;; <http://git.buildroot.net/buildroot/commit/?id=e1ffc2f791b336339909c90559b7db40b455f172>.) - #:configure-flags '("--disable-blkid" + #:configure-flags '("--disable-libblkid" + "--disable-libuuid" "--disable-uuidd" + "--disable-fsck" ;; Install libext2fs et al. "--enable-elf-shlibs") @@ -1718,7 +1726,11 @@ in a digital read-out.") %standard-phases) #:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out")) - "WERROR=0") + "WERROR=0" + + ;; By default, 'config/Makefile' uses lib64 on + ;; x86_64. Work around that. + "lib=lib") #:tests? #f)) ;no tests (native-inputs `(("pkg-config" ,pkg-config) @@ -1729,17 +1741,18 @@ in a digital read-out.") ("perl" ,perl) ("python" ,python-2))) (inputs - `(;; ("slang" ,slang) + `(("slang" ,slang) ;for the interactive TUI ;; ("newt" ,newt) + ("python" ,python-2) ;'perf' links against libpython ("elfutils" ,elfutils) - ;; FIXME: Documentation. - ;; ("libxslt" ,libxslt) - ;; ("docbook-xml" ,docbook-xml) - ;; ("docbook-xsl" ,docbook-xsl) - ;; ("xmlto" ,xmlto) - ;; ("asciidoc" ,asciidoc) - )) + ;; Documentation. + ("libxml2" ,libxml2) ;for $XML_CATALOG_FILES + ("libxslt" ,libxslt) + ("docbook-xml" ,docbook-xml) + ("docbook-xsl" ,docbook-xsl) + ("xmlto" ,xmlto) + ("asciidoc" ,asciidoc))) (home-page "https://perf.wiki.kernel.org/") (synopsis "Linux profiling with performance counters") (description |