Commit graph

2833 commits

Author SHA1 Message Date
Vladimir 'phcoder' Serbinenko
5b4f655bad cleaned ATI fixes 2009-12-18 02:11:26 +01:00
Vladimir 'phcoder' Serbinenko
b73d4bab7e Merge trunk into ati 2009-12-18 02:04:10 +01:00
Felix Zielcke
0297aafb9f 2009-12-17 Felix Zielcke <fzielcke@z-51.de>
* gendistlist.sh: Use POSIX compliant `!' instead of `-not' in
	the `find' command.
2009-12-17 11:19:12 +01:00
Vladimir 'phcoder' Serbinenko
e6d8d32a94 fix efi video drivers for video API change 2009-12-16 19:03:56 +01:00
Vladimir 'phcoder' Serbinenko
45da21ff5a merge mainline into videomask 2009-12-16 17:52:17 +01:00
Vladimir 'phcoder' Serbinenko
db846aed9a minimalising ATI impact 2009-12-16 16:53:01 +01:00
Vladimir 'phcoder' Serbinenko
c179ebe4ee 2009-12-16 Vladimir Serbinenko <phcoder@gmail.com>
UUID support for HFS.

	* fs/hfs.c (grub_hfs_uuid): New function.
	(grub_hfs_fs): New value .uuid.
	* include/grub/hfs.h (grub_hfs_sblock): New field 'num_serial'.
2009-12-16 15:40:31 +01:00
Robert Millan
ffb2403f5f Undo DEFAULT_VIDEO_MODE kludge (correct solution is in gfxmenu branch) 2009-12-15 21:06:04 +00:00
Vladimir 'phcoder' Serbinenko
8a40612b2c fix ofconsole palette 2009-12-15 19:57:23 +01:00
Vladimir 'phcoder' Serbinenko
7ca3f5c2d9 one more possible fix 2009-12-14 18:16:32 +01:00
Felix Zielcke
574cce0cfa 2009-12-14 Felix Zielcke <fzielcke@z-51.de>
Fix a segfault with parsing unknown long options.

	* util/grub-mkrelpath.c (options): Zero terminate it.
2009-12-14 11:06:24 +01:00
Felix Zielcke
7cba88bbde Include <grub/cmos.h> instead of <grub/i386/cmos.h> in kern/i386/qemu/mmap.c to fix a compiler warning 2009-12-13 21:03:47 +01:00
Carles Pina i Estany
c4a3e41a72 2009-12-13 Carles Pina i Estany <carles@pina.cat>
* include/grub/misc.h (grub_puts): New declaration.
	(grub_puts_): Likewise.
	* kern/mis.c (grub_puts): New definition.
	(grub_puts_): Likewise.
2009-12-13 19:51:08 +00:00
Robert Millan
2e8a760287 2009-12-13 Robert Millan <rmh.grub@aybabtu.com>
* util/grub-probe.c (probe): Improve error message.
2009-12-13 19:46:59 +00:00
Robert Millan
648fb15b29 Merge from trunk 2009-12-13 18:41:21 +00:00
Robert Millan
b50b77b9a8 Merge relocator branch 2009-12-13 18:37:44 +00:00
Robert Millan
616da3a154 2009-12-13 Robert Millan <rmh.grub@aybabtu.com>
* loader/i386/multiboot_elfxx.c
        (CONCAT(grub_multiboot_load_elf, XX)): Fix `grub_multiboot_payload_eip'
        initialization.
2009-12-13 18:29:15 +00:00
Vladimir 'phcoder' Serbinenko
29eb90c620 2009-12-13 Vladimir Serbinenko <phcoder@gmail.com>
* kern/i386/pc/startup.S (multiboot_entry): Setup stack before calling
	anything.
2009-12-13 18:32:06 +01:00
Vladimir 'phcoder' Serbinenko
3e8c081543 legacy-like stack handling 2009-12-13 18:10:53 +01:00
Vladimir 'phcoder' Serbinenko
5a0e0cc6bd Fix XNU resume. 2009-12-13 18:07:01 +01:00
Vladimir 'phcoder' Serbinenko
087793c68e Cleanup address expressions for readability and using only unsigned arithmetics 2009-12-13 18:03:46 +01:00
Carles Pina i Estany
3102743011 2009-12-13 Carles Pina i Estany <carles@pina.cat>
* script/execute.c (grub_script_execute_cmdline): Set grub_errno to
	GRUB_ERR_NONE before calling grub_env_set.
2009-12-13 12:35:20 +00:00
Vladimir 'phcoder' Serbinenko
4d902d3715 merge from trunk 2009-12-12 02:38:30 +01:00
Vladimir 'phcoder' Serbinenko
b66948bd88 setjmp on mips 2009-12-12 02:33:41 +01:00
Vladimir 'phcoder' Serbinenko
5417641c66 Fix loading of modules of size not divisible by 4 2009-12-12 02:33:15 +01:00
Robert Millan
dc0c71d974 2009-12-12 Robert Millan <rmh@aybabtu.com>
* gendistlist.sh (EXTRA_DISTFILES): Add `genvideolist.sh'.
        * genmk.rb (video): New variable.
        (CLEANFILES, VIDEOFILES): Add #{video}.
        (#{video}): New target rule.
        * genvideolist.sh: New file.
        * Makefile.in (pkglib_DATA): Add video.lst.
        (video.lst): New target rule.
        * util/grub-mkconfig.in: Initialize ${GRUB_VIDEO_BACKEND} using
        `video.lst'.
        * util/grub.d/30_os-prober.in: Replace `vbe' with
        ${GRUB_VIDEO_BACKEND}.
2009-12-12 00:43:32 +00:00
Robert Millan
03157a273d util/sparc64/ieee1275/grub-install.in was meant to be removed 2009-12-12 00:10:38 +00:00
Robert Millan
37ba589a4e Merge from trunk 2009-12-12 00:07:45 +00:00
Robert Millan
cb0573b750 Merge from trunk 2009-12-11 23:11:58 +00:00
Robert Millan
cbf73baaae Indentation fix & missing copyright year. 2009-12-11 23:10:57 +00:00
Robert Millan
2a4bfcf0da 2009-12-11 Robert Millan <rmh.grub@aybabtu.com>
* THANKS: Add David Miller.
2009-12-11 22:44:47 +00:00
Robert Millan
dfec2d96f9 Merge from trunk 2009-12-11 21:20:00 +00:00
Robert Millan
838114b687 Merge from trunk 2009-12-11 21:15:58 +00:00
Vladimir 'phcoder' Serbinenko
d4af2a73dc datetime for yeeloong 2009-12-11 22:14:09 +01:00
Robert Millan
2a3aa4d570 Merge pciaccess branch 2009-12-11 21:12:57 +00:00
Felix Zielcke
8d0502d9b2 2009-12-11 Felix Zielcke <fzielcke@z-51.de>
* util/misc.c: Don't include <errno.h> twice.
2009-12-11 11:11:34 +01:00
Robert Millan
febfc12c6e 2009-12-10 Robert Millan <rmh.grub@aybabtu.com>
* include/grub/mips/libgcc.h: Only export symbols for functions
        that libgcc provides.
2009-12-10 22:38:54 +00:00
Felix Zielcke
0d56ed64d2 2009-12-10 Felix Zielcke <fzielcke@z-51.de>
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Show the disk
	name in an error message.
	(grub_biosdisk_rw): Likewise.
2009-12-10 19:15:20 +01:00
Vladimir 'phcoder' Serbinenko
2e59983c82 2009-12-10 Vladimir Serbinenko <phcoder@gmail.com>
Eliminate NTFS 4Gib barrier.

	* fs/ntfs.c (read_attr): Use grub_disk_addr_t and grub_size_t.
	(read_run_data): Likewise.
	(grub_ntfs_read_run_list): Likewise.
	(grub_ntfs_read_block): Likewise.
	(grub_ntfs_iterate_dir): Likewise.
	(read_mft): Likewise.
	(read_data): Likewise.
	Use COM_LOG_LEN.
	* fs/ntfscomp.c (read_block): Cast ctx->target_vcn & 0xF to unsigned
	to avoid 64-bit division
	* include/grub/ntfs.h (COM_LOG_LEN): New definition.
	(grub_ntfs_rlst): Use grub_disk_addr_t.
2009-12-10 14:45:00 +01:00
Vladimir 'phcoder' Serbinenko
71ee178adb 2009-12-10 Vladimir Serbinenko <phcoder@gmail.com>
Eliminate grub-fstest 4Gib barrier.

	* util/grub-fstest.c (skip, leng): Use grub_disk_addr_t.
	(read_file): Fix error reporting.
2009-12-10 14:39:54 +01:00
Vladimir 'phcoder' Serbinenko
2520d4b815 2009-12-10 Vladimir Serbinenko <phcoder@gmail.com>
Eliminate hexdump 4Gib barrier.

	* commands/hexdump.c (grub_cmd_hexdump): Use grub_disk_addr_t.
	* lib/arg.c (grub_arg_parse): Use grub_strtoull.
2009-12-10 14:37:42 +01:00
Vladimir 'phcoder' Serbinenko
e1f270654e 2009-12-10 Vladimir Serbinenko <phcoder@gmail.com>
* kern/device.c (grub_device_iterate): Ignore errors during first scan.
	Fixes amarsh bug.
2009-12-10 13:26:22 +01:00
Robert Millan
1a0f7f4553 2009-12-09 Bruce Dubbs <bruce.dubbs@gmail.com>
Remove miscellaneous files in distclean target.

        * Makefile.in: Remove docs/{grub.info,version.texi,stamp-vti}
2009-12-09 21:43:05 +00:00
Vladimir 'phcoder' Serbinenko
8f44a91ea9 Fix bug in at_keyboard which blocked the menu countdown. 2009-12-09 21:47:58 +01:00
Vladimir 'phcoder' Serbinenko
02772f981b correct return value of checkkey for null-terminal 2009-12-09 20:34:14 +01:00
Vladimir 'phcoder' Serbinenko
546d060783 grub-install for yeeloong 2009-12-09 19:39:21 +01:00
Vladimir 'phcoder' Serbinenko
d114e89ca8 Add clock 2009-12-09 17:58:48 +01:00
Colin Watson
c631d9fb17 2009-12-09 Colin Watson <cjwatson@ubuntu.com>
* util/grub-mkconfig_lib.in: Don't set grub_probe or grub_mkrelpath
	if they're already set.  This resolves the conflict between my
	grub-install change on 2009-10-06 and Felix' change on 2009-11-11,
	fixing the --grub-probe option again.
	* util/sparc64/ieee1275/grub-install.in: Revert the last piece of my
	change on 2009-10-06, so that we now once again source
	`${libdir}/grub/grub-mkconfig_lib' after options have been parsed.
2009-12-09 16:20:17 +00:00
Robert Millan
7c7b610626 2009-12-08 Robert Millan <rmh.grub@aybabtu.com>
* conf/common.rmk [sparc64-ieee1275] (grub_mkdevicemap_SOURCES): Use
        `util/ieee1275/ofpath.c' and `util/ieee1275/devicemap.c' instead of
        `util/devicemap.c'.
2009-12-08 16:00:52 +00:00
Colin Watson
6c1f8c1215 2009-12-08 Colin Watson <cjwatson@ubuntu.com>
* util/grub.d/30_os-prober.in: Call save_default_entry for hurd.
2009-12-08 01:02:08 +00:00