|
 |
f96e0b |
From ea051678fa221e5c4e527bd97c408605ecaca3a0 Mon Sep 17 00:00:00 2001
|
|
|
f96e0b |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
Date: Fri, 26 Apr 2013 23:47:46 +0200
|
|
|
f96e0b |
Subject: [PATCH 358/482] * grub-core/Makefile.core.def: Fix grub-emu
|
|
|
f96e0b |
and grub-emu-lite sources.
|
|
|
f96e0b |
|
|
|
f96e0b |
---
|
|
|
f96e0b |
ChangeLog | 4 ++++
|
|
|
f96e0b |
grub-core/Makefile.core.def | 8 ++++----
|
|
|
f96e0b |
2 files changed, 8 insertions(+), 4 deletions(-)
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/ChangeLog b/ChangeLog
|
|
|
f96e0b |
index 4975a2c..f554ba8 100644
|
|
|
f96e0b |
--- a/ChangeLog
|
|
|
f96e0b |
+++ b/ChangeLog
|
|
|
f96e0b |
@@ -1,5 +1,9 @@
|
|
|
f96e0b |
2013-04-26 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
|
|
|
f96e0b |
+ * grub-core/Makefile.core.def: Fix grub-emu and grub-emu-lite sources.
|
|
|
f96e0b |
+
|
|
|
f96e0b |
+2013-04-26 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
+
|
|
|
f96e0b |
* util/getroot.c (exec_pipe): Put proper #if's so that its users don't
|
|
|
f96e0b |
compile when not needed.
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
|
|
|
f96e0b |
index ad912a6..e2ecff1 100644
|
|
|
f96e0b |
--- a/grub-core/Makefile.core.def
|
|
|
f96e0b |
+++ b/grub-core/Makefile.core.def
|
|
|
f96e0b |
@@ -248,9 +248,9 @@ program = {
|
|
|
f96e0b |
emu = kern/emu/full.c;
|
|
|
f96e0b |
emu_nodist = grub_emu_init.c;
|
|
|
f96e0b |
|
|
|
f96e0b |
- ldadd = 'kernel.img$(EXEEXT)';
|
|
|
f96e0b |
+ ldadd = 'kernel.exec$(EXEEXT)';
|
|
|
f96e0b |
ldadd = '$(MODULE_FILES)';
|
|
|
f96e0b |
- ldadd = '$(LIBUTIL) $(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
|
|
|
f96e0b |
+ ldadd = 'gnulib/libgnu.a $(LIBCURSES) $(LIBINTL) $(LIBUTIL) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
|
|
|
f96e0b |
|
|
|
f96e0b |
enable = emu;
|
|
|
f96e0b |
};
|
|
|
f96e0b |
@@ -261,8 +261,8 @@ program = {
|
|
|
f96e0b |
emu = kern/emu/lite.c;
|
|
|
f96e0b |
emu_nodist = symlist.c;
|
|
|
f96e0b |
|
|
|
f96e0b |
- ldadd = 'kernel.img$(EXEEXT)';
|
|
|
f96e0b |
- ldadd = '$(LIBUTIL) $(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
|
|
|
f96e0b |
+ ldadd = 'kernel.exec$(EXEEXT)';
|
|
|
f96e0b |
+ ldadd = 'gnulib/libgnu.a $(LIBCURSES) $(LIBINTL) $(LIBUTIL) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
|
|
|
f96e0b |
|
|
|
f96e0b |
enable = emu;
|
|
|
f96e0b |
};
|
|
|
f96e0b |
--
|
|
|
f96e0b |
1.8.2.1
|
|
|
f96e0b |
|