Re: [PATCH] distro: Add util-linux.

[Nikita Karetnikov <nikita.karetnikov@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1128 bytes --]

> Could you send an updated patch with this fix, and which adds util-linux
> to ‘linux.scm’ instead?

Attached.

Note that I can't verify the signature.

$ wget https://www.kernel.org/pub/linux/utils/util-linux/v2.21/util-linux-2.21.2.tar.xz
$ wget https://www.kernel.org/pub/linux/utils/util-linux/v2.21/util-linux-2.21.2.tar.sign
$ mv util-linux-2.21.2.tar.sign util-linux-2.21.2.tar.xz.sign
$ gpg --search-keys EC39C284
$ gpg --verify util-linux-2.21.2.tar.xz.sign
[...]
gpg: BAD signature from "Karel Zak <kzak@redhat.com>"

Am I using the wrong signature?

> For this kind of questions, I’d first check the list at
> <http://libreplanet.org/wiki/Software_blacklist>, and then ask for
> advice on the gnu-linux-libre list (see
> <http://lists.nongnu.org/mailman/listinfo/gnu-linux-libre>), which is
> where people knowledgeable in this area are.

"Your request has been forwarded to the list moderator for approval."

> The ‘mirror://kernel.org/’ prefix expands to the above mirror URLs.  See
> ‘url-fetch’ in (guix build download) for details.

It works, but I haven't checked 'url-fetch' yet.

[-- Attachment #2: 0001-distro-Add-util-linux.patch --]
[-- Type: text/x-diff, Size: 3190 bytes --]

From 4c572b86d7bef7db5017559bd6e3f39adb038acc Mon Sep 17 00:00:00 2001
From: Nikita Karetnikov <nikita@karetnikov.org>
Date: Mon, 3 Dec 2012 23:13:02 +0000
Subject: [PATCH] distro: Add util-linux.

* distro/packages/linux.scm (util-linux): New variable.
---
 distro/packages/linux.scm |   45 +++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/distro/packages/linux.scm b/distro/packages/linux.scm
index 54a0606..bb883f2 100644
--- a/distro/packages/linux.scm
+++ b/distro/packages/linux.scm
@@ -1,5 +1,6 @@
 ;;; Guix --- Nix package management from Guile.         -*- coding: utf-8 -*-
 ;;; Copyright (C) 2012 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright (C) 2012 Nikita Karetnikov <nikita@karetnikov.org>
 ;;;
 ;;; This file is part of Guix.
 ;;;
@@ -17,10 +18,12 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages linux)
-  #:use-module (guix packages)
-  #:use-module (guix download)
+  #:use-module (distro packages compression)
   #:use-module (distro packages flex)
+  #:use-module (distro packages ncurses)
   #:use-module (distro packages perl)
+  #:use-module (guix packages)
+  #:use-module (guix download)
   #:use-module (guix build-system gnu))
 
 (define-public linux-libre-headers
@@ -104,3 +107,41 @@ Pluggable authentication modules are small shared object files that can
 be used through the PAM API to perform tasks, like authenticating a user
 at login.  Local and dynamic reconfiguration are its key features")
     (license "BSD")))
+
+(define-public util-linux
+  (package
+    (name "util-linux")
+    (version "2.21")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://kernel.org/linux/utils/"
+                          name "/v" version "/"
+                          name "-" version ".2" ".tar.xz"))
+      (sha256
+       (base32
+        "1rpgghf7n0zx0cdy8hibr41wvkm2qp1yvd8ab1rxr193l1jmgcir"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags '("--disable-use-tty-group")
+       #: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"))))
+                 %standard-phases)))
+    (inputs `(("zlib" ,zlib)
+              ("ncurses" ,ncurses)
+              ("perl" ,perl)))
+    (home-page "https://www.kernel.org/pub/linux/utils/util-linux/")
+    (synopsis
+     "util-linux is a random collection of utilities for the Linux kernel")
+    (description
+     "util-linux is a random collection of utilities for the Linux kernel.")
+    ;; Note that util-linux doesn't use the same license for all the
+    ;; code. GPLv2+ is the default license for a code without an
+    ;; explicitly defined license.
+    (license '("GPLv3+" "GPLv2+" "GPLv2" "LGPLv2+"
+               "BSD-original" "Public Domain"))))
\ No newline at end of file
-- 
1.7.5.4