58fe9aa736
- Clean up the build a bit to make it faster - Make grubenv work right on UEFI machines Related: rhbz#1119943 - Sort debug and rescue kernels later than normal ones Related: rhbz#1065360 - Allow "fallback" to include entries by title as well as number. Related: rhbz#1026084 - Fix a segfault on aarch64. - Load arm with SB enabled if available. - Add some serial port options to GRUB_MODULES. Signed-off-by: Peter Jones <pjones@redhat.com>
40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
From 6c3fa2da4fd22c3ebda0c6cf69f97d578c04e704 Mon Sep 17 00:00:00 2001
|
|
From: Mike Gilbert <floppym@gentoo.org>
|
|
Date: Sat, 18 Jan 2014 19:41:15 +0100
|
|
Subject: [PATCH 029/152] * Makefile.util.def: Link grub-ofpathname with
|
|
zfs libs.
|
|
|
|
---
|
|
ChangeLog | 4 ++++
|
|
Makefile.util.def | 2 +-
|
|
2 files changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index 9d1a3f0..edceb66 100644
|
|
--- a/ChangeLog
|
|
+++ b/ChangeLog
|
|
@@ -1,3 +1,7 @@
|
|
+2014-01-01 Mike Gilbert <floppym@gentoo.org>
|
|
+
|
|
+ * Makefile.util.def: Link grub-ofpathname with zfs libs.
|
|
+
|
|
2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
|
* grub-core/commands/macbless.c: Rename FILE and DIR to avoid
|
|
diff --git a/Makefile.util.def b/Makefile.util.def
|
|
index 83df212..a286a89 100644
|
|
--- a/Makefile.util.def
|
|
+++ b/Makefile.util.def
|
|
@@ -384,7 +384,7 @@ program = {
|
|
ldadd = libgrubgcry.a;
|
|
ldadd = libgrubkern.a;
|
|
ldadd = grub-core/gnulib/libgnu.a;
|
|
- ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBGEOM)';
|
|
+ ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
|
|
};
|
|
|
|
program = {
|
|
--
|
|
1.9.3
|
|
|