vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2939 commits 7 branches 16 tags 143 MiB
Commit graph

768 commits

Author SHA1 Message Date
Colin Watson
bed1d3524e * util/grub-install.in: Copy .mo files from @datadir@/locale, to 
match where 'make install' puts them.
* util/i386/efi/grub-install.in: Likewise.
 2010-03-21 23:04:02 +00:00
BVK Chaitanya
8622549153 merged in mainline 2010-03-14 22:20:55 +05:30
Vladimir 'phcoder' Serbinenko
1d63a066e2 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 17:17:49 +01:00
Colin Watson
08e46ededa 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 15:39:14 +00:00
Vladimir 'phcoder' Serbinenko
dae79b6b05 Merge mainline into emu-mod 2010-03-14 16:27:54 +01:00
Vladimir 'phcoder' Serbinenko
016a671b51 Merge mainline into cleanbuild 2010-03-14 16:01:31 +01:00
Vladimir 'phcoder' Serbinenko
313df2f552 Merge mainline into sparc-mkimage 2010-03-14 15:21:04 +01:00
Thorsten Glaser
d68b491ee2 * util/grub-mkrescue.in: Base ISO UUID on UTC. 2010-03-14 13:48:55 +01:00
Matt Kraai
4e02ed5014 2010-03-08 Matt Kraai <kraai@ftbfs.org> 
* util/i386/pc/grub-setup.c (setup): Fix a grammatical error (Debian
	bug #559005).
 2010-03-08 22:20:02 +00:00
Vladimir 'phcoder' Serbinenko
33e2e6f373 2010-03-06 Vladimir Serbinenko <phcoder@gmail.com> 
* util/grub-mkrescue.in: Use mktemp with explicit template.
 2010-03-06 17:28:25 +01:00
Vladimir 'phcoder' Serbinenko
60b03859e8 2010-03-05 Vladimir Serbinenko <phcoder@gmail.com> 
* util/import_gcry.py: Add autogenerated files to MAINTAINER_CLEANFILES.
 2010-03-05 15:38:04 +01:00
Christian Franke
4760f97911 2010-03-04 Christian Franke <franke@computer.org> 
* util/grub-pe2elf.c: Add missing include "progname.h".
 2010-03-04 16:25:26 +01:00
Vladimir 'phcoder' Serbinenko
08dcd91370 2010-03-04 Vladimir Serbinenko <phcoder@gmail.com> 
* util/i386/efi/grub-install.in: Copy gettext files.
 2010-03-04 15:12:34 +01:00
Colin Watson
c6293875f9 reopen device when the requested access mode changes 2010-03-03 20:03:50 +00:00
Colin Watson
22d7b6137a 2010-03-03 Colin Watson <cjwatson@ubuntu.com> 
* 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-03 10:44:12 +00:00
Vladimir 'phcoder' Serbinenko
14532662ee merge mainline into sparc-mkimage 2010-03-03 11:24:36 +01:00
Vladimir 'phcoder' Serbinenko
72b286313a 2010-02-26 Vladimir Serbinenko <phcoder@gmail.com> 
* util/grub.d/10_linux.in (linux_entry): Don't default to
	gfxpayload=keep if Linux doesn't support video handover.
 2010-02-26 14:32:24 +01:00
Colin Watson
a0ca21c2d2 2010-02-25 Jordan Uggla <jordan.uggla@gmail.com> 
* util/grub-mkconfig.in (GRUB_SAVEDEFAULT): Export new variable.
	* util/grub-mkconfig_lib.in (save_default_entry): Only save a new
	default entry if GRUB_SAVEDEFAULT=true.  This allows using
	GRUB_DEFAULT=saved on its own to let grub-reboot work, without
	saving a new default on every boot.
 2010-02-25 13:30:50 +00:00
carles
7dd05b96dc 2010-02-20 Carles Pina i Estany <carles@pina.cat> 
* util/grub-mkrawimage.c (usage): Change string formatting to
	improve gettext.
 2010-02-20 23:31:35 +00:00
Samuel Thibault
0a39de87d9 2010-02-14 Samuel Thibault <samuel.thibault@ens-lyon.org> 
* util/grub-mkconfig.in: Export GRUB_INIT_TUNE.
	* util/grub.d/00_header.in: Handle GRUB_INIT_TUNE.
 2010-02-18 08:56:31 +01:00
Vladimir 'phcoder' Serbinenko
d27859b2ec 2010-02-14 Vladimir Serbinenko <phcoder@gmail.com> 
* util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Enclose
	set root in single quotes to prevent \, from being unescaped.
 2010-02-14 14:47:50 +01:00
Vladimir 'phcoder' Serbinenko
10f6389453 Fix raw image addresses 2010-02-13 18:48:33 +01:00
Vladimir 'phcoder' Serbinenko
0b4ab8e54a Merge mainline int sparc-mkimage-unify 2010-02-13 16:49:21 +01:00
Vladimir 'phcoder' Serbinenko
a49217cff7 aout image support 2010-02-13 16:26:50 +01:00
Vladimir 'phcoder' Serbinenko
bdca260795 2010-02-13 Vladimir Serbinenko <phcoder@gmail.com> 
* util/grub-mkrawimage.c (main): Call set_program_name.
 2010-02-13 15:57:42 +01:00
Vladimir 'phcoder' Serbinenko
da278c4d34 2010-02-13 Vladimir Serbinenko <phcoder@gmail.com> 
Properly align 64-bit targets.

	* util/grub-mkrawimage.c (ALIGN_ADDR): New macro.
	(generate_image): Use ALIGN_ADDR.
 2010-02-13 15:54:27 +01:00
Vladimir 'phcoder' Serbinenko
b274d734f3 2010-02-13 Vladimir Serbinenko <phcoder@gmail.com> 
Properly create cross-endian images.

	* include/grub/types.h (grub_host_to_target_addr): New macro
	* util/grub-mkrawimage.c (generate_image): Add missing host_to_target.
 2010-02-13 15:40:13 +01:00
Vladimir 'phcoder' Serbinenko
82da2062d8 2010-02-13 Vladimir Serbinenko <phcoder@gmail.com> 
* util/grub-mkrawimage.c (generate_image): Add forgotten ALIGN_UP.
 2010-02-13 15:25:37 +01:00
Vladimir 'phcoder' Serbinenko
6bea3f8983 merge sparc grub-mkimage into grub-mkrawimage 2010-02-12 20:08:56 +01:00
Vladimir 'phcoder' Serbinenko
65a533e78a 2010-02-10 Vladimir Serbinenko <phcoder@gmail.com> 
Support GRUB_GFXPAYLOAD_LINUX.

	* util/grub-mkconfig.in: Export GRUB_GFXPAYLOAD_LINUX.
	* util/grub.d/10_linux.in (linux_entry): Handle GRUB_GFXPAYLOAD_LINUX.
 2010-02-10 19:53:13 +01:00
Vladimir 'phcoder' Serbinenko
ec0be08d40 Clean building system 2010-02-07 23:49:49 +01:00
Vladimir 'phcoder' Serbinenko
a1a8d38a58 Use nostdinc 2010-02-07 17:30:16 +01:00
Vladimir 'phcoder' Serbinenko
2083672af1 Remove -DGRUB_UTIL when compiling grub-emu 2010-02-07 04:23:44 +01:00
Vladimir 'phcoder' Serbinenko
19a9fb834b merge mainline into emu-mod 2010-02-07 03:06:33 +01:00
Vladimir 'phcoder' Serbinenko
74e4934e1c 2010-02-07 Vladimir Serbinenko <phcoder@gmail.com> 
* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Rename one instance
	of disk to dsk to avoid shadowing.
	(find_free_slot): Fix prototype.
	* util/getroot.c (grub_util_is_dmraid): Make static.
	* include/grub/time.h (grub_get_rtc) [GRUB_MACHINE_EMU || GRUB_UTIL]:
	Add missing prototype.
	* util/sdl.c (grub_video_sdl_set_viewport): Remove.
 2010-02-07 02:47:18 +01:00
Vladimir 'phcoder' Serbinenko
f88d801b17 2010-02-07 Vladimir Serbinenko <phcoder@gmail.com> 
Fix warnings in grub-emu when compiling with maximum warning options.

	* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Rename one instance
	of disk to dsk to avoid shadowing.
 2010-02-07 02:44:47 +01:00
Vladimir 'phcoder' Serbinenko
98e6959dea 2010-02-07 Vladimir Serbinenko <phcoder@gmail.com> 
Fix warnings in grub-emu when compiling with maximum warning options.

	* util/grub-emu.c (ENABLE_RELOCATABLE): New definition.
	(grub_arch_modules_addr): Return 0 and not NULL.
	* util/misc.c (ENABLE_RELOCATABLE): New definition.
	(xstrdup): USe newstr instead of dup.
 2010-02-07 02:37:48 +01:00
Vladimir 'phcoder' Serbinenko
909301af11 First try at generating grub-emu from modules 2010-02-07 02:07:35 +01:00
Vladimir 'phcoder' Serbinenko
8f891adc6f 2010-02-07 Vladimir Serbinenko <phcoder@gmail.com> 
* include/grub/cache.h (grub_arch_sync_caches) [i386 || x86_64]: Inline.
	* kern/i386/coreboot/init.c (grub_arch_sync_caches): Remove.
	* kern/i386/efi/init.c (grub_arch_sync_caches): Likewise.
	* kern/i386/ieee1275/init.c (grub_arch_sync_caches): Likewise.
	* kern/i386/pc/init.c (grub_arch_sync_caches): Likewise.
	* util/misc.c (grub_arch_sync_caches) [i386 || x86_64]: Likewise.
 2010-02-07 00:52:31 +01:00
Vladimir 'phcoder' Serbinenko
1f534b6908 Merge mainline into gfxmenu 2010-02-03 01:24:07 +01:00
Vladimir 'phcoder' Serbinenko
2b4068e992 2010-02-03 Vladimir Serbinenko <phcoder@gmail.com> 
* util/hostdisk.c (open_device): Don't use partition device when reading
	before the partition.
	(grub_util_biosdisk_read): Don't read from partition and before the
	partition in single operation.
	(grub_util_biosdisk_write): Don't write to partition and before the
	partition in single operation.
 2010-02-03 00:49:35 +01:00
Christian Schmitt
bf7fcba2d7 2010-01-28 Christian Schmitt <chris@ilovelinux.de> 
* util/ieee1275/grub-install.in: Fix nvsetenv arguments.
 2010-01-28 23:10:37 +01:00
BVK Chaitanya
366e15ba86 sync with trunk 2010-01-28 21:48:15 +05:30
BVK Chaitanya
275d6f6bd4 fix grub-script-check 2010-01-28 21:43:28 +05:30
Colin Watson
2e1cb9bbbf 2010-01-28 Colin Watson <cjwatson@ubuntu.com> 
* util/grub.d/10_linux.in: This script does not use any of the
	contents of gettext.sh, only the external command `gettext', so stop
	sourcing it.  (Moreover, gettext.sh isn't necessarily installed in
	the same prefix as GRUB.)
	* util/grub.d/10_kfreebsd.in: Likewise.
 2010-01-28 12:49:40 +00:00
Robert Millan
27dea7eda4 2010-01-27 Robert Millan <rmh.grub@aybabtu.com> 
* util/hostfs.c: Include `<errno.h>'.
	(grub_hostfs_read): Handle errors from fseeko() and fread().
 2010-01-27 03:18:14 +00:00
Robert Millan
af75a9f19a 2010-01-27 Robert Millan <rmh.grub@aybabtu.com> 
* util/grub-fstest.c (fstest): Rewrite allocation, fixing a few
	memleak conditions.
 2010-01-27 01:49:11 +00:00
carles
254e2ce596 2010-01-27 Carles Pina i Estany <carles@pina.cat> 
* util/lvm.c: New macro LVM_DEV_MAPPER_STRING.
	(grub_util_lvm_isvolume): Use LVM_DEV_MAPPER_STRING.
 2010-01-27 00:19:46 +00:00
carles
b510928c38 2010-01-26 Carles Pina i Estany <carles@pina.cat> 
* util/bin2h.c (usage): Fix warning (space after backslash).
 2010-01-26 21:23:59 +00:00
carles
de0b7a4ed1 2010-01-25 Carles Pina i Estany <carles@pina.cat> 
* font/font.c: Include `grub/fontformat.h.
	Remove font file format constants.
	(grub_font_load): Use the new macros.
	* include/grub/fontformat.h: New file.
	* util/grub-mkfont.c: Include `grub/fontformat.c'.
	(write_font_pf2): Use the new macros.
 2010-01-26 20:16:08 +00:00