Robert Millan
885d1a8d90
Support --help and --version in grub-bin2h.
2010-01-14 20:33:10 +00: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
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
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
Vladimir 'phcoder' Serbinenko
05847c24e1
Merge mainline into abstractmbi
2010-01-14 12:34:23 +01:00
Vladimir 'phcoder' Serbinenko
17383dfe96
2010-01-13 Vladimir Serbinenko <phcoder@gmail.com>
...
* kern/efi/init.c (grub_efi_fini): Don't call grub_efi_mm_fini as
it would result in module crash.
2010-01-13 22:53:12 +01:00
Vladimir 'phcoder' Serbinenko
c1f2882010
2010-01-13 Vladimir Serbinenko <phcoder@gmail.com>
...
* term/ieee1275/ofconsole.c (grub_ofconsole_putchar): Handle '\r'.
(grub_ofconsole_getwh): Split to ...
(grub_ofconsole_getwh): ... this.
(grub_ofconsole_dimensions): ...and this.
(grub_ofconsole_init_output): Call grub_ofconsole_dimensions.
2010-01-13 20:43:48 +01:00
Robert Millan
58655a160b
2010-01-13 Robert Millan <rmh.grub@aybabtu.com>
...
* util/mkisofs/rock.c (generate_rock_ridge_attributes): Fix a typo.
2010-01-13 19:10:57 +00:00
carles
bd719e5a73
2010-01-12 Carles Pina i Estany <carles@pina.cat>
...
* Makefile.in (DUSE_ASCII_FAILBACK): New macro.
2010-01-12 20:37:45 +00:00
Vladimir 'phcoder' Serbinenko
b16ff4662e
Small cleanup
2010-01-12 19:47:02 +01:00
Vladimir 'phcoder' Serbinenko
10891398fd
2010-01-12 Vladimir Serbinenko <phcoder@gmail.com>
...
* loader/i386/pc/multiboot2.c: Removed stalled file.
2010-01-12 17:56:05 +01:00
Vladimir 'phcoder' Serbinenko
0b8a223cb1
2010-01-12 Vladimir Serbinenko <phcoder@gmail.com>
...
* util/grub-mkpasswd-pbkdf2.c (main): Use grub_util_init_nls.
Reported by: Grégoire Sutre
2010-01-12 13:36:44 +01:00
BVK Chaitanya
4d362fde58
build only functional tests on make
2010-01-12 15:49:40 +05:30
BVK Chaitanya
528aeaeabb
merge trunk
2010-01-12 11:02:49 +05:30
BVK Chaitanya
afafb37e9b
added boot device selection to grub-shell
2010-01-12 10:54:37 +05:30
BVK Chaitanya
c5431d4029
build tests on make, but run on make check
2010-01-12 10:16:17 +05:30
BVK Chaitanya
350285caae
removed unnecessary EXPORT_* macro usage
2010-01-12 09:23:24 +05:30
BVK Chaitanya
afdc9ad006
fixed an error message
2010-01-12 09:00:55 +05:30
carles
d0230c2119
2010-01-11 Carles Pina i Estany <carles@pina.cat>
...
* font/font.c (GENERATE_ASCII): Change the name to USE_ASCII_FAILBACK.
By default: disabled.
* Makefile.in (font/ascii.h): Remove the non-needed grub/bin2h size
parameter.
2010-01-11 20:43:11 +00:00
Robert Millan
3b6f7ab75d
Add missing menuviewer initialization.
2010-01-11 19:19:24 +01:00
Robert Millan
92ab12b092
2010-01-11 Robert Millan <rmh.grub@aybabtu.com>
...
* util/misc.c (canonicalize_file_name): New function.
(make_system_path_relative_to_its_root): Use canonicalize_file_name()
instead of realpath().
2010-01-11 14:55:20 +00:00
Colin Watson
a788afb626
2010-01-11 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub-install.in (usage): Clarify meaning of --root-directory,
and make it clearer that it's optional. Based on confusion
witnessed on IRC.
2010-01-11 12:00:57 +00:00
Felix Zielcke
502dc3e5c4
2010-01-11 Felix Zielcke <fzielcke@z-51.de>
...
* po/POTFILES: Replace `term/i386/pc/serial.c' with `term/serial.c'.
2010-01-11 11:30:47 +01:00
carles
d1fb0f65de
2010-01-10 Carles Pina i Estany <carles@pina.cat>
...
* font/font.c: Update copyright years.
* util/grub-mkfont.c (write_font_ascii_bitmap): Change comment format.
2010-01-11 00:10:38 +00:00
carles
26ba5c2262
2010-01-10 Carles Pina i Estany <carles@pina.cat>
...
* font/font.c: Include `ascii.h'.
(ASCII_BITMAP_SIZE): New macro.
(ascii_font_glyph): Define.
(ascii_glyph_lookup): New function.
(grub_font_get_string_width): Change comment. If glyph not found, use
ascii_glyph_lookup.
(grub_font_get_glyph_with_fallback): If glyph not available returns
ascii_glyph_lookup.
* util/grub-mkfont.c (file_formats): New enum.
(options): Add `ascii-bitmaps' new option.
(usage): Add `asii-bitmaps' new option.
(write_font_ascii_bitmap): New function.
(write_font): Rename to ...
(write_font_p2): ... this. Remove print_glyphs call.
(main): Use file_format. Implement code for ranges if ascii-bitmaps is
used. Call print_glyphs.
* Makefile.in (pkgdata_DATA): Add `font/ascii.h'.
2010-01-10 23:33:57 +00:00
Robert Millan
f40f890a12
Eliminate obnoxious length parameter
2010-01-11 00:03:42 +01:00
Robert Millan
0b4de51491
2010-01-10 Robert Millan <rmh.grub@aybabtu.com>
...
* conf/common.rmk (bin_UTILITIES): Add `grub-bin2h'.
(grub_bin2h_SOURCES): New variable.
* util/bin2h.c: New file.
2010-01-10 23:13:53 +01:00
Vladimir 'phcoder' Serbinenko
ffa8e3d277
2010-01-10 Vladimir Serbinenko <phcoder@gmail.com>
...
* term/i386/pc/vga_text.c (inc_y): Fix off-by-one error which resulted
in premature implicit newline.
2010-01-10 22:35:46 +01:00
Vladimir 'phcoder' Serbinenko
e9060a9d3b
2010-01-10 Vladimir Serbinenko <phcoder@gmail.com>
...
* normal/cmdline.c (grub_cmdline_get): Fix off-by-one error
which resulted in garbled command line at the end of screen.
2010-01-10 22:34:25 +01:00
Vladimir 'phcoder' Serbinenko
cd0514794a
MAnipulate mbi in abstract way
2010-01-10 18:58:18 +01:00
Vladimir 'phcoder' Serbinenko
85a2cf749f
merge mainline into mips
2010-01-10 13:34:48 +01:00
Robert Millan
f0d0c0b726
2010-01-10 Robert Millan <rmh.grub@aybabtu.com>
...
* loader/i386/ieee1275/linux.c (grub_linux_boot): Rework video position
initialization with similar approach as with other Linux loaders.
2010-01-10 01:43:42 +00:00
Robert Millan
0e60bae74e
2010-01-10 Robert Millan <rmh.grub@aybabtu.com>
...
Fix i386-ieee1275 build.
* loader/i386/ieee1275/linux.c (grub_linux_boot): Use grub_term_width()
and grub_term_height() for video_{width,height} initialization.
2010-01-10 01:10:39 +00:00
Robert Millan
cdec4d3193
2010-01-09 Robert Millan <rmh.grub@aybabtu.com>
...
Fix grub-emu build.
* conf/any-emu.rmk (grub_emu_SOURCES): Remove `kern/reader.c'.
2010-01-10 00:47:19 +00:00
Robert Millan
cdb3f378d6
Merge multiterm branch
2010-01-09 22:49:18 +00:00
Robert Millan
822873a7da
Eliminate grub_term_register_{input,output}_active. Default terminals are
...
automatically activated because they're the only terminal that has been loaded.
This solution is temporary. In the future, all terminals should auto-enable,
but this is non-trivial due to resource conflict, and it shouldn't prevent
merge in trunk.
2010-01-09 23:42:17 +01:00
Robert Millan
75cc5b682e
Merge from trunk
2010-01-09 23:22:48 +01:00
Robert Millan
1a064917fe
2010-01-09 Robert Millan <rmh.grub@aybabtu.com>
...
Make loader output a bit more user-friendly.
* util/grub.d/10_hurd.in: Print message indicating that GNU Mach
is being loaded. Likewise for the Hurd.
* util/grub.d/10_kfreebsd.in (kfreebsd_entry): Print message indicating
that kernel of FreeBSD ${version} is being loaded.
* loader/i386/linux.c (grub_cmd_linux): Move debug info to
grub_dprintf().
(grub_cmd_initrd): Likewise.
* util/grub.d/10_linux.in (linux_entry): Print message indicating
that Linux ${version} is being loaded. Likewise for initrd.
2010-01-09 22:02:00 +00:00
carles
5ce0a83a15
2010-01-09 Carles Pina i Estany <carles@pina.cat>
...
* gettext/gettext.c (GRUB_MOD_INIT): Gettextizze.
2010-01-09 20:20:27 +00:00
BVK Chaitanya
337470f1e1
added changelog
2010-01-09 20:31:52 +05:30
BVK Chaitanya
58ad6b39c4
added changelog file
2010-01-09 20:31:33 +05:30
BVK Chaitanya
21a99f5804
added grub-script-check tool
2010-01-09 20:27:58 +05:30
Vladimir 'phcoder' Serbinenko
2810a4ef1c
Fix scrollbar height
2010-01-09 11:48:38 +01:00
carles
809bbfebfe
2010-01-08 Carles Pina i Estany <carles@pina.cat>
...
* loader/efi/appleloader.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/efi/chainloader.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/efi/linux.c: Include `<grub/i18n.h>'.
(grub_cmd_linux): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/ieee1275/linux.c: Include `<grub/i18n.h>'.
(grub_cmd_linux): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/linux.c: Include `<grub/i18n.h>'.
(grub_cmd_linux): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/pc/chainloader.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/pc/linux.c: Include `<grub/i18n.h>'.
(grub_cmd_linux): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/xnu.c: Include `<grub/i18n.h>'.
(grub_cpu_xnu_init): Gettextizze.
* loader/multiboot_loader.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/powerpc/ieee1275/linux.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/sparc64/ieee1275/linux.c: Include `<grub/i18n.h>'.
(grub_linux_load64): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/xnu.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* po/POTFILES: Add `loader/efi/appleloader.c',
`loader/efi/chainloader.c', `loader/i386/efi/linux.c',
`loader/i386/ieee1275/linux.c', `loader/i386/linux.c',
`loader/i386/pc/chainloader.c', `loader/i386/pc/linux.c',
`loader/i386/xnu.c', `loader/multiboot_loader.c',
`loader/powerpc/ieee1275/linux.c', `loader/sparc64/ieee1275/linux.c'
and `loader/xnu.c'.
2010-01-08 21:35:38 +00:00
Vladimir 'phcoder' Serbinenko
b5c72e3b0f
Fix list scrollbar position miscalculation
2010-01-08 19:15:49 +01:00