* grub-core/Makefile.core.def (lsacpi): Fix ia64 mismerge.

(lsefisystab): Likewise.
	(lssal): Likewise.
	(lsefimmap): Likewise.
	(hdparm): Enable on qemu-mips.
	(setjmp): Add ia64 nodist.
	(serial): Simplify tags.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-05-19 12:13:18 +02:00
parent 63e3eea967
commit 9a79fcf2c9
2 changed files with 17 additions and 6 deletions

View File

@ -1,3 +1,13 @@
2011-05-19 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/Makefile.core.def (lsacpi): Fix ia64 mismerge.
(lsefisystab): Likewise.
(lssal): Likewise.
(lsefimmap): Likewise.
(hdparm): Enable on qemu-mips.
(setjmp): Add ia64 nodist.
(serial): Simplify tags.
2011-05-18 Colin Watson <cjwatson@ubuntu.com>
* Makefile.util.def (grub-ofpathname): Install manual page.

View File

@ -505,7 +505,7 @@ module = {
common = commands/lsacpi.c;
enable = x86_efi;
enable = efi;
enable = i386_pc;
enable = i386_coreboot;
enable = i386_multiboot;
@ -516,7 +516,7 @@ module = {
common = commands/efi/lsefisystab.c;
enable = x86_efi;
enable = efi;
};
module = {
@ -524,7 +524,7 @@ module = {
common = commands/efi/lssal.c;
enable = x86_efi;
enable = efi;
};
module = {
@ -532,7 +532,7 @@ module = {
common = commands/efi/lsefimmap.c;
enable = x86_efi;
enable = efi;
};
module = {
@ -632,6 +632,7 @@ module = {
common = commands/hdparm.c;
common = lib/hexdump.c;
enable = pci;
enable = mips_qemu_mips;
};
module = {
@ -1197,6 +1198,7 @@ module = {
extra_dist = lib/x86_64/setjmp.S;
extra_dist = lib/sparc64/setjmp.S;
extra_dist = lib/powerpc/setjmp.S;
extra_dist = lib/ia64/setjmp.S;
};
module = {
@ -1421,8 +1423,7 @@ module = {
x86 = term/ns8250.c;
enable = emu;
enable = i386;
enable = x86_64_efi;
enable = x86;
emu_condition = COND_GRUB_EMU_USB;
};