mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 14:32:58 +00:00
da63b36ca7
- Rebase to current master - Fix pmtimer calibration to not take forever to fail on kvm. Signed-off-by: Peter Jones <pjones@redhat.com>
30 lines
985 B
Diff
30 lines
985 B
Diff
From 8b2101db991088a17f8c27fe590b48a641b8805e Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Fri, 4 Mar 2016 16:29:13 -0500
|
|
Subject: [PATCH 185/225] Make grub-editenv build again.
|
|
|
|
36212460d3565b18439a3a8130b28e6c97702c6a split how some of the mkimage
|
|
utility functions are defined, and they wind up being linked into
|
|
grub-editenv. Most utilities got fixed, but this one was missed.
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
Makefile.util.def | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/Makefile.util.def b/Makefile.util.def
|
|
index ed27351eb..38cdf4ccc 100644
|
|
--- a/Makefile.util.def
|
|
+++ b/Makefile.util.def
|
|
@@ -236,6 +236,8 @@ program = {
|
|
extra_dist = grub-core/osdep/unix/compress.c;
|
|
extra_dist = grub-core/osdep/basic/compress.c;
|
|
common = util/mkimage.c;
|
|
+ common = util/grub-mkimage32.c;
|
|
+ common = util/grub-mkimage64.c;
|
|
common = grub-core/osdep/config.c;
|
|
common = util/config.c;
|
|
common = util/resolve.c;
|
|
--
|
|
2.14.3
|
|
|