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

2450 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vladimir 'phcoder' Serbinenko
1ef7e2992d Fix mismerge resulting in ghost multiboot module. Reported by: Grégoire Sutre. 2010-01-18 16:03:57 +01:00
Vladimir 'phcoder' Serbinenko
935842dd56 Always put smap after kern_end for freebsd 2010-01-18 13:32:56 +01:00
Vladimir 'phcoder' Serbinenko
5756bfe137 Fix regression in kfreebsd-i386 2010-01-18 12:45:28 +01:00
Vladimir 'phcoder' Serbinenko
6b9e2c181f merge bootcheck into newreloc 2010-01-18 12:40:33 +01:00
Vladimir 'phcoder' Serbinenko
3de254033c Fix x86_64-efi compilation 2010-01-18 12:01:13 +01:00
Vladimir 'phcoder' Serbinenko
c5545cf8ba Fix linux-x86_64 bootchecks 2010-01-18 12:00:00 +01:00
Vladimir 'phcoder' Serbinenko
0db3ae3ce6 Add bootcheck for kfreebsd-x86_64 2010-01-18 11:38:28 +01:00
Vladimir 'phcoder' Serbinenko
5d615a77ce kfreebsd-i386 boot test support 2010-01-18 11:14:04 +01:00
Vladimir 'phcoder' Serbinenko
ad8e99ec20 bootcheck support 2010-01-17 23:36:45 +01:00
Vladimir 'phcoder' Serbinenko
b14620812f Enable serial on all i386.rmk 2010-01-17 19:22:36 +01:00
Vladimir 'phcoder' Serbinenko
88d2919b7d Merge mainline into newreloc 2010-01-17 19:18:46 +01:00
Robert Millan
a0c2a0f6ff 2010-01-17 Robert Millan <rmh.grub@aybabtu.com> 
* include/grub/test.h: Add license header.
	* tests/example_functional_test.c: Likewise.
	* tests/example_unit_test.c: Likewise.
	* tests/lib/functional_test.c: Likewise.
	* tests/lib/test.c: Likewise.
	* tests/lib/unit_test.c: Likewise.
 2010-01-17 17:29:57 +00:00
Vladimir 'phcoder' Serbinenko
b0b139075e 2010-01-17 Vladimir Serbinenko <phcoder@gmail.com> 
Use flag-based instead of hook-based video mode selection and "auto"
	keyword.

	* include/grub/video.h (grub_video_adapter): Changed 'setup' member.
	(grub_video_set_mode): Changed prototype. All users updated.
	(grub_video_check_mode_flag): New inline function.
	* video/video.c (parse_modespec): New function.
	(grub_video_set_mode): Parse flags and keywords.
 2010-01-17 17:52:01 +01:00
carles
ea379330f9 2010-01-17 Carles Pina i Estany <carles@pina.cat> 
* util/misc.c (grub_util_info): Fix the order of the parameters in a
	fprintf call.
 2010-01-17 14:42:19 +00:00
Vladimir 'phcoder' Serbinenko
72ebf8b87c Sort chunks 2010-01-17 12:42:28 +01:00
Vladimir 'phcoder' Serbinenko
d92b0c01d4 Fixed knetbsd misbehaviour when no module is loaded 2010-01-16 12:55:52 +01:00
Felix Zielcke
e15c215ebd 2010-01-16 Grégoire Sutre <gregoire.sutre@gmail.com> 
* genmk.rb (class SCRIPT): Replace option -i of sed by a pipe.
 2010-01-16 11:57:47 +01:00
Vladimir 'phcoder' Serbinenko
ae9eb98c7d NetBSD module support 2010-01-16 11:47:12 +01:00
Vladimir 'phcoder' Serbinenko
cefe39c94b Fix knetbsd symbols 2010-01-16 11:06:55 +01:00
carles
409ae1c92a 2010-01-16 Carles Pina i Estany <carles@pina.cat> 
* util/grub-editenv.c (usage): Use `program_name' instead of hardcoded
	string.
	* util/grub-emu.c (usage): Likewise.
	* util/grub-mkpasswd-pbkdf2.c (usage): Likewise.
	* util/i386/efi/grub-mkimage.c (usage): Likewise.
	* util/i386/pc/grub-mkimage.c (usage): Likewise.
	* util/i386/pc/grub-setup.c (usage): Likewise.
 2010-01-16 00:39:14 +00:00
carles
70a14d3d49 2010-01-16 Carles Pina i Estany <carles@pina.cat> 
* util/misc.c (grub_util_warn): Gettextizze, print full stop after
	the message.
	(grub_util_info): Likewise.
	(grub_util_error): Likewise.
	* util/elf/grub-mkimage.c: Fix capitalisation, quotes, full stops
	and/or new lines in `grub_util_warna', `grub_util_info',
	`grub_util_error' calls.
	* util/getroot.c: Likewise.
	* util/grub-editenv.c: Likewise.
	* util/grub-emu.c: Likewise.
	* util/grub-fstest.c: Likewise.
	* util/grub-mkdevicemap.c: Likewise.
	* util/grub-mkfont.c: Likewise.
	* util/grub-mkpasswd-pbkdf2.c: Likewise.
	* util/grub-mkrelpath.c: Likewise.
	* util/grub-pe2elf.c: Likewise.
	* util/grub-probe.c: Likewise.
	* util/hostdisk.c: Likewise.
	* util/i386/efi/grub-mkimage.c: Likewise.
	* util/i386/pc/grub-mkimage.c: Likewise.
	* util/i386/pc/grub-setup.c: Likewise.
	* util/ieee1275/ofpath.c: Likewise.
	* util/mkisofs/eltorito.c: Likewise.
	* util/mkisofs/rock.c: Likewise.
	* util/mkisofs/write.c: Likewise.
	* util/raid.c: Likewise.
	* util/sparc64/ieee1275/grub-mkimage.c: Likewise.
	* util/sparc64/ieee1275/grub-setup.c: Likewise.
 2010-01-16 00:26:52 +00:00
Vladimir 'phcoder' Serbinenko
820e8e55fd Avoid retrieving video info when no video is active 2010-01-16 00:31:24 +01:00
Vladimir 'phcoder' Serbinenko
262355247f merge mainline into newreloc 2010-01-16 00:05:33 +01:00
Vladimir 'phcoder' Serbinenko
a0b766fc9b 2010-01-15 Vladimir Serbinenko <phcoder@gmail.com> 
Enable multiboot on non-pc.

	* conf/i386-coreboot.rmk, conf/i386-pc.rmk (pkglib_MODULES): Move
	multiboot.mod and multiboot2.mod to ...
	* conf/i386.rmk (pkglib_MODULES): ... here.
	* conf/i386-coreboot.rmk, conf/i386-pc.rmk (multiboot_mod_SOURCES):
	Moved to ...
	* conf/i386.rmk (multiboot_mod_SOURCES): .. here.
	* conf/i386-coreboot.rmk, conf/i386-pc.rmk (multiboot_mod_CFLAGS):
	Moved to ...
	* conf/i386.rmk (multiboot_mod_CFLAGS): .. here.
	* conf/i386-coreboot.rmk, conf/i386-pc.rmk (multiboot_mod_ASFLAGS):
	Moved to ...
	* conf/i386.rmk (multiboot_mod_ASFLAGS): .. here.
	* conf/i386-coreboot.rmk, conf/i386-pc.rmk (multiboot_mod_LDFLAGS):
	Moved to ...
	* conf/i386.rmk (multiboot_mod_LDFLAGS): .. here.
	* conf/x86_64-efi.rmk (pkglib_MODULES): Remove ata.mod and
	relocator.mod.
	(ata_mod_SOURCES): Removed.
	(ata_mod_CFLAGS): Likewise.
	(ata_mod_LDFLAGS): Likewise.
	(relocator_mod_SOURCES): Removed.
	(relocator_mod_CFLAGS): Likewise.
	(relocator_mod_ASFLAGS): Likewise.
	(relocator_mod_LDFLAGS): Likewise.
	Include i386.mk.
	* include/grub/x86_64/multiboot.h: New file.
	* loader/i386/multiboot.c (grub_multiboot_boot) [GRUB_MACHINE_EFI]:
	Terminate EFI.
 2010-01-15 21:11:51 +01:00
Vladimir 'phcoder' Serbinenko
884ade5654 2010-01-15 Vladimir Serbinenko <phcoder@gmail.com> 
Video multiboot support.

	* include/grub/multiboot.h (grub_multiboot_set_accepts_video):
	New prototype.
	* include/multiboot.h: Resynced with multiboot specification.
	* include/multiboot2.h: Likewise.
	* loader/i386/multiboot.c (UNSUPPORTED_FLAGS): Support video flags.
	(grub_multiboot): Parse MULTIBOOT_VIDEO_MODE fields.
	* loader/i386/multiboot_mbi.c (DEFAULT_VIDEO_MODE): New constant.
	(HAS_VGA_TEXT): Likewise.
	(accepts_video): New variable.
	(grub_multiboot_set_accepts_video): New function.
	(grub_multiboot_get_mbi_size): Account for video structures.
	(set_video_mode): New function.
	(retrieve_video_parameters): Likewise.
	(grub_multiboot_make_mbi): Fill video fields.
 2010-01-15 16:30:57 +01:00
Vladimir 'phcoder' Serbinenko
0d90e8a6fb 2010-01-15 Vladimir Serbinenko <phcoder@gmail.com> 
Video driver ids.

	* include/grub/video.h (grub_video_driver_id): New type.
	(grub_video_adapter): New member 'id'. All users updated.
	(grub_video_get_driver_id): New proto.
	* video/video.c (grub_video_get_driver_id): New function.
 2010-01-15 16:11:18 +01:00
Vladimir 'phcoder' Serbinenko
53fbae94a6 netbsd framebuffer support 2010-01-15 13:40:37 +01:00
Vladimir 'phcoder' Serbinenko
9766dafa74 symtab support for knetbsd 2010-01-15 12:31:06 +01:00
Vladimir 'phcoder' Serbinenko
5fb5182f8a comX notation support 2010-01-15 11:48:15 +01:00
Vladimir 'phcoder' Serbinenko
2386d586b9 Merge some knetbsdcode into kfreebsd one. Serial supoort for knetbsd 2010-01-15 11:39:05 +01:00
Vladimir 'phcoder' Serbinenko
def6307401 Be paranoid in relocator allocations 2010-01-15 11:34:22 +01:00
carles
5c71db1b9b 2010-01-14 Carles Pina i Estany <carles@pina.cat> 
* util/grub.d/30_os-prober.in: Use `set var=val' rather than plain
	`var=val'.
 2010-01-14 23:20:13 +00:00
carles
cca15b52c1 2010-01-14 Carles Pina i Estany <carles@pina.cat> 
* normal/cmdline.c (print_completion): Gettextizze.
 2010-01-14 23:07:44 +00:00
carles
c586fbb206 2001-01-14 Carles Pina i Estany <carles@pina.cat> 
* loader/i386/pc/chainloader.c: Include `<grub/mm.h>'.
 2010-01-14 23:04:49 +00:00
carles
ba2f6848e0 2010-01-14 Carles Pina i Estany <carles@pina.cat> 
* gettext/gettext.c (grub_gettext_translate): Push and pop
	grub_errno.
	(grub_gettext_delete_list): Change comment style.
	* kern/err.c (grub_error): Gettextizze.
	(grub_fatal): Gettextizze.
 2010-01-14 22:31:06 +00:00
Robert Millan
0a46429a55 2010-01-14 Robert Millan <rmh.grub@aybabtu.com> 
* include/grub/i386/loader.h (grub_linux16_boot): Renamed to ...
	(grub_linux16_real_boot): ... this.
	* kern/i386/loader.S: Likewise.
	* loader/i386/pc/linux.c: Include `<grub/video.h>' and `<grub/mm.h>'.
	(grub_linux16_boot): New function.  Switches to text mode and calls
	grub_linux16_real_boot().
	
	* loader/i386/bsd.c: Include `<grub/video.h>'.
	(grub_freebsd_boot, grub_openbsd_boot, grub_netbsd_boot): Switch to
	text mode before calling grub_unix_real_boot().
	
	* loader/i386/multiboot.c: Include `<grub/video.h>'.
	(grub_multiboot_boot): Switch to text mode before calling
	grub_relocator32_boot().
	
	* loader/i386/pc/chainloader.c: Include `<grub/video.h>'.
	(grub_chainloader_boot): Switch to text mode before calling
	grub_chainloader_real_boot().
 2010-01-14 21:08:31 +00:00
Vladimir 'phcoder' Serbinenko
9205ac07e3 Fix off-by-one error 2010-01-14 22:06:26 +01:00
Robert Millan
d6f93a661c 2010-01-05 Jordan Uggla <jordan.uggla@gmail.com> 
2010-01-05  Colin Watson  <cjwatson@ubuntu.com>
	
	* util/grub-reboot.in: Make sure prev_saved_entry always gets a
	non-empty value.
 2010-01-14 18:52:39 +00:00
Vladimir 'phcoder' Serbinenko
865a0f8aa7 elf symbols 2010-01-14 19:14:24 +01:00
Vladimir 'phcoder' Serbinenko
4a04699258 Fix a mistake with size calculation 2010-01-14 19:14:04 +01:00
Vladimir 'phcoder' Serbinenko
6a42fe54db Add missing #ifdef 2010-01-14 19:12:24 +01:00
Colin Watson
6d1e76899b fix changelog dates 2010-01-14 14:06:36 +00:00
Colin Watson
7d1468e4b6 merge from trunk 2010-01-14 14:04:44 +00:00
BVK Chaitanya
0934d18466 2010-01-14 BVK Chaitanya <bvk.groups@gmail.com> 
Unit testing framework for GRUB.

	* Makefile.in: Test framework build rules for 'make check'.
	* conf/tests.rmk: Build rules for individual tests and framework.

	* include/grub/test.h: Header file for whitebox tests.
	* tests/lib/functional_test.c: Framework support for whitebox
	functional tests.
	* tests/lib/test.c: Common whitebox testing code for unit and
	functional tests.
	* tests/lib/unit_test.c: Framework support for whitebox unit
	tests.

	* tests/util/grub-shell-tester.in: Support utility for grub-script
	tests.
	* tests/util/grub-shell.in: Utility to execute grub-script
	commands in a Qemu instance.

	* tests/example_functional_test.c: Example whitebox functional
	test.
	* tests/example_grub_script_test.in: Example grub-script test.
	* tests/example_scripted_test.in: Example scripted test.
	* tests/example_unit_test.c: Example whitebox unit test.
 2010-01-14 19:15:21 +05:30
BVK Chaitanya
96f60752d1 merge trunk 2010-01-14 18:45:19 +05:30
BVK Chaitanya
2285d4642a use qemu-system-i386 instead of qemu 2010-01-14 18:39:12 +05:30
Vladimir 'phcoder' Serbinenko
6dc1a8750a Merge mainline into newreloc 2010-01-14 13:43:34 +01:00
Vladimir 'phcoder' Serbinenko
ea96d34596 Clarify type of bi_kernelname and bi_nfs_diskless 2010-01-14 13:40:17 +01:00
BVK Chaitanya
0b8891c276 removed unnecessary grub_test_* wrappers 2010-01-14 17:17:51 +05:30
Vladimir 'phcoder' Serbinenko
9c4ffeebf5 2010-01-14 Vladimir Serbinenko <phcoder@gmail.com> 
* conf/i386-coreboot.rmk (multiboot_mod_SOURCES):
	Add loader/i386/multiboot_mbi.c.
	(multiboot2_mod_SOURCES): Likewise.
	* conf/i386-pc.rmk (multiboot_mod_SOURCES): Likewise.
	(multiboot2_mod_SOURCES): Likewise.
	* include/grub/multiboot.h (grub_multiboot_get_mbi_size): New proto.
	(grub_multiboot_make_mbi): Likewise.
	(grub_multiboot_free_mbi): Likewise.
	(grub_multiboot_init_mbi): Likewise.
	(grub_multiboot_add_module): Likewise.
	(grub_multiboot_set_bootdev): Likewise.
	* loader/i386/multiboot.c (mbi): Removed.
	(mbi_dest): Likewise.
	(alloc_mbi): New variable.
	(grub_multiboot_payload_size): Removed. All users updated.
	(grub_multiboot_pure_size): New variable.
	(grub_multiboot_boot): Use grub_multiboot_make_mbi.
	(grub_multiboot_unload): Use grub_multiboot_free_mbi.
	(grub_get_multiboot_mmap_len): Moved to loader/i386/multiboot_mbi.c.
	(grub_fill_multiboot_mmap): Likewise.
	(grub_multiboot_get_bootdev): Likewise.
	(grub_multiboot): Use multiboot_mbi functions.
	* loader/i386/multiboot_mbi.c: New file.
 2010-01-14 12:40:55 +01:00