From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 14 Mar 2010 15:29:52 +0000 (+0100)
Subject: 	Compile parts of grub-emu as modules.
X-Git-Tag: 1.99~1017
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a6d2d06dbf62e37389a8d8488e874fbc48f0920;p=thirdparty%2Fgrub.git

	Compile parts of grub-emu as modules.

	* Makefile.in (TARGET_CPPFLAGS) [emu]: Remove -nostdinc -isystem.
	(pkglib_DATA) [emu]: Remove moddep.lst command.lst fs.lst
	partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst.
	(all-local): Add $(GRUB_EMU).
	(install-local): Install $(GRUB_EMU).
	(uninstall): Uninstall $(GRUB_EMU).
	* commands/parttool.c: Replace GRUB_UTIL with GRUB_NO_MODULES.
	* kern/dl.c: Likewise.
	* commands/sleep.c: Not include machine/time.h.
	* conf/any-emu.rmk (COMMON_LDFLAGS): New variable.
	(COMMON_CFLAGS): Likewise.
	(sbin_UTILITIES): Remove grub-emu.
	(grub_emu_SOURCES): Removed.
	(kernel_img_RELOCATABLE): New variable.
	(pkglib_PROGRAMS): Add kernel.img.
	(kernel_img_SOURCES): New variable
	(kernel_img_CFLAGS): Likewise.
	(kernel_img_LDFLAGS): Likewise.
	(TARGET_NO_STRIP): Likewise.
	(TARGET_NO_DYNAMIC_MODULES): Likewise.
	(pkglib_MODULES): Add progname.mod, hostfs.mod, host.mod, reboot.mod,
	halt.mod, cpuid.mod, usb.mod, sdl.mod and pci.mod.
	(grub-emu): New target.
	(GRUB_EMU): New variable.
	* configure.ac: Whitelist -emu as possible x86_64 architecture.
	* efiemu/main.c: Replace GRUB_UTIL with GRUB_MACHINE_EMU.
	* loader/xnu.c: Likewise.
	* include/grub/pci.h: Likewise.
	* genemuinit.sh: New file.
	* genemuinitheader.sh: Likewise.
	* genmk.rb: Don't strip if TARGET_NO_STRIP is yes.
	Support TARGET_NO_DYNAMIC_MODULES.
	* include/grub/dl.h (GRUB_NO_MODULES): New variable.
	* commands/search.c: Fix GRUB_MOD_INIT and GRUB_MOD_FINI arguments.
	* disk/loopback.c: Likewise.
	* font/font_cmd.c: Likewise.
	* partmap/acorn.c: Likewise.
	* partmap/amiga.c: Likewise.
	* partmap/apple.c: Likewise.
	* partmap/gpt.c: Likewise.
	* partmap/msdos.c: Likewise.
	* partmap/sun.c: Likewise.
	* parttool/msdospart.c: Likewise.
	* term/gfxterm.c: Likewise.
	* video/bitmap.c: Likewise.
	* video/readers/jpeg.c: Likewise.
	* video/readers/png.c: Likewise.
	* video/readers/tga.c: Likewise.
	* video/video.c: Likewise.
	* util/grub-emu.c (read_command_list): Removed.
	(main): Don't call util_init_nls.
	* util/misc.c (grub_err_printf) [!GRUB_UTIL]: Removed.
	(grub_util_init_nls) [!GRUB_UTIL]: Likewise.
---

4a6d2d06dbf62e37389a8d8488e874fbc48f0920
diff --cc ChangeLog
index 3b5e2c7f2,3b5e2c7f2..faa88bbe2
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,3 +1,61 @@@
++2010-03-14  Vladimir Serbinenko  <phcoder@gmail.com>
++
++	Compile parts of grub-emu as modules.
++
++	* Makefile.in (TARGET_CPPFLAGS) [emu]: Remove -nostdinc -isystem.
++	(pkglib_DATA) [emu]: Remove moddep.lst command.lst fs.lst
++	partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst.
++	(all-local): Add $(GRUB_EMU).
++	(install-local): Install $(GRUB_EMU).
++	(uninstall): Uninstall $(GRUB_EMU).
++	* commands/parttool.c: Replace GRUB_UTIL with GRUB_NO_MODULES.
++	* kern/dl.c: Likewise.
++	* commands/sleep.c: Not include machine/time.h.
++	* conf/any-emu.rmk (COMMON_LDFLAGS): New variable.
++	(COMMON_CFLAGS): Likewise.
++	(sbin_UTILITIES): Remove grub-emu.
++	(grub_emu_SOURCES): Removed.
++	(kernel_img_RELOCATABLE): New variable.
++	(pkglib_PROGRAMS): Add kernel.img.
++	(kernel_img_SOURCES): New variable
++	(kernel_img_CFLAGS): Likewise.
++	(kernel_img_LDFLAGS): Likewise.
++	(TARGET_NO_STRIP): Likewise.
++	(TARGET_NO_DYNAMIC_MODULES): Likewise.
++	(pkglib_MODULES): Add progname.mod, hostfs.mod, host.mod, reboot.mod,
++	halt.mod, cpuid.mod, usb.mod, sdl.mod and pci.mod.
++	(grub-emu): New target.
++	(GRUB_EMU): New variable.
++	* configure.ac: Whitelist -emu as possible x86_64 architecture.
++	* efiemu/main.c: Replace GRUB_UTIL with GRUB_MACHINE_EMU.
++	* loader/xnu.c: Likewise.
++	* include/grub/pci.h: Likewise.
++	* genemuinit.sh: New file.
++	* genemuinitheader.sh: Likewise.
++	* genmk.rb: Don't strip if TARGET_NO_STRIP is yes.
++	Support TARGET_NO_DYNAMIC_MODULES.
++	* include/grub/dl.h (GRUB_NO_MODULES): New variable.
++	* commands/search.c: Fix GRUB_MOD_INIT and GRUB_MOD_FINI arguments.
++	* disk/loopback.c: Likewise.
++	* font/font_cmd.c: Likewise.
++	* partmap/acorn.c: Likewise.
++	* partmap/amiga.c: Likewise.
++	* partmap/apple.c: Likewise.
++	* partmap/gpt.c: Likewise.
++	* partmap/msdos.c: Likewise.
++	* partmap/sun.c: Likewise.
++	* parttool/msdospart.c: Likewise.
++	* term/gfxterm.c: Likewise.
++	* video/bitmap.c: Likewise.
++	* video/readers/jpeg.c: Likewise.
++	* video/readers/png.c: Likewise.
++	* video/readers/tga.c: Likewise.
++	* video/video.c: Likewise.
++	* util/grub-emu.c (read_command_list): Removed.
++	(main): Don't call util_init_nls.
++	* util/misc.c (grub_err_printf) [!GRUB_UTIL]: Removed.
++	(grub_util_init_nls) [!GRUB_UTIL]: Likewise.
++
  2010-03-14  Vladimir Serbinenko  <phcoder@gmail.com>
  
  	* conf/powerpc-ieee1275.rmk (pkglib_MODULES): Add datetime.mod,