]> git.proxmox.com Git - grub2.git/log
grub2.git
14 years agohook Reed-Solomon into startup.S
Vladimir 'phcoder' Serbinenko [Sat, 25 Sep 2010 17:33:05 +0000 (19:33 +0200)]
hook Reed-Solomon into startup.S

14 years agoC part of Reed-Solomon
Vladimir 'phcoder' Serbinenko [Fri, 24 Sep 2010 12:05:47 +0000 (14:05 +0200)]
C part of Reed-Solomon

14 years ago Support xz compression on yeeloong.
Vladimir 'phcoder' Serbinenko [Thu, 23 Sep 2010 00:10:44 +0000 (02:10 +0200)]
Support xz compression on yeeloong.

* Makefile.util.def (grub-mkimage): Add $(LIBLZMA).
* configure.ac: Check for LZMA.
* grub-core/Makefile.core.def (xz_decompress): New target.
(none_decompress): Likewise.
* grub-core/boot/decompressor/minilib.c: New file.
* grub-core/boot/decompressor/none.c: Likewise.
* grub-core/boot/decompressor/xz.c: Likewise.
* grub-core/kern/mips/cache.S: Change to noreorder nomacro.
* grub-core/kern/mips/cache_flush.S: Likewise.
* grub-core/kern/i386/pc/lzma_decode.S: Remove dead code.
* grub-core/kern/mips/startup.S: Move first stage to ...
* grub-core/boot/mips/startup_raw.S: ...here. Change to noreorder
nomacro.
* grub-core/kern/mips/startup.S: Change to noreorder nomacro.
* grub-core/lib/mips/relocator_asm.S: Change to noreorder nomacro.
* grub-core/lib/xzembed/xz_dec_bcj.c [GRUB_EMBED_DECOMPRESSOR]:
Allocate statically.
* grub-core/lib/xzembed/xz_dec_lzma2.c [GRUB_EMBED_DECOMPRESSOR]:
Allocate statically or use scratch. Don't check CRC32.
* grub-core/lib/xzembed/xz_dec_stream.c [GRUB_EMBED_DECOMPRESSOR]:
Allocate statically. Don't check CRC32.
* include/grub/decompressor.h: New file.
* include/grub/offsets.h (GRUB_KERNEL_MIPS_YEELOONG_RAW_SIZE):
Removed.
(GRUB_KERNEL_MIPS_YEELOONG_UNCOMPRESSED_SIZE): New field.
(GRUB_KERNEL_MIPS_YEELOONG_TOTAL_MODULE_SIZE): Adjusted.
(GRUB_KERNEL_MIPS_YEELOONG_PREFIX): Likewise.
(GRUB_KERNEL_MIPS_YEELOONG_PREFIX_END): Likewise.
(GRUB_KERNEL_MACHINE_UNCOMPRESSED_SIZE): New define.
* util/grub-mkimage.c (grub_compression_t): New type.
(PLATFORM_FLAGS_DECOMPRESSORS): New flag.
(image_target_desc): New field default_compression.
(image_targets): Adjust yeeloong targets.
(compress_kernel_xz) [HAVE_LIBLZMA]: New function.
(compress_kernel): New parameter comp.
(generate_image): Likewise. Handle new compression case.
(options): New option --compression
(help): Likewise.
(main): Handle new option.

14 years agoDefine FLOPPY_MAJOR on NetBSD.
Grégoire Sutre [Wed, 22 Sep 2010 21:32:58 +0000 (23:32 +0200)]
Define FLOPPY_MAJOR on NetBSD.

14 years ago* grub-core/loader/multiboot_mbi2.c (grub_multiboot_make_mbi): Fix
Colin Watson [Wed, 22 Sep 2010 15:57:49 +0000 (16:57 +0100)]
* grub-core/loader/multiboot_mbi2.c (grub_multiboot_make_mbi): Fix
typo in __i386__ conditional.

14 years ago * grub-core/loader/multiboot_mbi2.c (GRUB_MACHINE_EFI): Add missing
Vladimir 'phcoder' Serbinenko [Wed, 22 Sep 2010 15:13:21 +0000 (17:13 +0200)]
* grub-core/loader/multiboot_mbi2.c (GRUB_MACHINE_EFI): Add missing
include.

14 years ago Implement EFI and ACPI multiboot2 extensions.
Vladimir 'phcoder' Serbinenko [Wed, 22 Sep 2010 12:51:49 +0000 (14:51 +0200)]
Implement EFI and ACPI multiboot2 extensions.

* grub-core/loader/multiboot_mbi2.c (grub_multiboot_load): Declare
new tags as supported.
(acpiv2_size): New function.
(grub_multiboot_get_mbi_size): Take new tags into account.
(grub_multiboot_make_mbi): Add new tags.
* include/grub/multiboot.h (GRUB_MACHINE_HAS_ACPI): New definition.

14 years agoFix bugs in asm code
Vladimir 'phcoder' Serbinenko [Tue, 21 Sep 2010 22:53:34 +0000 (00:53 +0200)]
Fix bugs in asm code

14 years agoAlign scratch
Vladimir 'phcoder' Serbinenko [Tue, 21 Sep 2010 22:52:33 +0000 (00:52 +0200)]
Align scratch

14 years agoWrite total module size before compressing
Vladimir 'phcoder' Serbinenko [Tue, 21 Sep 2010 22:51:54 +0000 (00:51 +0200)]
Write total module size before compressing

14 years ago.../serial/common.c - added missing configuration
starous [Tue, 21 Sep 2010 20:00:44 +0000 (22:00 +0200)]
.../serial/common.c - added missing configuration

14 years ago.../serial/common.c - added missing configuration
starous [Tue, 21 Sep 2010 19:57:57 +0000 (21:57 +0200)]
.../serial/common.c - added missing configuration

14 years agoCompressor part
Vladimir 'phcoder' Serbinenko [Tue, 21 Sep 2010 19:35:46 +0000 (21:35 +0200)]
Compressor part

14 years agoAllow compression algorithm specification
Vladimir 'phcoder' Serbinenko [Tue, 21 Sep 2010 18:30:28 +0000 (20:30 +0200)]
Allow compression algorithm specification

14 years ago* grub-core/normal/menu_entry.c (run): Make sure we always return
Colin Watson [Tue, 21 Sep 2010 18:03:11 +0000 (19:03 +0100)]
* grub-core/normal/menu_entry.c (run): Make sure we always return
a value.

14 years agoMAke a separate scratch for decompressor
Vladimir 'phcoder' Serbinenko [Tue, 21 Sep 2010 17:39:51 +0000 (19:39 +0200)]
MAke a separate scratch for decompressor

14 years ago* grub-core/commands/efi/lsefimmap.c (grub_cmd_lsefimmap):
Colin Watson [Tue, 21 Sep 2010 15:58:08 +0000 (16:58 +0100)]
* grub-core/commands/efi/lsefimmap.c (grub_cmd_lsefimmap):
NumberOfPages is UINT64 according to the UEFI specification, not
UINTN.  Fix printf format.

14 years ago* grub-core/bus/usb/usbhub.c (poll_nonroot_hub): Change type of
Colin Watson [Tue, 21 Sep 2010 15:13:04 +0000 (16:13 +0100)]
* grub-core/bus/usb/usbhub.c (poll_nonroot_hub): Change type of
`err' to grub_usb_err_t.
Reported and tested by: KESHAV P.R.

14 years ago* grub-core/disk/efi/efidisk.c (grub_efidisk_get_device_name): Make
Colin Watson [Tue, 21 Sep 2010 12:41:23 +0000 (13:41 +0100)]
* grub-core/disk/efi/efidisk.c (grub_efidisk_get_device_name): Make
tpart non-const, so that we can assign to it.  (Since this is a
typedef, the constness refers to the pointer rather than what it
points to.)

14 years ago* conf/Makefile.common (CPPFLAGS_GNULIB): Add
Colin Watson [Tue, 21 Sep 2010 12:37:50 +0000 (13:37 +0100)]
* conf/Makefile.common (CPPFLAGS_GNULIB): Add
$(top_srcdir)/grub-core/gnulib as well as
$(top_builddir)/grub-core/gnulib.
Reported by: KESHAV P.R.

14 years ago* util/grub-install.in: Fix the bootloader ID option to be
Colin Watson [Tue, 21 Sep 2010 11:10:36 +0000 (12:10 +0100)]
* util/grub-install.in: Fix the bootloader ID option to be
consistently --bootloader-id, not --bootloader_id.
Reported by: KESHAV P.R.

14 years ago* grub-core/commands/hashsum.c (GRUB_MOD_INIT): Make "Compute or
Colin Watson [Tue, 21 Sep 2010 10:14:06 +0000 (11:14 +0100)]
* grub-core/commands/hashsum.c (GRUB_MOD_INIT): Make "Compute or
check hash checksum." consistently translatable.

14 years ago * conf/Makefile.common (CPPFLAGS_GNULIB): Replace $(top_srcdir) with
Yves Blusseau [Tue, 21 Sep 2010 10:02:59 +0000 (12:02 +0200)]
* conf/Makefile.common (CPPFLAGS_GNULIB): Replace $(top_srcdir) with
    $(top_builddir).

14 years ago* grub-core/commands/hashsum.c (aliases): Add sha1sum alias.
Colin Watson [Tue, 21 Sep 2010 09:56:16 +0000 (10:56 +0100)]
* grub-core/commands/hashsum.c (aliases): Add sha1sum alias.
(GRUB_MOD_INIT): Register sha1sum command.
(GRUB_MOD_FINI): Unregister sha1sum command.

14 years ago Keep boot and grub directory names in sync with utils scripts
Yves Blusseau [Tue, 21 Sep 2010 09:42:30 +0000 (11:42 +0200)]
Keep boot and grub directory names in sync with utils scripts

    * configure.ac: Define GRUB_BOOT_DIR_NAME and GRUB_DIR_NAME macros.
    * config.h.in: Add previous macros.
    * include/grub/emu/misc.h (DEFAULT_DIRECTORY): Use previous macros.
    * util/grub-install.in: Use $bootdir and $grubdir variables.

14 years ago* grub-core/kern/emu/hostdisk.c (find_system_device): Only try to
Colin Watson [Tue, 21 Sep 2010 09:36:44 +0000 (10:36 +0100)]
* grub-core/kern/emu/hostdisk.c (find_system_device): Only try to
convert partition names to disk names if the new `convert' parameter
is set.
(grub_util_biosdisk_get_grub_dev): If opening the disk device
returns GRUB_ERR_UNKNOWN_DEVICE, treat the partition device as a
disk in its own right.  This can happen with Xen disk images.

14 years agoC part of decompressor
Vladimir 'phcoder' Serbinenko [Tue, 21 Sep 2010 09:22:52 +0000 (11:22 +0200)]
C part of decompressor

14 years ago * util/grub-editenv.c: Update strings to avoid warnings when generating
Yves Blusseau [Tue, 21 Sep 2010 09:17:54 +0000 (11:17 +0200)]
* util/grub-editenv.c: Update strings to avoid warnings when generating
    grub.pot file.
    * util/grub-setup.c: Likewise.

14 years agoasm part for mips decompressor
Vladimir 'phcoder' Serbinenko [Tue, 21 Sep 2010 08:14:08 +0000 (10:14 +0200)]
asm part for mips decompressor

14 years agoRemove dead code in decompressor
Vladimir 'phcoder' Serbinenko [Tue, 21 Sep 2010 08:07:12 +0000 (10:07 +0200)]
Remove dead code in decompressor

14 years agoImplementation of ACPI parts
Vladimir 'phcoder' Serbinenko [Tue, 21 Sep 2010 06:37:50 +0000 (08:37 +0200)]
Implementation of ACPI parts

14 years ago * configure.ac: Change version to 1.99~beta0.
Vladimir 'phcoder' Serbinenko [Tue, 21 Sep 2010 00:33:48 +0000 (02:33 +0200)]
* configure.ac: Change version to 1.99~beta0.

14 years agoImpletment EST multiboot passing
Vladimir 'phcoder' Serbinenko [Tue, 21 Sep 2010 00:19:29 +0000 (02:19 +0200)]
Impletment EST multiboot passing

14 years ago * grub-core/loader/i386/multiboot_mbi.c (grub_fill_multiboot_mmap):
Vladimir 'phcoder' Serbinenko [Tue, 21 Sep 2010 00:06:14 +0000 (02:06 +0200)]
* grub-core/loader/i386/multiboot_mbi.c (grub_fill_multiboot_mmap):
Add BADRAM.
* grub-core/loader/multiboot_mbi2.c (grub_fill_multiboot_mmap):
Likewise.
* include/multiboot.h: Resynced with specification.
* include/multiboot2.h: Likewise.

14 years agoFix po directory handling.
Colin Watson [Mon, 20 Sep 2010 23:09:23 +0000 (00:09 +0100)]
Fix po directory handling.
* configure.ac: Create po/Makefile.in rather than po/Makefile.
* grub-core/gnulib/Makefile.am: Import gettext module.
* m4/gnulib-cache.m4: Likewise.
* m4/gnulib-comp.m4: Likewise.
* m4/gettext.m4: New file, from gnulib.
* m4/glibc2.m4: Likewise.
* m4/iconv.m4: Likewise.
* m4/intdiv0.m4: Likewise.
* m4/intl.m4: Likewise.
* m4/intldir.m4: Likewise.
* m4/intlmacosx.m4: Likewise.
* m4/intmax.m4: Likewise.
* m4/inttypes-pri.m4: Likewise.
* m4/lcmessage.m4: Likewise.
* m4/lib-ld.m4: Likewise.
* m4/lib-link.m4: Likewise.
* m4/lib-prefix.m4: Likewise.
* m4/lock.m4: Likewise.
* m4/nls.m4: Likewise.
* m4/po.m4: Likewise.
* m4/printf-posix.m4: Likewise.
* m4/progtest.m4: Likewise.
* m4/threadlib.m4: Likewise.
* m4/uintmax_t.m4: Likewise.
* m4/visibility.m4: Likewise.
* po/Makefile.am: Remove.
* po/Makefile.in.in: New file, from gettext.
($(DOMAIN).pot-update): Support POTFILES-shell.
* po/Makevars: New file.
* po/POTFILES-shell: Rename to ...
* po/POTFILES-shell.in: ... this.  Update.
* po/POTFILES: Rename to ...
* po/POTFILES.in: ... this.  Update.
* po/Rules-quot: New file, from gettext.
* po/boldquot.sed: Likewise.
* po/en@boldquot.header: Likewise.
* po/en@quot.header: Likewise.
* po/insert-header.sin: Likewise.
* po/quot.sed: Likewise.
* po/remove-potcdate.sin: Likewise.

14 years ago * util/grub.d/10_kfreebsd.in (kfreebsd_entry): Use UUID when possible.
Vladimir 'phcoder' Serbinenko [Mon, 20 Sep 2010 23:02:24 +0000 (01:02 +0200)]
* util/grub.d/10_kfreebsd.in (kfreebsd_entry): Use UUID when possible.

14 years ago * util/grub.d/20_linux_xen.in: Use submenus.
Vladimir 'phcoder' Serbinenko [Mon, 20 Sep 2010 22:58:59 +0000 (00:58 +0200)]
* util/grub.d/20_linux_xen.in: Use submenus.

14 years ago Support submenus.
Vladimir 'phcoder' Serbinenko [Mon, 20 Sep 2010 22:47:49 +0000 (00:47 +0200)]
Support submenus.

* grub-core/commands/menuentry.c (grub_normal_add_menu_entry): New
parameter submenu. All users updated.
* grub-core/normal/main.c (free_menu): Rename to ...
(grub_normal_free_menu): ... this. Made global.
* grub-core/normal/menu.c (grub_menu_execute_entry): Open new context
if requested.
* grub-core/normal/menu_entry.c (screen): New field submenu.
(make_screen): Set submenu.
(run): Open new context if requested.
* include/grub/menu.h (grub_menu_entry): New field submenu.
* include/grub/normal.h (grub_normal_free_menu): New proto.

14 years ago Menu entries extractor.
Vladimir 'phcoder' Serbinenko [Mon, 20 Sep 2010 22:07:05 +0000 (00:07 +0200)]
Menu entries extractor.

* grub-core/commands/configfile.c (grub_cmd_source): Implement extractor
variants.
(GRUB_MOD_INIT): Register new variants.
(GRUB_MOD_FINI): Unregister new variants.
* grub-core/commands/legacycfg.c (grub_cmd_legacy_configfile): Merge
into grub_cmd_legacy_source.
(grub_cmd_legacy_source): Implement extractor variants.
(GRUB_MOD_INIT): Register new variants.
(GRUB_MOD_FINI): Unregister new variants.
* grub-core/commands/menuentry.c (grub_menu_init): Declare menuentry
as an extractor.
* grub-core/commands/search_wrap.c (GRUB_MOD_INIT): Declare
search as an extractor.
* grub-core/commands/test.c (GRUB_MOD_INIT): Declare
test as an extractor.
* grub-core/kern/corecmd.c (grub_register_core_commands): Declare set
as an extractor.
* grub-core/normal/context.c (grub_env_context_open): Reorganised.
(grub_env_new_context): New function.
(grub_env_context_open): Likewise.
(grub_env_extractor_open): Likewise.
(grub_env_extractor_close): Likewise.
* grub-core/script/execute.c (grub_script_execute_cmdline): Handle
grub_extractor_level.
* include/grub/command.h (GRUB_COMMAND_FLAG_EXTRACTOR): New flag.
* include/grub/env.h (grub_env_extractor_open): New proto.
(grub_env_extractor_close): Likewise.
* include/grub/normal.h (grub_extractor_level): New external variable.

14 years agoSupport extraction of legacy entries
Vladimir 'phcoder' Serbinenko [Mon, 20 Sep 2010 21:10:29 +0000 (23:10 +0200)]
Support extraction of legacy entries

14 years agoRename jail to extractor
Vladimir 'phcoder' Serbinenko [Mon, 20 Sep 2010 21:01:34 +0000 (23:01 +0200)]
Rename jail to extractor

14 years agomerge mainline into jail
Vladimir 'phcoder' Serbinenko [Mon, 20 Sep 2010 20:41:59 +0000 (22:41 +0200)]
merge mainline into jail

14 years ago Make cutmem accept a region specification.
Vladimir 'phcoder' Serbinenko [Mon, 20 Sep 2010 20:24:30 +0000 (22:24 +0200)]
Make cutmem accept a region specification.
Suggested by: Samuel Thibault

* grub-core/mmap/mmap.c (parsemem): New function.
(grub_cmd_cutmem): Handle new arguments.

14 years ago * grub-core/mmap/mmap.c (grub_cmd_cutmem): New function.
Vladimir 'phcoder' Serbinenko [Mon, 20 Sep 2010 20:11:52 +0000 (22:11 +0200)]
* grub-core/mmap/mmap.c (grub_cmd_cutmem): New function.
(GRUB_MOD_INIT): Register new command.
(GRUB_MOD_FINI): Unregister new command.

14 years ago Support some annoying BSD and Minix subpartitions.
Vladimir 'phcoder' Serbinenko [Mon, 20 Sep 2010 19:45:06 +0000 (21:45 +0200)]
Support some annoying BSD and Minix subpartitions.

* Makefile.util.def (libgrub.a): Add grub-core/partmap/bsdlabel.c.
* grub-core/disk/efi/efidisk.c (grub_efidisk_get_device_name):
Properly handle concatenation.
* grub-core/kern/device.c (grub_device_iterate): Likewise.
* grub-core/normal/completion.c (iterate_partition): Likewise.
* grub-core/kern/disk.c (grub_disk_open): Make disk->name not
contain partition. All users updated.
* grub-core/partmap/bsdlabel.c (grub_netbsdlabel_partition_map): New
struct.
(grub_openbsdlabel_partition_map): Likewise.
(bsdlabel_partition_map_iterate): Rename to ..
(iterate_real): ... this. New arguments sector, freebsd and pmap.
(bsdlabel_partition_map_iterate): New function.
(netopenbsdlabel_partition_map_iterate): Likewise.
(netbsdlabel_partition_map_iterate): Likewise.
(openbsdlabel_partition_map_iterate): Likewise.
(GRUB_MOD_INIT): Register new partmaps.
(GRUB_MOD_FINI): Unregister new partmaps.
* grub-core/partmap/msdos.c (pc_partition_map_iterate): Rename to ...
(grub_partition_msdos_iterate): ... this. All users updated.
Don't support embedding other than in a minix partition.
* include/grub/msdos_partition.h (grub_partition_msdos_iterate): New
proto.
* include/grub/partition.h (grub_partition): New field msdostype.
* util/grub-install.in: Handle openbsd and netbsd types being in
part_bsd module.

14 years agoAdd the comment about net-/openbsdlabel
Vladimir 'phcoder' Serbinenko [Mon, 20 Sep 2010 19:34:20 +0000 (21:34 +0200)]
Add the comment about net-/openbsdlabel

14 years agoSupport net-/openbsd labels inside logical partitions
Vladimir 'phcoder' Serbinenko [Mon, 20 Sep 2010 19:30:11 +0000 (21:30 +0200)]
Support net-/openbsd labels inside logical partitions

14 years ago Split mdraid.mod into mdraid09.mod and mdraid1x.mod.
Vladimir 'phcoder' Serbinenko [Mon, 20 Sep 2010 18:09:31 +0000 (20:09 +0200)]
Split mdraid.mod into mdraid09.mod and mdraid1x.mod.

* Makefile.util.def (libgrub.a): Add grub-core/disk/mdraid1x_linux.c.
* grub-core/Makefile.core.def (mdraid): Renamed to ...
(mdraid09): ... this.
(mdraid1x): New module.
* grub-core/disk/mdraid_linux.c: Move 1.x parts ...
* grub-core/disk/mdraid1x_linux.c: ...here. All users updated.

14 years ago * grub-core/kern/emu/misc.c (asprintf): Use vsnprintf instead of
Vladimir 'phcoder' Serbinenko [Mon, 20 Sep 2010 17:14:29 +0000 (19:14 +0200)]
* grub-core/kern/emu/misc.c (asprintf): Use vsnprintf instead of
vsprintf.

14 years ago* grub-core/commands/efi/lsefimmap.c: Correct header.
Colin Watson [Mon, 20 Sep 2010 16:59:09 +0000 (17:59 +0100)]
* grub-core/commands/efi/lsefimmap.c: Correct header.
* NEWS: Update.

14 years ago* util/grub-editenv.c (argp_parser): Don't pass translated strings
Colin Watson [Mon, 20 Sep 2010 16:56:14 +0000 (17:56 +0100)]
* util/grub-editenv.c (argp_parser): Don't pass translated strings
as printf format strings; the translations might contain '%' which
could cause a crash.
(main): Likewise.
* util/grub-fstest.c (argp_parser): Likewise.
* util/grub-setup.c (argp_parser): Likewise.
(main): Likewise.

14 years ago Use argp in grub-fstest.
Vladimir 'phcoder' Serbinenko [Mon, 20 Sep 2010 16:38:38 +0000 (18:38 +0200)]
Use argp in grub-fstest.

* util/grub-fstest.c: Don't include getopt.h.
Include argp.h.
(root): New variable.
(args_count): Likewise.
(nparm): Likewise.
(num_disks): Likewise.
(images): Likewise.
(cmd): Likewise.
(debug_str): Likewise.
(args): Likewise.
(options): Transformed to argp.
(usage): Removed.
(main): Split argument parsing into ...
(argp_parser): ... this. Changed to argp format.
(argp): New variable.
(main): Use argp_parse.

14 years ago * grub-core/commands/efi/lsefimmap.c: New file.
Tristan Gingold [Mon, 20 Sep 2010 15:59:25 +0000 (17:59 +0200)]
* grub-core/commands/efi/lsefimmap.c: New file.
* grub-core/Makefile.core.def (lsefimmap): New module.
* include/grub/efi/api.h (PRIxGRUB_EFI_UINTN_T): New definition.

Also-By: Robert Millan <rmh.grub@aybabtu.com>
Also-By: Vladimir Serbinenko <phcoder@gmail.com>
14 years ago Pause the execution (10s max) if any errors are displayed so the user
Vladimir 'phcoder' Serbinenko [Mon, 20 Sep 2010 15:46:35 +0000 (17:46 +0200)]
Pause the execution (10s max) if any errors are displayed so the user
has a chance to see them.

* grub-core/kern/err.c (grub_err_printed_errors): New variable.
(grub_print_error): Increment grub_err_printed_errors.
* grub-core/normal/menu.c (grub_menu_execute_entry): Pause the
execution if any errors were displayed.
(show_menu): Remove old code for pause.
* grub-core/normal/menu_entry.c (run): Likewise.
* grub-core/normal/term.c (grub_normal_char_counter): Removed. All
users updated.
(grub_normal_get_char_counter): Likewise.
* include/grub/err.h (grub_err_printed_errors): New external variable.
* include/grub/normal.h (grub_normal_get_char_counter): Removed.

14 years ago Support multiboot VBE info.
Vladimir 'phcoder' Serbinenko [Mon, 20 Sep 2010 15:01:28 +0000 (17:01 +0200)]
Support multiboot VBE info.

* grub-core/loader/i386/multiboot_mbi.c (grub_multiboot_get_mbi_size):
Take VBE info into account.
(fill_vbe_info) [GRUB_MACHINE_HAS_VBE]: New function.
(retrieve_video_parameters) [GRUB_MACHINE_HAS_VBE]:
Call fill_vbe_info when appropriate.
(grub_multiboot_make_mbi): Account for the size occupied by VBE info.
* grub-core/loader/multiboot_mbi2.c (grub_multiboot_load): Declare tags
as supported.
(grub_multiboot_get_mbi_size): Take new tags into account.
(fill_vbe_tag) [GRUB_MACHINE_HAS_VBE]: New function.
(retrieve_video_parameters) [GRUB_MACHINE_HAS_VBE]:
Call fill_vbe_tag when appropriate.
(grub_multiboot_make_mbi): Properly align tags.
* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_get_pm_interface): New
function.
* include/grub/i386/pc/vbe.h (grub_vbe_bios_get_pm_interface): New
proto.
* include/grub/multiboot.h (GRUB_MACHINE_HAS_VBE): New definition.

14 years ago Suport manual terminal geometry specification.
Vladimir 'phcoder' Serbinenko [Mon, 20 Sep 2010 14:27:33 +0000 (16:27 +0200)]
Suport manual terminal geometry specification.

* grub-core/term/ieee1275/ofconsole.c (grub_ofconsole_dimensions):
Save state in grub_ofconsole_terminfo_output.
(grub_ofconsole_term): Use grub_terminfo_getwh.
(grub_ofconsole_getwh): Removed.
* grub-core/term/serial.c (grub_serial_getwh): Removed.
(grub_serial_term): Use grub_terminfo_getwh.
* grub-core/term/terminfo.c (grub_terminfo_getwh): New function.
(options): New struct.
(OPTION_*): New enum.
(grub_cmd_terminfo): Transform into extcmd and handle new parameters.
* include/grub/terminfo.h (grub_terminfo_output_state): New fields
width and height.
(grub_terminfo_getwh): New proto.
* grub-core/lib/legacy_parse.c (grub_legacy_parse): Handle --lines.

14 years ago Handle legacy "terminal" command.
Vladimir 'phcoder' Serbinenko [Mon, 20 Sep 2010 14:15:50 +0000 (16:15 +0200)]
Handle legacy "terminal" command.

* grub-core/lib/legacy_parse.c (legacy_command): New flags FLAG_TITLE
and FLAG_TERMINAL.
(legacy_commands): Add terminal and title.
(grub_legacy_parse): Handle terminal. Simplify title handling.

14 years ago * grub-core/lib/arg.c (grub_arg_show_help): Correctly handle
Vladimir 'phcoder' Serbinenko [Mon, 20 Sep 2010 14:12:15 +0000 (16:12 +0200)]
* grub-core/lib/arg.c (grub_arg_show_help): Correctly handle
parameters overflow.

14 years ago* .bzrignore: Add grub-core/gnulib/sys, widthspec.bin, and
Colin Watson [Mon, 20 Sep 2010 13:03:47 +0000 (14:03 +0100)]
* .bzrignore: Add grub-core/gnulib/sys, widthspec.bin, and
widthspec.h.
* docs/grub.texi (Shell-like scripting): Document `!'.
(Network): Simplify using new i386-pc-pxe format.  Mention
grub-mknetdir.
* NEWS: Update.

14 years ago* Makefile.am (SUBDIRS): Restore "."; it's important to force
Colin Watson [Mon, 20 Sep 2010 12:55:49 +0000 (13:55 +0100)]
* Makefile.am (SUBDIRS): Restore "."; it's important to force
ordering, so that e.g. ascii.h is built before grub-core/font/font.c
when needed.

14 years agoAdd terminal support in legacy_parser
Vladimir 'phcoder' Serbinenko [Mon, 20 Sep 2010 12:48:17 +0000 (14:48 +0200)]
Add terminal support in legacy_parser

14 years ago* grub-core/commands/efi/lsefisystab.c: Correct header.
Colin Watson [Mon, 20 Sep 2010 12:18:41 +0000 (13:18 +0100)]
* grub-core/commands/efi/lsefisystab.c: Correct header.
* grub-core/commands/efi/lssal.c: Likewise.
* grub-core/commands/testload.c: Likewise.

14 years ago* util/grub-mkrescue.in: Add explicit root argument to --set to
Colin Watson [Mon, 20 Sep 2010 12:14:44 +0000 (13:14 +0100)]
* util/grub-mkrescue.in: Add explicit root argument to --set to
prevent the UUID being interpreted as an argument to --set (matches
previous change to prepare_grub_to_access_device).

14 years ago* kern/emu/hostdisk.c: Include <sys/ioctl.h> and <sys/disklabel.h>
Colin Watson [Mon, 20 Sep 2010 11:12:33 +0000 (12:12 +0100)]
* kern/emu/hostdisk.c: Include <sys/ioctl.h> and <sys/disklabel.h>
on FreeBSD.  Define HAVE_DIOCGDINFO on NetBSD and FreeBSD to reduce
the verbosity of later #ifs.
(find_partition_start): Define this function on FreeBSD too.
(device_is_wholedisk) [__FreeBSD__ || __FreeBSD_kernel__]: New
function.
(grub_util_biosdisk_get_grub_dev): Use partition-start-sector logic
on FreeBSD.

14 years ago * util/grub-editenv.c: Use argp instead of getopt.
Yves Blusseau [Mon, 20 Sep 2010 10:39:28 +0000 (12:39 +0200)]
* util/grub-editenv.c: Use argp instead of getopt.

14 years ago * util/grub-setup.c: Use argp instead of getopt.
Yves Blusseau [Mon, 20 Sep 2010 10:37:37 +0000 (12:37 +0200)]
* util/grub-setup.c: Use argp instead of getopt.

14 years ago Use gnulib-tool to create gnulib source files.
Yves Blusseau [Mon, 20 Sep 2010 10:35:33 +0000 (12:35 +0200)]
Use gnulib-tool to create gnulib source files.

    * Add gnulib files generated by gnulib-tool in build-aux, m4 and
    grub-core/gnulib directories
    * .bzignore: Add **/.deps and autogenerated gnulib files
    * configure.ac: Assign auxiliary directory to build-aux, add invocation
    of gnulib macros, add grub-core/gnulib/Makefile
    * Makefile.am: Add gnulib directory in SUBDIRS (removing unnecessary .),
    include m4 directory to aclocal.
    * Makefile.util.def: Remove direct compilation of gnulib source files
    and use the new grub-core/gnulib/libgnu.a.
    * build-aux/config.rpath: move config.rpath from top directory to
    build-aux
    * conf/Makefile.common: Remove the macro _GL_UNUSED already defined
    in gnulib headers
    * conf/Makefile.extra-dist: Add m4/gnulib-cache.m4
    * grub-core/Makefile.core.def: Remove unnecessary extra_dist
    * grub-core/lib/posix_wrap/localcharset.h (locale_charset): Update
    header.
    * grub-core/lib/posix_wrap/langinfo.h (nl_langinfo): Return static
    string.

14 years agomerge mainline into gingold3
Vladimir 'phcoder' Serbinenko [Mon, 20 Sep 2010 10:23:10 +0000 (12:23 +0200)]
merge mainline into gingold3

14 years ago * .bzrignore: Add grub-kbdcomp, grub-menulst2cfg, *.marker,
Yves Blusseau [Mon, 20 Sep 2010 09:49:57 +0000 (11:49 +0200)]
* .bzrignore: Add grub-kbdcomp, grub-menulst2cfg, *.marker,
    grub-core/genmod.sh and grub-core/gensyminfo.sh

14 years ago Add a test for echo command options.
BVK Chaitanya [Mon, 20 Sep 2010 08:23:55 +0000 (13:53 +0530)]
Add a test for echo command options.

* tests/grub_cmd_echo.in: New test.
* Makefile.util.def: Rules for new test.

14 years agoecho test case
BVK Chaitanya [Mon, 20 Sep 2010 08:21:16 +0000 (13:51 +0530)]
echo test case

14 years ago Remove crc.mod and move crc command to hashsum.mod.
Szymon Janc [Sun, 19 Sep 2010 23:40:58 +0000 (01:40 +0200)]
Remove crc.mod and move crc command to hashsum.mod.
Remove lib/crc.c - users updated to use gcrypt implementation.

* grub-core/commands/crc.c: Removed.
* grub-core/Makefile.core.def (crc): Module removed.
* grub-core/commands/hashsum.c (aliases[]): Add crc alias.
* grub-core/commands/hashsum.c (GRUB_MOD_INIT): Register crc command.
* grub-core/commands/hashsum.c (GRUB_MOD_FINI): Unregister crc command.
* grub-core/lib/crc.c: Removed.
* include/grub/lib/crc.h: Removed.
* Makefile.util.def (crc): Remove lib/crc.c
* grub-core/Makefile.core.def (libgrub.a): Remove grub-core/lib/crc.c.
* util/grub-fstest.c (cmd_crd): Use libgcrypt crc implementation.
* Makefile.util.def (libgrub.a): Add grub-core/lib/libgcrypt-grub/cipher/crc.c.
* Makefile.util.def (grub-fstest): Add CFLAGS_GCRY to cflags.
* Makefile.util.def (grub-fstest): Add CPPFLAGS_GCRY to cppflags.
* grub-core/efiemu/prepare.c (grub_efiemu_crc): Use libgcrypt crc implementation.

14 years ago * grub-core/boot/i386/pc/boot.S: Ignore %dl if it's not in a sane range.
Vladimir 'phcoder' Serbinenko [Sun, 19 Sep 2010 22:06:45 +0000 (00:06 +0200)]
* grub-core/boot/i386/pc/boot.S: Ignore %dl if it's not in a sane range.

14 years ago Split config.h for util and core.
Vladimir 'phcoder' Serbinenko [Sun, 19 Sep 2010 20:22:43 +0000 (22:22 +0200)]
Split config.h for util and core.

* acinclude.m4 (HAVE_ASM_USCORE): Transformed into a variable.
(ADDR32): Likewise.
(DATA32): Likewise.
(BSS_START_SYMBOL): Likewise.
(END_SYMBOL): Likewise.
(NEED_ENABLE_EXECUTE_STACK): Likewise. All users updated.
(grub_I386_ASM_ABSOLUTE_WITHOUT_ASTERISK): Removed.
* config.h.in: New file.
* configure.ac: Use config-util.h as config define file.
Rename MACHINE into GRUB_MACHINE. All users updated.
(NEED_REGISTER_FRAME_INFO): Transformed into a variable. All users
updated.
(NESTED_FUNC_ATTR): Likewise.
Substitue new variables.
(COND_HAVE_ASM_USCORE): New conditional.
* grub-core/Makefile.am (ASM_PREFIX): New variable.
(kernel_syms.lst): Use ASM_PREFIX.
* grub-core/kern/emu/console.c: Include config-util.h.
* grub-core/kern/emu/misc.c: Likewise.
* grub-core/kern/emu/mm.c: Likewise.
* include/grub/emu/misc.h: Likewise.
* include/grub/libgcc.h: Likewise.

14 years agoAdd lost part of GRUB_TERM_KEY_* commit
Vladimir 'phcoder' Serbinenko [Sun, 19 Sep 2010 20:12:25 +0000 (22:12 +0200)]
Add lost part of GRUB_TERM_KEY_* commit

14 years agoAdd lost include/grub/i386/coreboot/lbio.h
Vladimir 'phcoder' Serbinenko [Sun, 19 Sep 2010 20:10:44 +0000 (22:10 +0200)]
Add lost include/grub/i386/coreboot/lbio.h

14 years ago * grub-core/term/efi/console.c (efi_codes): Fix GRUB_TERM_KEY_*
Vladimir 'phcoder' Serbinenko [Sun, 19 Sep 2010 20:09:05 +0000 (22:09 +0200)]
* grub-core/term/efi/console.c (efi_codes): Fix GRUB_TERM_KEY_*
constants usage.
* grub-core/kern/emu/console.c (grub_ncurses_getkey):
Fix GRUB_TERM_KEY_* constants usage.
* grub-core/kern/emu/misc.c (asprintf): Fix vasprintf usage.

14 years ago * grub-core/bus/usb/ohci.c (grub_ohci_cancel_transfer): Use %p to
Vladimir 'phcoder' Serbinenko [Sun, 19 Sep 2010 20:05:48 +0000 (22:05 +0200)]
* grub-core/bus/usb/ohci.c (grub_ohci_cancel_transfer): Use %p to
print pointer.
* grub-core/bus/usb/uhci.c: Remove empty define.
(grub_uhci_check_transfer): Add missing cast.
* grub-core/bus/usb/usbhub.c (poll_nonroot_hub): Use %p to
print pointer.
* grub-core/term/usb_keyboard.c (grub_usb_keyboard_getkey): Use
PRIuGRUB_SIZE.
* include/grub/types.h (PRIuGRUB_SIZE): New definition.

14 years ago * grub-core/Makefile.core.def (legacycfg): Add
Vladimir 'phcoder' Serbinenko [Sun, 19 Sep 2010 20:03:16 +0000 (22:03 +0200)]
* grub-core/Makefile.core.def (legacycfg): Add
lib/i386/pc/vesa_modes_table.c on emu.

14 years ago Reduce number of temporary files generated by build system.
BVK Chaitanya [Sun, 19 Sep 2010 13:59:36 +0000 (19:29 +0530)]
Reduce number of temporary files generated by build system.

* grub-core/gencmdlist.sh: Removed.
* grub-core/genfslist.sh: Removed.
* grub-core/genhandlerlist.sh: Removed.
* grub-core/genmodsrc.sh: Removed.
* grub-core/genpartmaplist.sh: Removed.
* grub-core/genparttoollist.sh: Removed.
* grub-core/gentermiinallist.sh: Removed.
* grub-core/genvideolist.sh: Removed.

* grub-core/genmod.sh.in: New file.
* grub-core/gensyminfo.sh.in: New file.

* conf/Makefile.common (CPPFLAGS_*_LIST): New marker flags.
* conf/Makefile.extra-dist: Update with new files.
* gentpl.py: Remove rules related to unnecessary temporary files.
* grub-core/Makefile.am (syminfo.lst): New replacement for def-*
and und-* files.
* grub-core/Makefile.core.def: New rules for gensyminfo.sh and
genmod.sh scripts.
* grub-core/bus/usb/uhci.c: Remove empty #define.
* grub-core/genmoddep.awk: Updated with new syminfo format.
* util/bash-completion.d/Makefile.am: Add config.log to
CLEANFILES.

14 years ago* Makefile.util.def: Add forgotten $(LIBINTL) library.
Yves Blusseau [Sun, 19 Sep 2010 13:36:34 +0000 (15:36 +0200)]
* Makefile.util.def: Add forgotten $(LIBINTL) library.

14 years agomerge with mainline
BVK Chaitanya [Sun, 19 Sep 2010 13:24:45 +0000 (18:54 +0530)]
merge with mainline

14 years ago * util/grub-mkconfig.in: Check the config script for syntax errors
BVK Chaitanya [Sun, 19 Sep 2010 03:19:25 +0000 (08:49 +0530)]
* util/grub-mkconfig.in: Check the config script for syntax errors
before saving.

14 years agomerge with mainline
BVK Chaitanya [Sun, 19 Sep 2010 03:15:38 +0000 (08:45 +0530)]
merge with mainline

14 years ago * Makefile.util.def (grub-install): Use util/grub-install.in on all
Colin Watson [Sat, 18 Sep 2010 23:32:27 +0000 (01:32 +0200)]
* Makefile.util.def (grub-install): Use util/grub-install.in on all
platforms.
* util/grub-install.in: Add EFI and IEEE1275 support.
* util/i386/efi/grub-install.in: Removed.
* util/ieee1275/grub-install.in: Likewise.

Also-By: Vladimir Serbinenko <phcoder@gmail.com>
14 years ago * grub-core/commands/i386/cmostest.c (+parse_args): New function.
Vladimir 'phcoder' Serbinenko [Sat, 18 Sep 2010 23:15:44 +0000 (01:15 +0200)]
* grub-core/commands/i386/cmostest.c (+parse_args): New function.
(grub_cmd_cmosclean): Likewise.
(GRUB_MOD_INIT): Register command cmosclean.
* util/grub-mkconfig.in: Export GRUB_BUTTON_CMOS_CLEAN.
* util/grub.d/00_header.in: Handle GRUB_BUTTON_CMOS_CLEAN.

14 years agoAdd missing file of previous commit
Vladimir 'phcoder' Serbinenko [Sat, 18 Sep 2010 23:08:25 +0000 (01:08 +0200)]
Add missing file of previous commit

14 years ago Add keyboard layouts support.
Carles Pina i Estany [Sat, 18 Sep 2010 23:01:35 +0000 (01:01 +0200)]
Add keyboard layouts support.

* Makefile.util.def (grub-mklayout): New file.
(grub-kbdcomp): New script.
* grub-core/Makefile.am (KERNEL_HEADER_FILES) [COND_mips_yeeloong]:
Add keyboard_layouts.h.
* grub-core/Makefile.core.def (kernel): Add commands/keylayouts.c and
commands/boot.c on yeeloong.
(keylayouts): New module.
* grub-core/bus/usb/ohci.c
* grub-core/bus/usb/uhci.c
* grub-core/bus/usb/usbhub.c (rescan): New variable.
(grub_usb_add_hub): Poll interrupt pipe for device handling.
(attach_root_port): Likewise.
(poll_nonroot_hub): Likewise.
(grub_usb_poll_devices): Likewise.
(detach_device): Close transfer.
* grub-core/bus/usb/usbtrans.c (grub_usb_execute_and_wait_transfer): New
function.
(grub_usb_bulk_setup_readwrite): Likewise.
(grub_usb_bulk_finish_readwrite): Likewise.
* grub-core/commands/keylayouts.c: New file.
* grub-core/commands/keystatus.c (grub_getkeystatus): New function.
* grub-core/commands/menuentry.c (hotkey_aliases): All several new
aliases.
* grub-core/term/at_keyboard.c: Restructured to use keylayouts and
support scancode 2.
* grub-core/term/usb_keyboard.c: Restructured to use keylayouts.
* include/grub/keyboard_layouts.h: New file.
* util/grub-mklayout.c: New file.
* util/grub-kbdcomp.in: Likewise.

Also-By: Aleš Nesrsta <starous@volny.cz>
Also-By: Vladimir Serbinenko <phcoder@gmail.com>
14 years agoFix incorrect usb report interpretation
Aleš Nesrsta [Sat, 18 Sep 2010 22:34:25 +0000 (00:34 +0200)]
Fix incorrect usb report interpretation

14 years ago Unify memory types.
Vladimir 'phcoder' Serbinenko [Sat, 18 Sep 2010 22:04:31 +0000 (00:04 +0200)]
Unify memory types.

* grub-core/Makefile.am (KERNEL_HEADER_FILES): Include memory.h.
* grub-core/commands/lsmmap.c (grub_cmd_lsmmap): Output user-readable
types.
* grub-core/kern/i386/multiboot_mmap.c (grub_lower_mem): Removed.
(grub_upper_mem): Likewise.
* grub-core/kern/ieee1275/init.c (grub_upper_mem): Likewise.
* include/grub/memory.h (grub_memory_type_t): New enum.
All users updated.

14 years ago GRUB-legacy configuration file support.
Vladimir 'phcoder' Serbinenko [Sat, 18 Sep 2010 14:21:57 +0000 (16:21 +0200)]
GRUB-legacy configuration file support.

* Makefile.util.def (grub-menulst2cfg): New util.
* docs/man/grub-menulst2cfg.h2m: New file.
* grub-core/Makefile.core.def (legacycfg): New module.
* grub-core/commands/legacycfg.c: New file.
* grub-core/commands/menuentry.c (append_menu_entry): Rename to ...
(grub_normal_add_menu_entry): ... this.
* grub-core/commands/password.c (grub_cmd_password): Split main part to ...
(grub_normal_set_password): ...this.
* grub-core/commands/videoinfo.c (grub_cmd_videoinfo): Support MODE.
* grub-core/loader/i386/linux.c (linux_vesafb_res): Move to ..,
* grub-core/lib/i386/pc/vesa_modes_table.c: ... here.
* grub-core/lib/legacy_parse.c: New file.
* grub-core/normal/auth.c (grub_cmd_authenticate): New command.
* include/grub/i386/pc/vesa_modes_table.h: New file.
* include/grub/legacy_parse.h: Likewise.
* include/grub/normal.h (grub_normal_add_menu_entry): New proto.
* util/grub-menulst2cfg.c: New file.

* grub-core/Makefile.core.def (lsapm): New module.
* grub-core/commands/i386/pc/lsapm.c: New file.
* grub-core/loader/i386/multiboot_mbi.c (make_mbi) [GRUB_MACHINE_PCBIOS]: Pass APM info.
* grub-core/loader/multiboot_mbi2.c (make_mbi) [GRUB_MACHINE_PCBIOS]:
Likewise.
* include/grub/i386/pc/apm.h: New file.
* include/multiboot.h (multiboot_apm_info): New struct.

14 years agoFix yeeloong compilation
Vladimir 'phcoder' Serbinenko [Sat, 18 Sep 2010 11:49:39 +0000 (13:49 +0200)]
Fix yeeloong compilation

14 years agoFix multiple USB issues
Aleš Nesrsta [Sat, 18 Sep 2010 11:49:15 +0000 (13:49 +0200)]
Fix multiple USB issues

14 years agoSet UHCI low-speed flag
Aleš Nesrsta [Sat, 18 Sep 2010 08:56:52 +0000 (10:56 +0200)]
Set UHCI low-speed flag

14 years ago(convert_system_partition_to_system_disk): Initialise node.
Colin Watson [Fri, 17 Sep 2010 22:41:06 +0000 (23:41 +0100)]
(convert_system_partition_to_system_disk): Initialise node.
* grub-core/kern/emu/hostdisk.c

14 years ago* grub-core/kern/emu/hostdisk.c
Colin Watson [Fri, 17 Sep 2010 10:43:46 +0000 (11:43 +0100)]
* grub-core/kern/emu/hostdisk.c
(convert_system_partition_to_system_disk): Fix devmapper memory pool
leak.
Reported and based on patch by: Modestas Vainius.

14 years agoFix DM-RAID probing with recent versions of device-mapper udev
Colin Watson [Fri, 17 Sep 2010 10:00:37 +0000 (11:00 +0100)]
Fix DM-RAID probing with recent versions of device-mapper udev
rules.
* grub-core/kern/emu/hostdisk.c (read_device_map): Don't
canonicalise device paths under /dev/mapper/.
(convert_system_partition_to_system_disk): Compare the
uncanonicalised path to /dev/mapper/ rather than the canonicalised
path, since device nodes under /dev/mapper/ are often symlinks.

14 years ago * .bzrignore: *.d removed (old rule), add *.image and symlist.h.
Yves Blusseau [Fri, 17 Sep 2010 09:56:04 +0000 (11:56 +0200)]
* .bzrignore: *.d removed (old rule), add *.image and symlist.h.

14 years agoBasic menuentry-retrieveing jail
Vladimir 'phcoder' Serbinenko [Thu, 16 Sep 2010 21:48:32 +0000 (23:48 +0200)]
Basic menuentry-retrieveing jail

14 years ago * configure.ac: Avoid some annoying error messages if freetype-config
Yves Blusseau [Thu, 16 Sep 2010 15:07:42 +0000 (17:07 +0200)]
* configure.ac: Avoid some annoying error messages if freetype-config
    program is not found.