GNU GRUB 1.99~rc1.
svn path=/nixpkgs/trunk/; revision=26215
This commit is contained in:
parent
117c51cf2a
commit
499b5ca40a
@ -1,4 +1,4 @@
|
||||
{ fetchurl, stdenv, bison, gettext, ncurses, libusb, freetype, qemu }:
|
||||
{ fetchurl, stdenv, flex, bison, gettext, ncurses, libusb, freetype, qemu }:
|
||||
|
||||
let unifont_bdf = fetchurl {
|
||||
url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
|
||||
@ -7,14 +7,15 @@ let unifont_bdf = fetchurl {
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "grub-1.98";
|
||||
name = "grub-1.99rc1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://alpha.gnu.org/gnu/grub/${name}.tar.gz";
|
||||
sha256 = "05660x82y2rwrzm0d1c4z07fbh02qwmacsmbbav6fa855s4w3wmy";
|
||||
url = "ftp://alpha.gnu.org/gnu/grub/grub-1.99~rc1.tar.gz";
|
||||
sha256 = "0llxycgrs5h9n2mlgmkkg1mr2fv1rzmlw4mqb3v9hcaydkx3wczh";
|
||||
name = "${name}.tar.gz";
|
||||
};
|
||||
|
||||
buildInputs = [ bison ncurses libusb freetype gettext ]
|
||||
buildInputs = [ flex bison ncurses libusb freetype gettext ]
|
||||
++ stdenv.lib.optional doCheck qemu;
|
||||
|
||||
preConfigure =
|
||||
@ -36,16 +37,6 @@ stdenv.mkDerivation rec {
|
||||
-e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g'
|
||||
'';
|
||||
|
||||
patches =
|
||||
[ # The udev rules for LVM create symlinks in /dev/mapper rathe
|
||||
# than device nodes, causing GRUB to fail to recognize LVM
|
||||
# volumes. See
|
||||
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550704
|
||||
# This ugly workaround makes `find_root_device' use stat() on
|
||||
# files in /dev/mapper instead of lstat().
|
||||
./device-mapper-symlinks.patch
|
||||
];
|
||||
|
||||
postPatch =
|
||||
'' gunzip < "${unifont_bdf}" > "unifont.bdf"
|
||||
sed -i "configure" \
|
||||
|
@ -1,28 +0,0 @@
|
||||
Only in grub-1.97.1-orig/: grub-1.97.1
|
||||
diff -rc -x '*~' grub-1.97.1-orig/util/getroot.c grub-1.97.1/util/getroot.c
|
||||
*** grub-1.97.1-orig/util/getroot.c 2009-11-09 16:48:16.000000000 +0100
|
||||
--- grub-1.97.1/util/getroot.c 2010-01-08 00:26:12.000000000 +0100
|
||||
***************
|
||||
*** 217,224 ****
|
||||
continue;
|
||||
|
||||
if (S_ISLNK (st.st_mode))
|
||||
! /* Don't follow symbolic links. */
|
||||
! continue;
|
||||
|
||||
if (S_ISDIR (st.st_mode))
|
||||
{
|
||||
--- 217,229 ----
|
||||
continue;
|
||||
|
||||
if (S_ISLNK (st.st_mode))
|
||||
! {
|
||||
! if (strcmp(dir, "mapper") != 0)
|
||||
! /* Don't follow symbolic links. */
|
||||
! continue;
|
||||
! if (stat (ent->d_name, &st) < 0)
|
||||
! continue;
|
||||
! }
|
||||
|
||||
if (S_ISDIR (st.st_mode))
|
||||
{
|
Loading…
x
Reference in New Issue
Block a user