BVK Chaitanya
07daa815af
better fix for setjmp module
2010-08-20 11:39:47 +05:30
BVK Chaitanya
a26187d7c0
update .bzrignore
2010-08-20 11:13:37 +05:30
BVK Chaitanya
02a6605e7e
minor fixes
2010-08-20 11:10:42 +05:30
BVK Chaitanya
a5a3bccd54
added conf/Makefile.common and conf/Makefile.extra-dist
2010-08-20 10:14:29 +05:30
BVK Chaitanya
34980574fc
minor cleanups
2010-08-19 17:50:05 +05:30
BVK Chaitanya
16c7cb32c8
merge with mainline
2010-08-19 16:54:00 +05:30
BVK Chaitanya
7afdce98a6
fix example_unit_test build
2010-08-19 15:47:38 +05:30
BVK Chaitanya
62f7d20835
fixed grub-emu build
2010-08-18 20:25:16 +05:30
BVK Chaitanya
019be613d0
fixed distcheck
2010-08-18 16:53:11 +05:30
Colin Watson
51f1f5afab
* configure.ac: Move AM_INIT_AUTOMAKE after AC_CANONICAL_TARGET to
...
fix warnings from Autoconf.
2010-08-18 11:15:08 +01:00
Colin Watson
9da94e0576
* acinclude.m4 (grub_ASM_USCORE): Use a more accurate grep pattern,
...
to avoid false positives with some assemblers that output things
like "someprefix_func" as part of their output.
2010-08-18 11:08:00 +01:00
BVK Chaitanya
2b6c00842d
distcheck almost done
2010-08-18 11:57:51 +05:30
BVK Chaitanya
f99b0464df
rm grub-core/video/emu.moved
2010-08-17 19:46:13 +05:30
BVK Chaitanya
a525bb9ae4
rm grub-core/configure.ac
2010-08-17 19:43:37 +05:30
BVK Chaitanya
76ed06b921
moved configure.common back to configure.ac
2010-08-17 19:41:43 +05:30
BVK Chaitanya
adf4ef86af
add po/Makefile.am
2010-08-17 19:23:50 +05:30
BVK Chaitanya
a6b3849314
move grub-core/po back
2010-08-17 19:23:26 +05:30
BVK Chaitanya
c49e5dfff8
remove Makefile.kernel and Makefile.vars
2010-08-17 19:17:57 +05:30
BVK Chaitanya
5c2d039c58
update .bzrignore
2010-08-17 19:04:35 +05:30
BVK Chaitanya
6304d29255
working copy, wo nested packaging
2010-08-17 19:03:22 +05:30
Robert Millan
729a0f2e0c
2010-08-15 Robert Millan <rmh@gnu.org>
...
* kern/emu/misc.c (grub_get_libzfs_handle): Handle libzfs_init()
errors.
* kern/emu/getroot.c (find_root_device_from_libzfs): Handle
grub_get_libzfs_handle() errors.
2010-08-15 22:48:23 +02:00
BVK Chaitanya
0a4fc180ec
parallel build fix for utils
2010-08-15 21:09:37 +05:30
BVK Chaitanya
db4122ba30
fix for grub-core parallel build failure
2010-08-15 20:40:24 +05:30
Robert Millan
f3710e088c
2010-08-14 Robert Millan <rmh@gnu.org>
...
* kern/emu/misc.c (grub_find_zpool_from_dir): Abort function if
filesystem is not ZFS.
2010-08-14 16:53:25 +02:00
BVK Chaitanya
7a3c13dea5
Fix for misspelled color names defaulting to black/black (bug
...
reported by Doug Nazar)
* include/grub/normal.h (grub_parse_color_name_pair): Add return
status to prototype.
* normal/color.c (grub_parse_color_name_pair): Return failure
status.
(grub_env_write_color_normal): Ignore bad color names.
(grub_env_write_color_highlight): Likewise.
* normal/main.c (GRUB_MOD_INIT): Set default color names.
2010-08-12 20:52:42 +05:30
BVK Chaitanya
681440aa5b
fix bad color name handling
2010-08-12 20:45:55 +05:30
BVK Chaitanya
ab8ba50d75
"shift" command support to GRUB script.
...
* include/grub/script_sh.h (grub_script_shift): New prototype.
* script/execute.c (grub_script_shift): New function.
* script/main.c (grub_script_init): Register shift command.
(grub_script_fini): Unregister shift command.
* util/grub-script-check.c (grub_script_cmd_shift): New function.
* tests/grub_script_shift.in: New testcase.
* conf/tests.rmk: Rules for new testcase.
2010-08-12 12:07:27 +05:30
BVK Chaitanya
163dd4f7e9
merge with mainline
2010-08-12 12:02:48 +05:30
BVK Chaitanya
4d61999e33
"continue" command support to GRUB script.
...
* script/execute.c (grub_script_execute_cmdwhile): Continue support.
(grub_script_break): Continue support.
* script/main.c (grub_script_init): Register continue command.
(grub_script_fini): Unregister continue command.
* tests/grub_script_continue.in: New testcase.
* conf/tests.rmk: Rules for new testcase.
2010-08-12 11:48:21 +05:30
BVK Chaitanya
8908e49937
merge with mainline
2010-08-12 09:46:01 +05:30
BVK Chaitanya
4df51e0007
"break" command support to GRUB script.
...
* conf/common.rmk: Rule updates to grub-script-check.
* include/grub/misc.h (grub_min): New function.
* include/grub/script_sh.h (grub_script_init): New prototype.
(grub_script_fini): New prototype.
(grub_script_break): New prototype.
* script/main.c (grub_script_init): New function.
(grub_script_fini): New function.
* script/execute.c (grub_script_break): New function.
* normal/main.c: Calls to grub_script_{init,fini}.
* util/grub-script-check.c (grub_script_break): New function.
* tests/grub_script_break.in: New testcase.
* conf/tests.rmk: Rules for new test case.
2010-08-12 09:35:15 +05:30
BVK Chaitanya
fd324286d4
merge with mainline
2010-08-12 09:30:26 +05:30
BVK Chaitanya
f12c842082
Function parameters support to GRUB script.
...
* script/yylex.l (VARIABLE): Regular expression update.
* script/function.c (grub_script_function_call): Moved ...
* script/execute.c (grub_script_function_call): ... to here.
(grub_script_execute_arglist_to_argv): Removed.
(grub_script_arglist_to_argv): New function.
* script/argv.c: New file.
(grub_script_argv_free): New function.
(grub_script_argv_next): Likewise.
(grub_script_argv_append): Likewise.
(grub_script_argv_split_append): Likewise.
* include/grub/script_sh.h (grub_script_argv): New struct.
(grub_script_argv_free): New function.
(grub_script_argv_next): Likewise.
(grub_script_argv_append): Likewise.
(grub_script_argv_split_append): Likewise.
* conf/common.rmk (normal.mod): New source script/argv.c.
* tests/grub_script_echo1.in: More tests.
* tests/grub_script_vars1.in: Likewise.
* tests/grub_script_functions.in: New test case.
* conf/tests.rmk: Rules for new testcase.
2010-08-12 09:20:58 +05:30
BVK Chaitanya
4962a2032f
merge with mainline
2010-08-12 09:16:24 +05:30
BVK Chaitanya
8022b74825
Remove grub_script_cmdblock struct.
...
* include/grub/script_sh.h: Remove grub_script_cmdblock.
* script/parser.y: Likewise.
* script/execute.c: Rename cmdblock suffix to cmdlist.
* script/script.c: Likewise.
* util/grub-script-check.c: Likewise.
2010-08-12 09:04:37 +05:30
BVK Chaitanya
0bcbae0fa7
merge with mainline
2010-08-12 09:01:59 +05:30
Yves Blusseau
79a6ba6101
2010-08-11 Yves Blusseau <blusseau@zetam.org>
...
* .bzrignore: add grub-macho2img
2010-08-11 13:24:37 +02:00
Vladimir 'phcoder' Serbinenko
d04b9414a8
* kern/i386/qemu/init.c (grub_qemu_init_cirrus): Fix compilation error.
2010-08-11 04:25:56 +02:00
Vladimir 'phcoder' Serbinenko
f947ab49b0
Remove the dump of sm712 initialisation sequence.
...
* include/grub/pci.h (GRUB_PCI_CLASS_SUBCLASS_VGA): New const.
* include/grub/vga.h (GRUB_VGA_IO_ARX_READ): New register.
(GRUB_VGA_IO_MISC_WRITE): Likewise.
(GRUB_VGA_CR_*): Added many registers.
(GRUB_VGA_SR_*): Likewise.
(GRUB_VGA_GR_*): Likewise.
(grub_vga_write_arx): New function.
(grub_video_hw_config): New struct.
(grub_vga_set_geometry): New function.
* kern/i386/qemu/init.c (load_palette): Use grub_vga_write_arx and
GRUB_PCI_CLASS_SUBCLASS_VGA.
* video/cirrus.c (grub_video_cirrus_setup): Use grub_vga_set_geometry.
* video/sm712.c (grub_sm712_write_reg): New function
(grub_sm712_read_reg): Likewise.
(grub_sm712_sr_write): Likewise.
(grub_sm712_gr_write): Likewise.
(grub_sm712_cr_write): Likewise.
(grub_sm712_write_arx): Likewise.
(grub_sm712_cr_shadow_write): Likewise.
(grub_sm712_write_dda_lookup): Likewise.
(grub_video_sm712_setup): Initialise the video rather then
blindly replay the dump.
(main) [TEST]: Add a routine to be able to compile as standalone for
tests.
* video/sm712_init.c (sm712_init): Removed.
(sm712_sr_seq1): New array.
(sm712_sr_seq2): Likewise.
2010-08-11 04:18:07 +02:00
Vladimir 'phcoder' Serbinenko
f0206638bf
* include/grub/vga.h: Add missing grub/pci.h include.
2010-08-11 04:00:06 +02:00
Yves Blusseau
2764da3ba2
2010-08-10 Yves Blusseau <blusseau@zetam.org>
...
* util/grub-macho2img.c (main): fix typo
2010-08-10 16:32:48 +02:00
Vladimir 'phcoder' Serbinenko
cf0c775ed4
* include/grub/vga.h (grub_vga_gr_write): Add GRUB_MACHINE_PCI_IO_BASE.
...
(grub_vga_gr_read): Likewise.
(grub_vga_cr_write): Likewise.
(grub_vga_cr_read): Likewise.
(grub_vga_sr_write): Likewise.
(grub_vga_sr_read): Likewise.
(grub_vga_palette_read): Likewise.
(grub_vga_palette_write): Likewise.
* video/sm712.c (GRUB_SM712_REG_BASE): New definition.
(grub_sm712_sr_read): New function.
(grub_video_sm712_setup): Use grub_vga_sr_write and grub_sm712_sr_read.
* video/sm712_init.c (sm712_init): Substract GRUB_MACHINE_PCI_IO_BASE.
2010-08-10 13:43:43 +02:00
BVK Chaitanya
368ba29261
merge with mainline
2010-08-10 09:52:16 +05:30
Robert Millan
07f360e92d
2010-08-09 Robert Millan <rmh@gnu.org>
...
* kern/emu/misc.c (grub_make_system_path_relative_to_its_root): Filter
out unused variables on non-ZFS build.
2010-08-09 17:44:24 +02:00
Robert Millan
346c207240
2010-08-08 Robert Millan <rmh@gnu.org>
...
Fix path generation for sub-filesystems in ZFS.
* kern/emu/misc.c (grub_make_system_path_relative_to_its_root): Add
missing slash.
2010-08-09 00:11:19 +02:00
Robert Millan
7117542069
2010-08-08 Robert Millan <rmh@gnu.org>
...
* util/grub-fstest.c (read_file, cmd_cmp): Improve error message.
2010-08-08 22:47:32 +02:00
Robert Millan
0d8286f328
2010-08-08 Robert Millan <rmh@gnu.org>
...
* util/grub.d/10_kfreebsd.in: When files required for ZFS do not
exist, issue a proper error message (rely on `ls' for translated
strings).
2010-08-08 16:27:58 +02:00
Robert Millan
55dd292477
2010-08-08 Robert Millan <rmh@gnu.org>
...
Fix grub-probe invocation.
* util/grub.d/10_kfreebsd.in: s/label/fs_label/g.
2010-08-08 15:45:33 +02:00
BVK Chaitanya
02c9030aae
builds w/o custom DEPDIR
2010-08-06 10:01:54 +05:30
Robert Millan
d3dd9e80f6
2010-08-04 Robert Millan <rmh@gnu.org>
...
* configure.ac: Remove checks for getfsstat() and getmntany().
Add checks for `<sys/param.h>' and `<sys/mount.h>'.
* kern/emu/misc.c [HAVE_GETMNTANY]: Remove `<sys/mnttab.h>'.
[HAVE_SYS_PARAM_H]: Include `<sys/param.h>'.
[HAVE_SYS_MOUNT_H]: Include `<sys/mount.h>'.
[HAVE_LIBZFS && HAVE_LIBNVPAIR] (find_mount_point_from_dir): Remove
function.
(grub_find_zpool_from_dir): Use statfs() instead of indirect matching
via find_mount_point_from_dir() and getfsstat() / getmntany().
2010-08-04 14:45:58 +02:00