db7cf3a089
Add some fixes for BLS parsing logic and also make 20-grub.install script to query the relative path of the kernel and initramfs images, so BLS can also work when /boot is not a mount point or is a btrfs subvolume. Also pull some build fixes. Resolves: rhbz#1588184 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
31 lines
989 B
Diff
31 lines
989 B
Diff
From ebe69b2682b5b3029d8ea503f12134ee81c4b2ce Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Fri, 4 Mar 2016 16:29:13 -0500
|
|
Subject: [PATCH 156/243] 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 ed27351eb47..38cdf4ccc09 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.17.1
|
|
|