aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-02-10 18:48:23 +0100
committerLudovic Courtès <ludo@gnu.org>2013-02-10 18:48:23 +0100
commit65d8b777c0834cd3f2931b7c49254a7e943b06fc (patch)
tree8e11300ab8f4dab2a4a94d1ce379b75c3f5ae3dc
parent72b9eebf686381fae5b20652863108d3d8e5a743 (diff)
downloadguix-65d8b777c0834cd3f2931b7c49254a7e943b06fc.tar
guix-65d8b777c0834cd3f2931b7c49254a7e943b06fc.tar.gz
gnu: Add GNU GRUB.
* gnu/packages/grub.scm, gnu/packages/patches/grub-gets-undeclared.patch: New files. * Makefile.am (MODULES): Add grub.scm. (dist_patch_DATA): Add grub-gets-undeclared.patch.
-rw-r--r--Makefile.am2
-rw-r--r--gnu/packages/grub.scm87
-rw-r--r--gnu/packages/patches/grub-gets-undeclared.patch42
3 files changed, 131 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 0ec1dc8a12..bd8a0e1993 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -81,6 +81,7 @@ MODULES = \
gnu/packages/gperf.scm \
gnu/packages/gprolog.scm \
gnu/packages/groff.scm \
+ gnu/packages/grub.scm \
gnu/packages/gsasl.scm \
gnu/packages/guile.scm \
gnu/packages/help2man.scm \
@@ -171,6 +172,7 @@ dist_patch_DATA = \
gnu/packages/patches/glib-tests-timezone.patch \
gnu/packages/patches/glibc-bootstrap-system.patch \
gnu/packages/patches/glibc-no-ld-so-cache.patch \
+ gnu/packages/patches/grub-gets-undeclared.patch \
gnu/packages/patches/guile-1.8-cpp-4.5.patch \
gnu/packages/patches/guile-default-utf8.patch \
gnu/packages/patches/guile-relocatable.patch \
diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm
new file mode 100644
index 0000000000..de07c2cbf8
--- /dev/null
+++ b/gnu/packages/grub.scm
@@ -0,0 +1,87 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages grub)
+ #:use-module (guix download)
+ #:use-module (guix packages)
+ #:use-module ((guix licenses) #:select (gpl3+))
+ #:use-module (guix build-system gnu)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages flex)
+ #:use-module (gnu packages bison)
+ #:use-module ((gnu packages gettext) #:renamer (symbol-prefix-proc 'gnu:))
+ #:use-module (gnu packages freetype)
+ #:use-module (gnu packages linux)
+ #:use-module (gnu packages qemu)
+ #:use-module (gnu packages ncurses)
+ #:use-module (gnu packages cdrom))
+
+(define-public grub
+ (package
+ (name "grub")
+ (version "2.00")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/grub/grub-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq"))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:patches (list (assoc-ref %build-inputs "patch/gets"))
+ #:configure-flags '("--disable-werror")
+ #:phases (alist-cons-before
+ 'patch-source-shebangs 'patch-stuff
+ (lambda _
+ (substitute* "grub-core/Makefile.in"
+ (("/bin/sh") (which "sh")))
+
+ ;; TODO: Re-enable this test when we have Parted.
+ (substitute* "tests/partmap_test.in"
+ (("set -e") "exit 77")))
+ %standard-phases)))
+ (inputs
+ `(;; ("lvm2" ,lvm2)
+ ("gettext" ,gnu:gettext)
+ ("freetype" ,freetype)
+ ;; ("libusb" ,libusb)
+ ("ncurses" ,ncurses)
+
+ ("patch/gets" ,(search-patch "grub-gets-undeclared.patch"))))
+ (native-inputs
+ `(("bison" ,bison)
+ ("flex" ,flex)
+
+ ;; Dependencies for the test suite. The "real" QEMU is needed here,
+ ;; because several targets are used.
+ ("qemu" ,qemu)
+ ("xorriso" ,xorriso)))
+ (home-page "http://www.gnu.org/software/grub/")
+ (synopsis
+ "GNU GRUB, the Grand Unified Boot Loader (2.x beta)")
+ (description
+ "GNU GRUB is a Multiboot boot loader. It was derived from GRUB, GRand
+Unified Bootloader, which was originally designed and implemented by Erich
+Stefan Boleyn.
+
+Briefly, the boot loader is the first software program that runs when a
+computer starts. It is responsible for loading and transferring control to
+the operating system kernel software (such as the Hurd or the Linux). The
+kernel, in turn, initializes the rest of the operating system (e.g., GNU).")
+ (license gpl3+)))
diff --git a/gnu/packages/patches/grub-gets-undeclared.patch b/gnu/packages/patches/grub-gets-undeclared.patch
new file mode 100644
index 0000000000..41dddbd9d0
--- /dev/null
+++ b/gnu/packages/patches/grub-gets-undeclared.patch
@@ -0,0 +1,42 @@
+This patch is needed to allow builds with newer versions of
+the GNU libc (2.16+).
+
+
+commit 66712c23388e93e5c518ebc8515140fa0c807348
+Author: Eric Blake <eblake@redhat.com>
+Date: Thu Mar 29 13:30:41 2012 -0600
+
+ stdio: don't assume gets any more
+
+ Gnulib intentionally does not have a gets module, and now that C11
+ and glibc have dropped it, we should be more proactive about warning
+ any user on a platform that still has a declaration of this dangerous
+ interface.
+
+ * m4/stdio_h.m4 (gl_STDIO_H, gl_STDIO_H_DEFAULTS): Drop gets
+ support.
+ * modules/stdio (Makefile.am): Likewise.
+ * lib/stdio-read.c (gets): Likewise.
+ * tests/test-stdio-c++.cc: Likewise.
+ * m4/warn-on-use.m4 (gl_WARN_ON_USE_PREPARE): Fix comment.
+ * lib/stdio.in.h (gets): Make warning occur in more places.
+ * doc/posix-functions/gets.texi (gets): Update documentation.
+ Reported by Christer Solskogen.
+
+ Signed-off-by: Eric Blake <eblake@redhat.com>
+
+--- grub-2.00/grub-core/gnulib/stdio.in.h 2013-02-10 16:17:09.000000000 +0100
++++ grub-2.00/grub-core/gnulib/stdio.in.h 2013-02-10 16:17:11.000000000 +0100
+@@ -137,12 +137,6 @@ _GL_WARN_ON_USE (fflush, "fflush is not
+ "use gnulib module fflush for portable POSIX compliance");
+ #endif
+
+-/* It is very rare that the developer ever has full control of stdin,
+- so any use of gets warrants an unconditional warning. Assume it is
+- always declared, since it is required by C89. */
+-#undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+-
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
+ # if !(defined __cplusplus && defined GNULIB_NAMESPACE)