grub2: Update git revision
This commit is contained in:
parent
58a04a9359
commit
8e62c497ca
@ -43,8 +43,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.savannah.gnu.org/grub.git";
|
||||
rev = "1de3a48098053aaebd35232bd73e3ce3f3fdf51c";
|
||||
sha256 = "0d1953nmi251czkm1dmd7vnm3iz2rkqbznlp6ph33va0d7kw1kfc";
|
||||
rev = "32cd33bd19348afb77ab849846e0b6d6157ea308";
|
||||
sha256 = "1fsc1sa5ymdkf11bshlh8fwqv7j7c4pfzjdf6ivllpanp02ryv4l";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autogen flex bison python autoconf automake ];
|
||||
@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
|
||||
-e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g"
|
||||
'';
|
||||
|
||||
patches = [ ./fix-bash-completion.patch ./glibc-2.20.patch ];
|
||||
patches = [ ./fix-bash-completion.patch ];
|
||||
|
||||
configureFlags = optional zfsSupport "--enable-libzfs"
|
||||
++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystems.${stdenv.system}.target}" "--program-prefix=" ];
|
||||
|
@ -1,29 +0,0 @@
|
||||
* grub-core/kern/emu/hostfs.c: squahes below warning
|
||||
warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use
|
||||
_DEFAULT_SOURCE"
|
||||
|
||||
Signed-off-by: Khem Raj <address@hidden>
|
||||
|
||||
Upstream-Status: Submitted
|
||||
---
|
||||
grub-core/kern/emu/hostfs.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/grub-core/kern/emu/hostfs.c b/grub-core/kern/emu/hostfs.c
|
||||
index 7e725f6..823116d 100644
|
||||
--- a/grub-core/kern/emu/hostfs.c
|
||||
+++ b/grub-core/kern/emu/hostfs.c
|
||||
@@ -19,7 +19,11 @@
|
||||
|
||||
#include <config-util.h>
|
||||
|
||||
+/* Legacy feature macro.*/
|
||||
#define _BSD_SOURCE
|
||||
+/* New feature macro that provides everything _BSD_SOURCE and
|
||||
+ * _SVID_SOURCE provided and possibly more. */
|
||||
+#define _DEFAULT_SOURCE
|
||||
#include <grub/fs.h>
|
||||
#include <grub/file.h>
|
||||
#include <grub/disk.h>
|
||||
--
|
||||
2.1.0
|
Loading…
Reference in New Issue
Block a user