]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
Remove some redundancy in build system.
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sun, 14 Mar 2010 16:17:49 +0000 (17:17 +0100)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sun, 14 Mar 2010 16:17:49 +0000 (17:17 +0100)
* Makefile.in (TARGET_CFLAGS): Add -ffreestanding.
(TARGET_ASFLAGS): Add -nostdinc -fno-builtin.
(TARGET_LDFLAGS): Add -nostdlib.
(TARGET_IMG_LDFLAGS): Likewise.
* commands/lsmmap.c (grub_cmd_lsmmap) [GRUB_MACHINE_EMU]: Don't do
anything since mmap isn't available.
* conf/any-emu.rmk (kernel_img_SOURCES): Remove commands/boot.c.
Add util/time.c.
(pkglib_MODULES): Remove reboot.mod.
(reboot_mod_SOURCES): Removed.
(reboot_mod_CFLAGS): Likewise.
(reboot_mod_LDFLAGS): Likewise.
* conf/common.rmk (script/lexer.c_DEPENDENCIES): New variable.
(MOSTLYCLEANFILES): Add symlist.c kernel_syms.lst.
(DEFSYMFILES): Add kernel_syms.lst.
(kernel_img_HEADERS): Add common headers.
(symlist.c): New target.
(kernel_syms.lst): Likewise.
(pkglib_MODULES): Add memdisk.mod.
(memdisk_mod_SOURCES): New variable.
(memdisk_mod_CFLAGS): Likewise.
(memdisk_mod_LDFLAGS): Likewise.
(pkglib_MODULES): Add reboot.mod.
(reboot_mod_SOURCES): New variable.
(reboot_mod_CFLAGS): Likewise.
(reboot_mod_LDFLAGS): Likewise.
(pkglib_MODULES): Add date.mod.
(date_mod_SOURCES): New variable.
(date_mod_CFLAGS): Likewise.
(date_mod_LDFLAGS): Likewise.
(pkglib_MODULES): Add datehook.mod.
(datehook_mod_SOURCES): New variable.
(datehook_mod_CFLAGS): Likewise.
(datehook_mod_LDFLAGS): Likewise.
(pkglib_MODULES): Add lsmmap.mod.
(lsmmap_mod_SOURCES): New variable.
(lsmmap_mod_CFLAGS): Likewise.
(lsmmap_mod_LDFLAGS): Likewise.
(pkglib_MODULES): Add boot.mod.
(boot_mod_SOURCES): New variable.
(boot_mod_CFLAGS): Likewise.
(boot_mod_LDFLAGS): Likewise.
* conf/i386-coreboot.rmk: Removed redundant parts.
* conf/i386-ieee1275.rmk: Likewise.
* conf/i386-pc.rmk: Likewise.
* conf/mips-yeeloong.rmk: Likewise.
* conf/mips.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* conf/i386-coreboot.rmk: Moved qemu parts ..
* conf/i386-qemu.rmk: ... here
* conf/i386-efi.rmk: Moved common parts to...
* conf/x86-efi.rmk: ... here.
* conf/i386.rmk: Added modules common to all x86 variants.
* configure.ac: Add -m32/-m64 to TARGET_ASFLAGS.
* disk/memdisk.c: Remove grub/machine/kernel.h.
* gensymlist.sh.in: Include symbol.h.
* hook/datehook.c: Correct module name.
* include/grub/datetime.h (grub_get_datetime) [GRUB_MACHINE_EMU]: Export.
(grub_set_datetime) [GRUB_MACHINE_EMU]: Likewise.
* include/grub/i386/efi/serial.h: New file.
* include/grub/x86_64/efi/serial.h: Likewise.
* util/time.c: Likewise.
* video/ieee1275.c (grub_video_ieee1275_setup): Handle 64-bit void *.

1  2 
ChangeLog
conf/any-emu.rmk
conf/common.rmk
conf/i386-pc.rmk
conf/sparc64-ieee1275.rmk

diff --cc ChangeLog
index 7002dc5767dcf124fcb273c28082e975df608c26,faa88bbe27041625362cd95c2616a05e0ccf030f..4f23af213300c6704e774364baaa7ea3ff45b9ee
+++ b/ChangeLog
@@@ -1,38 -1,3 +1,108 @@@
++2010-03-14  Vladimir Serbinenko  <phcoder@gmail.com>
++
++      Remove some redundancy in build system.
++
++      * Makefile.in (TARGET_CFLAGS): Add -ffreestanding.
++      (TARGET_ASFLAGS): Add -nostdinc -fno-builtin.
++      (TARGET_LDFLAGS): Add -nostdlib.
++      (TARGET_IMG_LDFLAGS): Likewise.
++      * commands/lsmmap.c (grub_cmd_lsmmap) [GRUB_MACHINE_EMU]: Don't do
++      anything since mmap isn't available.
++      * conf/any-emu.rmk (kernel_img_SOURCES): Remove commands/boot.c.
++      Add util/time.c.
++      (pkglib_MODULES): Remove reboot.mod.
++      (reboot_mod_SOURCES): Removed.
++      (reboot_mod_CFLAGS): Likewise.
++      (reboot_mod_LDFLAGS): Likewise.
++      * conf/common.rmk (script/lexer.c_DEPENDENCIES): New variable.
++      (MOSTLYCLEANFILES): Add symlist.c kernel_syms.lst.
++      (DEFSYMFILES): Add kernel_syms.lst.
++      (kernel_img_HEADERS): Add common headers.
++      (symlist.c): New target.
++      (kernel_syms.lst): Likewise.
++      (pkglib_MODULES): Add memdisk.mod.
++      (memdisk_mod_SOURCES): New variable.
++      (memdisk_mod_CFLAGS): Likewise.
++      (memdisk_mod_LDFLAGS): Likewise.
++      (pkglib_MODULES): Add reboot.mod.
++      (reboot_mod_SOURCES): New variable.
++      (reboot_mod_CFLAGS): Likewise.
++      (reboot_mod_LDFLAGS): Likewise.
++      (pkglib_MODULES): Add date.mod.
++      (date_mod_SOURCES): New variable.
++      (date_mod_CFLAGS): Likewise.
++      (date_mod_LDFLAGS): Likewise.
++      (pkglib_MODULES): Add datehook.mod.
++      (datehook_mod_SOURCES): New variable.
++      (datehook_mod_CFLAGS): Likewise.
++      (datehook_mod_LDFLAGS): Likewise.
++      (pkglib_MODULES): Add lsmmap.mod.
++      (lsmmap_mod_SOURCES): New variable.
++      (lsmmap_mod_CFLAGS): Likewise.
++      (lsmmap_mod_LDFLAGS): Likewise.
++      (pkglib_MODULES): Add boot.mod.
++      (boot_mod_SOURCES): New variable.
++      (boot_mod_CFLAGS): Likewise.
++      (boot_mod_LDFLAGS): Likewise.
++      * conf/i386-coreboot.rmk: Removed redundant parts.
++      * conf/i386-ieee1275.rmk: Likewise.
++      * conf/i386-pc.rmk: Likewise.
++      * conf/mips-yeeloong.rmk: Likewise.
++      * conf/mips.rmk: Likewise.
++      * conf/powerpc-ieee1275.rmk: Likewise.
++      * conf/sparc64-ieee1275.rmk: Likewise.
++      * conf/x86_64-efi.rmk: Likewise.
++      * conf/i386-coreboot.rmk: Moved qemu parts ..
++      * conf/i386-qemu.rmk: ... here
++      * conf/i386-efi.rmk: Moved common parts to...
++      * conf/x86-efi.rmk: ... here.
++      * conf/i386.rmk: Added modules common to all x86 variants.
++      * configure.ac: Add -m32/-m64 to TARGET_ASFLAGS.
++      * disk/memdisk.c: Remove grub/machine/kernel.h.
++      * gensymlist.sh.in: Include symbol.h.
++      * hook/datehook.c: Correct module name.
++      * include/grub/datetime.h (grub_get_datetime) [GRUB_MACHINE_EMU]: Export.
++      (grub_set_datetime) [GRUB_MACHINE_EMU]: Likewise.
++      * include/grub/i386/efi/serial.h: New file.
++      * include/grub/x86_64/efi/serial.h: Likewise.
++      * util/time.c: Likewise.
++      * video/ieee1275.c (grub_video_ieee1275_setup): Handle 64-bit void *.
++
 +2010-03-14  Colin King  <colin.king@ubuntu.com>
 +2010-03-14  Colin Watson  <cjwatson@ubuntu.com>
 +
 +      Shrink the pre-partition-table part of boot.img by eight bytes.
 +
 +      * boot/i386/pc/boot.S (ERR): New macro.
 +      (chs_mode): Use ERR.
 +      (geometry_error): Likewise.
 +      (hd_probe_error): Remove.  This is only used once, so we wrwite
 +      it inline instead.
 +      (read_error): Instead of printing read_error_string, just set up
 +      %si and fall through to ...
 +      (error_message): ... this new function, also used by ERR.
 +
 +2010-03-14  Colin Watson  <cjwatson@ubuntu.com>
 +
 +      Speed up consecutive hostdisk operations on the same device.
 +
 +      * util/hostdisk.c (struct grub_util_biosdisk_data): New structure.
 +      (grub_util_biosdisk_open): Initialise disk->data.
 +      (struct linux_partition_cache): New structure.
 +      (linux_find_partition): Cache partition start positions; these are
 +      expensive to compute on every read and write.
 +      (open_device): Cache open file descriptor in disk->data, so that we
 +      don't have to reopen it and flush the buffer cache for consecutive
 +      operations on the same device.
 +      (grub_util_biosdisk_close): New function.
 +      (grub_util_biosdisk_dev): Set `close' member.
 +
 +      * conf/common.rmk (grub_probe_SOURCES): Add kern/list.c.
 +      * conf/i386-efi.rmk (grub_setup_SOURCES): Likewise.
 +      * conf/i386-pc.rmk (grub_setup_SOURCES): Likewise.
 +      * conf/sparc64-ieee1275.rmk (grub_setup_SOURCES): Likewise.
 +      * conf/x86_64-efi.rmk (grub_setup_SOURCES): Likewise.
 +
  2010-03-14  Vladimir Serbinenko  <phcoder@gmail.com>
  
        Compile parts of grub-emu as modules.
Simple merge
diff --cc conf/common.rmk
Simple merge
Simple merge
Simple merge