Vladimir 'phcoder' Serbinenko
7210dca942
Split coreboot and multiboot ports.
...
* conf/i386-multiboot.rmk: New file.
* configure.ac: Add multiboot port.
* include/grub/i386/multiboot/boot.h: New file.
* include/grub/i386/multiboot/console.h: Likewise.
* include/grub/i386/multiboot/init.h: Likewise.
* include/grub/i386/multiboot/kernel.h: Likewise.
* include/grub/i386/multiboot/loader.h: Likewise.
* include/grub/i386/multiboot/memory.h: Likewise.
* include/grub/i386/multiboot/serial.h: Likewise.
* include/grub/i386/multiboot/time.h: Likewise.
* include/grub/multiboot.h: Add GRUB_MACHINE_MULTIBOOT to ifdef.
* loader/multiboot.c: Likewise.
* loader/multiboot_mbi2.c: Likewise.
* util/grub-mkrescue.in: Generate multiboot rescue.
2010-05-01 14:06:53 +02:00
Vladimir 'phcoder' Serbinenko
54f83682d4
Add missing escape
2010-04-27 21:43:16 +02:00
BVK Chaitanya
f07ccea799
removed some duplicate code
2010-04-27 20:55:12 +05:30
Vladimir 'phcoder' Serbinenko
613b1b2c58
Include /grub.cfg
2010-04-27 13:44:39 +02:00
Vladimir 'phcoder' Serbinenko
ff6bea78b4
Enable pathspecs
2010-04-27 13:22:38 +02:00
Vladimir 'phcoder' Serbinenko
13ac43057b
use uuids on efi
2010-04-27 11:08:53 +02:00
Vladimir 'phcoder' Serbinenko
19ba92760a
merge merge-mkimage into rescue-efi
2010-04-27 10:47:29 +02:00
BVK Chaitanya
4c7085f82b
added support for --enable-grub-emu-modules build
2010-04-27 13:57:14 +05:30
BVK Chaitanya
840b61d8f0
reorganized grub-emu sources to suite upcoming automake build system
2010-04-27 10:50:28 +05:30
Vladimir 'phcoder' Serbinenko
88d046d01e
Switch to new grub-mkimage syntax
2010-04-26 21:27:41 +02:00
Vladimir 'phcoder' Serbinenko
8ea6ecb36d
Some cleanups
2010-04-26 21:11:16 +02:00
Vladimir 'phcoder' Serbinenko
debaf23f7c
all images binary identical to the ones from trunk
2010-04-26 19:11:38 +02:00
Vladimir 'phcoder' Serbinenko
bb3208158a
Fill info for remaining platforms. Make efi image identical to image of previous grub-mkimage
2010-04-26 17:19:15 +02:00
Vladimir 'phcoder' Serbinenko
962b15b4c1
Fill info tables for qemu, sparc and mips
2010-04-26 14:42:40 +02:00
Vladimir 'phcoder' Serbinenko
0253aeb7a1
Unified grub-mkimage achieved
2010-04-26 13:11:43 +02:00
Vladimir 'phcoder' Serbinenko
94ac790645
Fix various issues created by previous commits
2010-04-26 10:56:12 +02:00
Christian Franke
460d8402e0
* include/grub/util/getroot.h (grub_get_prefix): Remove prototype.
...
* util/getroot.c [__CYGWIN__] (get_win32_path): Remove function.
(grub_get_prefix): Remove function.
* util/grub-emu.c (main): Replace grub_get_prefix () call by
make_system_path_relative_to_its_root ().
* util/sparc64/ieee1275/grub-setup.c (main): Likewise.
2010-04-26 03:35:55 +02:00
Vladimir 'phcoder' Serbinenko
614be3f119
#if-less grub-mkimage
2010-04-26 00:45:21 +02:00
Vladimir 'phcoder' Serbinenko
2296410ffb
initial support for ppc in grub-mkimage (bugs for now)
2010-04-25 22:26:29 +02:00
Vladimir 'phcoder' Serbinenko
2fa6a5dd44
rename grub-mkrawimage to grub-mkimage
2010-04-25 19:41:51 +02:00
Vladimir 'phcoder' Serbinenko
287c2f2426
Remove efi/grub-mkimage.c
2010-04-25 19:39:22 +02:00
Vladimir 'phcoder' Serbinenko
e310b81f6c
util/grub-mkrawimage.c working on EFI
2010-04-25 19:38:12 +02:00
Vladimir 'phcoder' Serbinenko
d31bc9964c
migrate kernel.img to elf
2010-04-25 01:54:46 +02:00
Vladimir 'phcoder' Serbinenko
bc05c2cb2c
Change to xorrisofs. Make message more clear.
2010-04-24 21:08:25 +02:00
Grégoire Sutre
0d2c20c6f1
Add grub-mkconfig support for NetBSD.
2010-04-19 21:25:41 +02:00
Vladimir 'phcoder' Serbinenko
7428eb2cf6
Revert useless and wrong parts
2010-04-18 20:38:40 +02:00
Vladimir 'phcoder' Serbinenko
06f1ed913e
merge mainline into sparcfixes
2010-04-18 20:28:30 +02:00
Grégoire Sutre
38e55e9058
TARGET_IMG_LDFLAGS_AC now always expects a number appended to it. Fixed
...
grub_prefix in grub-mkconfig for NetBSD and OpenBSD.
2010-04-18 19:57:50 +02:00
Vladimir 'phcoder' Serbinenko
b076cdc730
Shave off bytes to compensate boot.img size increase
2010-04-18 18:22:58 +02:00
Vladimir 'phcoder' Serbinenko
ee9056d097
Support cross-disk installs. On non-cross-disk retrieve bootpath from chosen/bootpath
2010-04-18 16:35:08 +02:00
Vladimir 'phcoder' Serbinenko
6e86896ed8
Use ofpathname in grub-setup on sparc
2010-04-18 14:02:13 +02:00
Vladimir 'phcoder' Serbinenko
0b830b8f5e
* util/hostdisk.c (make_device_name): Change to new partition naming.
2010-04-18 12:59:04 +02:00
Vladimir 'phcoder' Serbinenko
260ddb9417
create a fat16 image as efi spec requires
2010-04-17 16:43:04 +02:00
Vladimir 'phcoder' Serbinenko
1989170fd5
merge mainline into rescue-efi
2010-04-17 02:32:05 +02:00
Vladimir 'phcoder' Serbinenko
d499b13371
Remove grub/handler.h inclusion. Reported by: Giovanni Toraldo
2010-04-15 02:13:28 +02:00
Colin Watson
0b45630927
Restore TEXTDOMAINDIR correction from r1889, lost apparently by
...
mistake in r2156. Noticed by Anthony Fok.
* util/grub.d/10_kfreebsd.in (TEXTDOMAINDIR): Set to lowercased
@localedir@.
* util/grub.d/10_linux.in (TEXTDOMAINDIR): Likewise.
2010-04-14 13:59:58 +01:00
Carles Pina i Estany
ce44826e79
Enclose all translated strings in grub.cfg in single quotes, and
...
escape them appropriately (Ubuntu bug #552921 ).
* util/grub-mkconfig_lib.in (gettext_quoted): New function.
* util/grub.d/10_hurd.in: Use it.
* util/grub.d/10_kfreebsd.in (kfreebsd_entry): Likewise.
* util/grub.d/10_linux.in (linux_entry): Likewise.
Also-By: Colin Watson <cjwatson@ubuntu.com>
2010-04-13 13:57:56 +01:00
BVK Chaitanya
b02c7c8fb5
added getopt like error for missing option parameters
2010-04-12 21:33:03 +05:30
BVK Chaitanya
8f33d5549f
merged with mainline
2010-04-12 20:47:25 +05:30
Vladimir 'phcoder' Serbinenko
b7f3ac299d
* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Remove
...
disk_info_msg (conflicts with gettexting into languages with cases).
2010-04-10 20:28:25 +02:00
Grégoire Sutre
e0fc9e78c1
missing part of patch
2010-04-10 17:09:24 +02:00
Grégoire Sutre
2c7031b135
Add grub-probe support for NetBSD.
...
* util/getroot.c (find_root_device): Convert block device to
character device on NetBSD.
* util/probe.c (probe): Require character device on NetBSD.
* util/hostdisk.c: NetBSD specific headers.
(configure_device_driver): new function to tune device driver
parameters (currently only for NetBSD floppy driver).
(grub_util_biosdisk_open): NetBSD specific code (get disk size
via disklabel ioctl).
(open_device): call configure_device_driver on NetBSD.
(convert_system_partition_to_system_disk): NetBSD specific code.
(device_is_wholedisk): Likewise.
(grub_util_biosdisk_get_grub_dev): Likewise.
(make_device_name): Fixed a typo in bsd_part_str.
* configure.ac: check for opendisk() and getrawpartition() on
NetBSD and set LIBUTIL.
* Makefile.in: add LIBUTIL to LIBS.
2010-04-10 17:07:33 +02:00
BVK Chaitanya
84a09b2134
merged with mainline
2010-04-10 19:18:24 +05:30
Vladimir 'phcoder' Serbinenko
a29e902132
Merge mainline into emu-modload
2010-04-10 01:25:46 +02:00
Vladimir 'phcoder' Serbinenko
e2d15128a5
Fix grub-setup on sparc compilation
2010-04-09 23:16:08 +02:00
Vladimir 'phcoder' Serbinenko
4a55d631d7
Merge mainline into for_macros
2010-04-09 22:35:32 +02:00
Vladimir 'phcoder' Serbinenko
4777971126
* util/grub-mkrescue.in: Fix incorrect path in coreboot part.
...
Reported by: Thomas Schmitt.
Add -no-emul-boot to grub-mkisofs parameters.
2010-04-09 20:40:14 +02:00
Vladimir 'phcoder' Serbinenko
a87add6d17
merge mainline into bidi
2010-04-09 19:40:31 +02:00
Vladimir 'phcoder' Serbinenko
9e71201f48
merge mainline into bidi
2010-04-09 19:31:43 +02:00
BVK Chaitanya
34bb22dfa5
While and until loops support to GRUB script.
...
* include/grub/script_sh.h (grub_script_cmdwhile): New struct.
(grub_script_create_cmdwhile): New function prototype.
(grub_script_execute_cmdwhile): New function prototype.
* script/execute.c (grub_script_execute_cmdwhile): New function.
* script/parser.y (command): New commands.
(whilecmd): New grammar rule.
(untilcmd): New grammar rule.
* script/script.c (grub_script_create_cmdwhile): New function.
* util/grub-script-check.c (grub_script_execute_cmdwhile): New
function.
* tests/grub_script_while1.in: New testcase.
* conf/tests.rmk: Rule for new testcase.
2010-04-09 22:04:21 +05:30
BVK Chaitanya
c41c00eab6
merged with mainline
2010-04-09 21:44:59 +05:30
Vladimir 'phcoder' Serbinenko
e215d8e02a
* util/grub.d/00_header.in: Add few missing quotes. Recognise *.jpeg
...
as *.jpg.
2010-04-09 17:44:03 +02:00
Mario Vazquez
d7c43ba1c0
GRUB_BACKGROUND support.
...
* util/grub-mkconfig.in: Export GRUB_BACKGROUND.
* util/grub.d/00_header.in: Parse GRUB_BACKGROUND.
2010-04-09 17:37:38 +02:00
Vladimir 'phcoder' Serbinenko
d64795c0eb
Load fonts and modules for gfxmenu in grub-mkconfig.
...
Idea by: Mario Vasquez
* util/grub.d/00_header.in: Load pf2 and image modules.
2010-04-09 16:56:07 +02:00
Vladimir 'phcoder' Serbinenko
f267f83a13
grub-mkconfig multiple terminal support.
...
* util/grub-mkconfig.in: Handle multiple terminals correctly.
* util/grub.d/00_header.in: Likewise.
2010-04-09 16:29:10 +02:00
Colin Watson
df60998c64
* util/grub.d/10_linux.in: Only use the first word of
...
GRUB_DISTRIBUTOR for --class, to avoid problems if somebody puts
spaces in GRUB_DISTRIBUTOR.
* util/grub.d/10_kfreebsd.in: Likewise.
* util/grub.d/10_hurd.in: Likewise.
2010-04-08 10:54:44 +01:00
Vladimir 'phcoder' Serbinenko
3bf09c9ea8
rename format from raw to yeeloong_flash
2010-04-06 22:23:02 +02:00
Vladimir 'phcoder' Serbinenko
a6132b9f3f
Merge mainline into yeeloongfw
2010-04-05 17:35:03 +02:00
Grégoire Sutre
b9396631bc
* util/grub-install.in: Add `|| exit 1' to all grub-probe calls
...
for which failure is fatal.
2010-04-03 20:52:06 +02:00
Grégoire Sutre
50479febcf
* util/grub-install.in: Use mkdir -p to create grub directory.
...
* util/i386/efi/grub-install.in: Likewise.
* util/ieee1275/grub-install.in: Likewise.
2010-04-03 20:48:36 +02:00
Grégoire Sutre
bd5a6415b0
* util/i386/efi/grub-dumpdevtree: replaced the non-portable `==' by
...
`=' and added double quotes on operands of this equality test.
2010-04-03 20:23:21 +02:00
Vladimir 'phcoder' Serbinenko
d5631db0f2
grub-mkconfig multiple terminal support.
...
* util/grub-mkconfig.in: Handle multiple terminals correctly.
* util/grub.d/00_header.in: Likewise.
2010-04-02 21:12:20 +02:00
Vladimir 'phcoder' Serbinenko
c2062d5f3a
Remove useless change in grub-emu.c
2010-03-30 14:09:24 +02:00
Vladimir 'phcoder' Serbinenko
f651947b58
Merge mainline into bidi
2010-03-30 11:24:28 +02:00
Vladimir 'phcoder' Serbinenko
a6ab5fb2cf
Cut font borders
2010-03-29 03:13:59 +02:00
Vladimir 'phcoder' Serbinenko
3f11c7131e
Generate shaping table based on unicode if source font has none
2010-03-29 02:06:40 +02:00
Grégoire Sutre
394a3120a7
Fix a build failure (-Wundef -Werror) when ENABLE_NLS is not defined,
...
which is the case with --disabled-nls.
* include/grub/i18n.h: Use (defined(ENABLE_NLS)
&& ENABLE_NLS) instead of ENABLE_NLS in all #if preprocessor macros.
* util/misc.c: Likewise.
* util/mkisofs/mkisofs.c: Likewise.
* util/mkisofs/mkisofs.h: Likewise.
2010-03-27 12:19:32 +01:00
Vladimir 'phcoder' Serbinenko
d56a6ac7f6
Remove handlers
2010-03-27 00:19:42 +01:00
BVK Chaitanya
baae00df35
merged with mainline
2010-03-26 21:13:06 +05:30
BVK Chaitanya
c299f3d6fb
merged with mainline
2010-03-26 20:55:07 +05:30
Vladimir 'phcoder' Serbinenko
c9ea504d25
merge mainline into nestpart
2010-03-26 15:44:13 +01:00
Vladimir 'phcoder' Serbinenko
3c31d9c082
Report freetype errors
2010-03-25 11:56:19 +01:00
Vladimir 'phcoder' Serbinenko
6d107fb2a4
Add ligatures to problem list
2010-03-25 11:26:50 +01:00
Vladimir 'phcoder' Serbinenko
e6d428c1b8
Arabic shaping support
2010-03-24 22:33:00 +01:00
Vladimir 'phcoder' Serbinenko
03e4ef0293
Import data for arabic joining computation
2010-03-24 00:35:38 +01:00
Vladimir 'phcoder' Serbinenko
741b56af5c
Moved unicode files to separate directory
2010-03-23 23:25:14 +01:00
Vladimir 'phcoder' Serbinenko
6fd346ea6c
Update UnicodeData.txt
2010-03-23 23:20:35 +01:00
Vladimir 'phcoder' Serbinenko
521bf3018f
Add character properties checking and a comment about problematic characters
2010-03-23 23:19:27 +01:00
Vladimir 'phcoder' Serbinenko
ce04e79272
Remove leftover variables
2010-03-23 16:02:06 +01:00
BVK Chaitanya
c45d352721
merged in mainline
2010-03-22 17:16:31 +05:30
BVK Chaitanya
ba4be5af25
fixed help message for grub-script-check
2010-03-22 13:25:09 +05:30
Colin Watson
bed1d3524e
* util/grub-install.in: Copy .mo files from @datadir@/locale, to
...
match where 'make install' puts them.
* util/i386/efi/grub-install.in: Likewise.
2010-03-21 23:04:02 +00:00
BVK Chaitanya
dd6fee39fa
merged mainline
2010-03-21 11:03:41 +05:30
Vladimir 'phcoder' Serbinenko
6f5568ed67
Add mirroring for visual UTF-8
2010-03-16 21:57:34 +01:00
Vladimir 'phcoder' Serbinenko
703cbe63d6
Remove trivial getcharwidth (now implicit)
2010-03-16 21:33:23 +01:00
Vladimir 'phcoder' Serbinenko
6c363dfd54
Fix doublewidth character handling
2010-03-16 21:29:15 +01:00
BVK Chaitanya
8a99e92a69
merge in mainline
2010-03-16 17:42:27 +05:30
Vladimir 'phcoder' Serbinenko
0a239a8211
bidi works in terminal in grub-emu
2010-03-15 21:14:11 +01:00
Vladimir 'phcoder' Serbinenko
dfed5c6bb4
Removed grub_putchar
2010-03-15 11:49:27 +01:00
Vladimir 'phcoder' Serbinenko
53f312c1cf
Merge mainline into bidi
2010-03-15 10:28:09 +01:00
BVK Chaitanya
8622549153
merged in mainline
2010-03-14 22:20:55 +05:30
Vladimir 'phcoder' Serbinenko
1d63a066e2
Remove some redundancy in build system.
...
* Makefile.in (TARGET_CFLAGS): Add -ffreestanding.
(TARGET_ASFLAGS): Add -nostdinc -fno-builtin.
(TARGET_LDFLAGS): Add -nostdlib.
(TARGET_IMG_LDFLAGS): Likewise.
* commands/lsmmap.c (grub_cmd_lsmmap) [GRUB_MACHINE_EMU]: Don't do
anything since mmap isn't available.
* conf/any-emu.rmk (kernel_img_SOURCES): Remove commands/boot.c.
Add util/time.c.
(pkglib_MODULES): Remove reboot.mod.
(reboot_mod_SOURCES): Removed.
(reboot_mod_CFLAGS): Likewise.
(reboot_mod_LDFLAGS): Likewise.
* conf/common.rmk (script/lexer.c_DEPENDENCIES): New variable.
(MOSTLYCLEANFILES): Add symlist.c kernel_syms.lst.
(DEFSYMFILES): Add kernel_syms.lst.
(kernel_img_HEADERS): Add common headers.
(symlist.c): New target.
(kernel_syms.lst): Likewise.
(pkglib_MODULES): Add memdisk.mod.
(memdisk_mod_SOURCES): New variable.
(memdisk_mod_CFLAGS): Likewise.
(memdisk_mod_LDFLAGS): Likewise.
(pkglib_MODULES): Add reboot.mod.
(reboot_mod_SOURCES): New variable.
(reboot_mod_CFLAGS): Likewise.
(reboot_mod_LDFLAGS): Likewise.
(pkglib_MODULES): Add date.mod.
(date_mod_SOURCES): New variable.
(date_mod_CFLAGS): Likewise.
(date_mod_LDFLAGS): Likewise.
(pkglib_MODULES): Add datehook.mod.
(datehook_mod_SOURCES): New variable.
(datehook_mod_CFLAGS): Likewise.
(datehook_mod_LDFLAGS): Likewise.
(pkglib_MODULES): Add lsmmap.mod.
(lsmmap_mod_SOURCES): New variable.
(lsmmap_mod_CFLAGS): Likewise.
(lsmmap_mod_LDFLAGS): Likewise.
(pkglib_MODULES): Add boot.mod.
(boot_mod_SOURCES): New variable.
(boot_mod_CFLAGS): Likewise.
(boot_mod_LDFLAGS): Likewise.
* conf/i386-coreboot.rmk: Removed redundant parts.
* conf/i386-ieee1275.rmk: Likewise.
* conf/i386-pc.rmk: Likewise.
* conf/mips-yeeloong.rmk: Likewise.
* conf/mips.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* conf/i386-coreboot.rmk: Moved qemu parts ..
* conf/i386-qemu.rmk: ... here
* conf/i386-efi.rmk: Moved common parts to...
* conf/x86-efi.rmk: ... here.
* conf/i386.rmk: Added modules common to all x86 variants.
* configure.ac: Add -m32/-m64 to TARGET_ASFLAGS.
* disk/memdisk.c: Remove grub/machine/kernel.h.
* gensymlist.sh.in: Include symbol.h.
* hook/datehook.c: Correct module name.
* include/grub/datetime.h (grub_get_datetime) [GRUB_MACHINE_EMU]: Export.
(grub_set_datetime) [GRUB_MACHINE_EMU]: Likewise.
* include/grub/i386/efi/serial.h: New file.
* include/grub/x86_64/efi/serial.h: Likewise.
* util/time.c: Likewise.
* video/ieee1275.c (grub_video_ieee1275_setup): Handle 64-bit void *.
2010-03-14 17:17:49 +01:00
Colin Watson
08e46ededa
Speed up consecutive hostdisk operations on the same device.
...
* util/hostdisk.c (struct grub_util_biosdisk_data): New structure.
(grub_util_biosdisk_open): Initialise disk->data.
(struct linux_partition_cache): New structure.
(linux_find_partition): Cache partition start positions; these are
expensive to compute on every read and write.
(open_device): Cache open file descriptor in disk->data, so that we
don't have to reopen it and flush the buffer cache for consecutive
operations on the same device.
(grub_util_biosdisk_close): New function.
(grub_util_biosdisk_dev): Set `close' member.
* conf/common.rmk (grub_probe_SOURCES): Add kern/list.c.
* conf/i386-efi.rmk (grub_setup_SOURCES): Likewise.
* conf/i386-pc.rmk (grub_setup_SOURCES): Likewise.
* conf/sparc64-ieee1275.rmk (grub_setup_SOURCES): Likewise.
* conf/x86_64-efi.rmk (grub_setup_SOURCES): Likewise.
2010-03-14 15:39:14 +00:00
Vladimir 'phcoder' Serbinenko
dae79b6b05
Merge mainline into emu-mod
2010-03-14 16:27:54 +01:00
Vladimir 'phcoder' Serbinenko
016a671b51
Merge mainline into cleanbuild
2010-03-14 16:01:31 +01:00
Vladimir 'phcoder' Serbinenko
313df2f552
Merge mainline into sparc-mkimage
2010-03-14 15:21:04 +01:00
Thorsten Glaser
d68b491ee2
* util/grub-mkrescue.in: Base ISO UUID on UTC.
2010-03-14 13:48:55 +01:00
Matt Kraai
4e02ed5014
2010-03-08 Matt Kraai <kraai@ftbfs.org>
...
* util/i386/pc/grub-setup.c (setup): Fix a grammatical error (Debian
bug #559005 ).
2010-03-08 22:20:02 +00:00
Vladimir 'phcoder' Serbinenko
c28e2d120b
merge mainline into yeeloongfw
2010-03-07 23:21:09 +01:00
Vladimir 'phcoder' Serbinenko
33e2e6f373
2010-03-06 Vladimir Serbinenko <phcoder@gmail.com>
...
* util/grub-mkrescue.in: Use mktemp with explicit template.
2010-03-06 17:28:25 +01:00
Vladimir 'phcoder' Serbinenko
60b03859e8
2010-03-05 Vladimir Serbinenko <phcoder@gmail.com>
...
* util/import_gcry.py: Add autogenerated files to MAINTAINER_CLEANFILES.
2010-03-05 15:38:04 +01:00
Christian Franke
4760f97911
2010-03-04 Christian Franke <franke@computer.org>
...
* util/grub-pe2elf.c: Add missing include "progname.h".
2010-03-04 16:25:26 +01:00
Vladimir 'phcoder' Serbinenko
08dcd91370
2010-03-04 Vladimir Serbinenko <phcoder@gmail.com>
...
* util/i386/efi/grub-install.in: Copy gettext files.
2010-03-04 15:12:34 +01:00
Colin Watson
c6293875f9
reopen device when the requested access mode changes
2010-03-03 20:03:50 +00:00
Colin Watson
22d7b6137a
2010-03-03 Colin Watson <cjwatson@ubuntu.com>
...
* util/hostdisk.c (struct grub_util_biosdisk_data): New structure.
(grub_util_biosdisk_open): Initialise disk->data.
(struct linux_partition_cache): New structure.
(linux_find_partition): Cache partition start positions; these are
expensive to compute on every read and write.
(open_device): Cache open file descriptor in disk->data, so that we
don't have to reopen it and flush the buffer cache for consecutive
operations on the same device.
(grub_util_biosdisk_close): New function.
(grub_util_biosdisk_dev): Set `close' member.
* conf/common.rmk (grub_probe_SOURCES): Add kern/list.c.
* conf/i386-efi.rmk (grub_setup_SOURCES): Likewise.
* conf/i386-pc.rmk (grub_setup_SOURCES): Likewise.
* conf/sparc64-ieee1275.rmk (grub_setup_SOURCES): Likewise.
* conf/x86_64-efi.rmk (grub_setup_SOURCES): Likewise.
2010-03-03 10:44:12 +00:00
Vladimir 'phcoder' Serbinenko
14532662ee
merge mainline into sparc-mkimage
2010-03-03 11:24:36 +01:00
Vladimir 'phcoder' Serbinenko
813a5f2d33
Init DDR2 controller
2010-03-01 18:53:34 +01:00
Vladimir 'phcoder' Serbinenko
72b286313a
2010-02-26 Vladimir Serbinenko <phcoder@gmail.com>
...
* util/grub.d/10_linux.in (linux_entry): Don't default to
gfxpayload=keep if Linux doesn't support video handover.
2010-02-26 14:32:24 +01:00
Colin Watson
a0ca21c2d2
2010-02-25 Jordan Uggla <jordan.uggla@gmail.com>
...
* util/grub-mkconfig.in (GRUB_SAVEDEFAULT): Export new variable.
* util/grub-mkconfig_lib.in (save_default_entry): Only save a new
default entry if GRUB_SAVEDEFAULT=true. This allows using
GRUB_DEFAULT=saved on its own to let grub-reboot work, without
saving a new default on every boot.
2010-02-25 13:30:50 +00:00
carles
7dd05b96dc
2010-02-20 Carles Pina i Estany <carles@pina.cat>
...
* util/grub-mkrawimage.c (usage): Change string formatting to
improve gettext.
2010-02-20 23:31:35 +00:00
Samuel Thibault
0a39de87d9
2010-02-14 Samuel Thibault <samuel.thibault@ens-lyon.org>
...
* util/grub-mkconfig.in: Export GRUB_INIT_TUNE.
* util/grub.d/00_header.in: Handle GRUB_INIT_TUNE.
2010-02-18 08:56:31 +01:00
Vladimir 'phcoder' Serbinenko
d27859b2ec
2010-02-14 Vladimir Serbinenko <phcoder@gmail.com>
...
* util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Enclose
set root in single quotes to prevent \, from being unescaped.
2010-02-14 14:47:50 +01:00
Vladimir 'phcoder' Serbinenko
10f6389453
Fix raw image addresses
2010-02-13 18:48:33 +01:00
Vladimir 'phcoder' Serbinenko
0b4ab8e54a
Merge mainline int sparc-mkimage-unify
2010-02-13 16:49:21 +01:00
Vladimir 'phcoder' Serbinenko
a49217cff7
aout image support
2010-02-13 16:26:50 +01:00
Vladimir 'phcoder' Serbinenko
bdca260795
2010-02-13 Vladimir Serbinenko <phcoder@gmail.com>
...
* util/grub-mkrawimage.c (main): Call set_program_name.
2010-02-13 15:57:42 +01:00
Vladimir 'phcoder' Serbinenko
da278c4d34
2010-02-13 Vladimir Serbinenko <phcoder@gmail.com>
...
Properly align 64-bit targets.
* util/grub-mkrawimage.c (ALIGN_ADDR): New macro.
(generate_image): Use ALIGN_ADDR.
2010-02-13 15:54:27 +01:00
Vladimir 'phcoder' Serbinenko
b274d734f3
2010-02-13 Vladimir Serbinenko <phcoder@gmail.com>
...
Properly create cross-endian images.
* include/grub/types.h (grub_host_to_target_addr): New macro
* util/grub-mkrawimage.c (generate_image): Add missing host_to_target.
2010-02-13 15:40:13 +01:00
Vladimir 'phcoder' Serbinenko
82da2062d8
2010-02-13 Vladimir Serbinenko <phcoder@gmail.com>
...
* util/grub-mkrawimage.c (generate_image): Add forgotten ALIGN_UP.
2010-02-13 15:25:37 +01:00
Vladimir 'phcoder' Serbinenko
6bea3f8983
merge sparc grub-mkimage into grub-mkrawimage
2010-02-12 20:08:56 +01:00
Vladimir 'phcoder' Serbinenko
65a533e78a
2010-02-10 Vladimir Serbinenko <phcoder@gmail.com>
...
Support GRUB_GFXPAYLOAD_LINUX.
* util/grub-mkconfig.in: Export GRUB_GFXPAYLOAD_LINUX.
* util/grub.d/10_linux.in (linux_entry): Handle GRUB_GFXPAYLOAD_LINUX.
2010-02-10 19:53:13 +01:00
Vladimir 'phcoder' Serbinenko
ca3112ba2d
merge cleanbuild into emu-modload
2010-02-08 00:21:55 +01:00
Vladimir 'phcoder' Serbinenko
ec0be08d40
Clean building system
2010-02-07 23:49:49 +01:00
Vladimir 'phcoder' Serbinenko
7eed9925e2
missing files
2010-02-07 18:10:36 +01:00
Vladimir 'phcoder' Serbinenko
b77ab1aaa9
Merge emu-mod into emu-modload
2010-02-07 17:52:11 +01:00
Vladimir 'phcoder' Serbinenko
a1a8d38a58
Use nostdinc
2010-02-07 17:30:16 +01:00
Vladimir 'phcoder' Serbinenko
3dca5319c6
module support in grub-emu
2010-02-07 16:13:59 +01:00
Vladimir 'phcoder' Serbinenko
f38873b80b
Build system support for grub-emu modules
2010-02-07 15:17:26 +01:00
BVK Chaitanya
09f38ecd5a
fix remaining scripts
2010-02-07 10:31:04 +05:30
BVK Chaitanya
7a64e28d0e
fixed mkconfig and mkrescue scripts
2010-02-07 10:14:50 +05:30
Vladimir 'phcoder' Serbinenko
2083672af1
Remove -DGRUB_UTIL when compiling grub-emu
2010-02-07 04:23:44 +01:00
Vladimir 'phcoder' Serbinenko
19a9fb834b
merge mainline into emu-mod
2010-02-07 03:06:33 +01:00
Vladimir 'phcoder' Serbinenko
74e4934e1c
2010-02-07 Vladimir Serbinenko <phcoder@gmail.com>
...
* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Rename one instance
of disk to dsk to avoid shadowing.
(find_free_slot): Fix prototype.
* util/getroot.c (grub_util_is_dmraid): Make static.
* include/grub/time.h (grub_get_rtc) [GRUB_MACHINE_EMU || GRUB_UTIL]:
Add missing prototype.
* util/sdl.c (grub_video_sdl_set_viewport): Remove.
2010-02-07 02:47:18 +01:00
Vladimir 'phcoder' Serbinenko
f88d801b17
2010-02-07 Vladimir Serbinenko <phcoder@gmail.com>
...
Fix warnings in grub-emu when compiling with maximum warning options.
* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Rename one instance
of disk to dsk to avoid shadowing.
2010-02-07 02:44:47 +01:00
Vladimir 'phcoder' Serbinenko
98e6959dea
2010-02-07 Vladimir Serbinenko <phcoder@gmail.com>
...
Fix warnings in grub-emu when compiling with maximum warning options.
* util/grub-emu.c (ENABLE_RELOCATABLE): New definition.
(grub_arch_modules_addr): Return 0 and not NULL.
* util/misc.c (ENABLE_RELOCATABLE): New definition.
(xstrdup): USe newstr instead of dup.
2010-02-07 02:37:48 +01:00
Vladimir 'phcoder' Serbinenko
909301af11
First try at generating grub-emu from modules
2010-02-07 02:07:35 +01:00
Vladimir 'phcoder' Serbinenko
58548abbc3
Remove data member in partition structure
2010-02-07 01:48:38 +01:00
Vladimir 'phcoder' Serbinenko
8f891adc6f
2010-02-07 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/cache.h (grub_arch_sync_caches) [i386 || x86_64]: Inline.
* kern/i386/coreboot/init.c (grub_arch_sync_caches): Remove.
* kern/i386/efi/init.c (grub_arch_sync_caches): Likewise.
* kern/i386/ieee1275/init.c (grub_arch_sync_caches): Likewise.
* kern/i386/pc/init.c (grub_arch_sync_caches): Likewise.
* util/misc.c (grub_arch_sync_caches) [i386 || x86_64]: Likewise.
2010-02-07 00:52:31 +01:00
Vladimir 'phcoder' Serbinenko
85f90358b1
Remove part_ prefix
2010-02-06 19:33:53 +01:00
Vladimir 'phcoder' Serbinenko
bc6fcf0931
merge mainline into nestpart
2010-02-06 18:47:17 +01:00
Vladimir 'phcoder' Serbinenko
15cb7d433f
Reimport nestpart
2010-02-06 18:43:37 +01:00
BVK Chaitanya
1c1261d985
fixed grub-install.in
2010-02-06 14:29:42 +05:30
Vladimir 'phcoder' Serbinenko
1f534b6908
Merge mainline into gfxmenu
2010-02-03 01:24:07 +01:00
Vladimir 'phcoder' Serbinenko
2b4068e992
2010-02-03 Vladimir Serbinenko <phcoder@gmail.com>
...
* util/hostdisk.c (open_device): Don't use partition device when reading
before the partition.
(grub_util_biosdisk_read): Don't read from partition and before the
partition in single operation.
(grub_util_biosdisk_write): Don't write to partition and before the
partition in single operation.
2010-02-03 00:49:35 +01:00
Colin Watson
b9c4f55b6f
handle DM-RAID disks in convert_system_partition_to_system_disk
2010-01-31 19:37:37 +00:00
Christian Schmitt
bf7fcba2d7
2010-01-28 Christian Schmitt <chris@ilovelinux.de>
...
* util/ieee1275/grub-install.in: Fix nvsetenv arguments.
2010-01-28 23:10:37 +01:00
BVK Chaitanya
366e15ba86
sync with trunk
2010-01-28 21:48:15 +05:30
BVK Chaitanya
275d6f6bd4
fix grub-script-check
2010-01-28 21:43:28 +05:30
Colin Watson
2e1cb9bbbf
2010-01-28 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub.d/10_linux.in: This script does not use any of the
contents of gettext.sh, only the external command `gettext', so stop
sourcing it. (Moreover, gettext.sh isn't necessarily installed in
the same prefix as GRUB.)
* util/grub.d/10_kfreebsd.in: Likewise.
2010-01-28 12:49:40 +00:00
Robert Millan
27dea7eda4
2010-01-27 Robert Millan <rmh.grub@aybabtu.com>
...
* util/hostfs.c: Include `<errno.h>'.
(grub_hostfs_read): Handle errors from fseeko() and fread().
2010-01-27 03:18:14 +00:00
Robert Millan
af75a9f19a
2010-01-27 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub-fstest.c (fstest): Rewrite allocation, fixing a few
memleak conditions.
2010-01-27 01:49:11 +00:00
carles
254e2ce596
2010-01-27 Carles Pina i Estany <carles@pina.cat>
...
* util/lvm.c: New macro LVM_DEV_MAPPER_STRING.
(grub_util_lvm_isvolume): Use LVM_DEV_MAPPER_STRING.
2010-01-27 00:19:46 +00:00
carles
b510928c38
2010-01-26 Carles Pina i Estany <carles@pina.cat>
...
* util/bin2h.c (usage): Fix warning (space after backslash).
2010-01-26 21:23:59 +00:00
carles
de0b7a4ed1
2010-01-25 Carles Pina i Estany <carles@pina.cat>
...
* font/font.c: Include `grub/fontformat.h.
Remove font file format constants.
(grub_font_load): Use the new macros.
* include/grub/fontformat.h: New file.
* util/grub-mkfont.c: Include `grub/fontformat.c'.
(write_font_pf2): Use the new macros.
2010-01-26 20:16:08 +00:00
Robert Millan
94e7e71281
2010-01-26 Robert Millan <rmh.grub@aybabtu.com>
...
* util/bin2h.c (usage): Make --help actually explain what `grub-bin2h'
does.
2010-01-26 18:12:49 +00:00
Colin Watson
b769a37b6e
2010-01-26 Colin Watson <cjwatson@ubuntu.com>
...
* conf/common.rmk (grub_mkdevicemap_SOURCES): Add kern/env.c,
kern/err.c, kern/list.c, and kern/misc.c.
* util/deviceiter.c [__linux__]: Define MINOR.
(grub_util_iterate_devices): Add support for DM-RAID disk devices.
* util/mkdevicemap.c (grub_putchar): New function.
(grub_getkey): New function.
(grub_refresh): New function.
(main): Set debug=all if -v -v is used.
2010-01-26 14:26:16 +00:00
Colin Watson
7181e2281f
2010-01-25 Colin Watson <cjwatson@ubuntu.com>
...
* configure.ac: Check for Linux device-mapper support.
* util/hostdisk.c (device_is_mapped): New function.
(find_partition_start): New function, partly broken out from
linux_find_partition and grub_util_biosdisk_get_grub_dev but with
device-mapper support added.
(linux_find_partition): Use find_partition_start.
(convert_system_partition_to_system_disk): Add `st' argument.
Support Linux /dev/mapper/* devices if device-mapper support is
available; only DM-RAID devices are understood at present.
(find_system_device): Add `st' argument. Pass it to
convert_system_partition_to_system_disk.
(grub_util_biosdisk_get_grub_dev): Pass stat result to
find_system_device and convert_system_partition_to_system_disk. Use
find_partition_start.
2010-01-25 17:47:51 +00:00
Colin Watson
847effd8bf
2010-01-25 Colin Watson <cjwatson@ubuntu.com>
...
* util/hostdisk.c (open_device): Add trailing newline to debug
message.
2010-01-25 17:04:22 +00:00
Grégoire Sutre
ea4a7e35eb
2010-01-25 Grégoire Sutre <gregoire.sutre@gmail.com>
...
* configure.ac: Check for `limits.h'.
* util/misc.c: Include `<limits.h>' (for PATH_MAX).
2010-01-25 10:06:55 +01:00
Samuel Thibault
c273d4cea9
2010-01-24 Samuel Thibault <samuel.thibault@ens-lyon.org>
...
* util/grub.d/10_hurd.in: Add a recovery mode.
2010-01-24 14:30:10 +01:00
BVK Chaitanya
10523df478
while and until loops support
2010-01-23 11:19:26 +05:30
BVK Chaitanya
4e6a305be4
for loop support to grub script
2010-01-23 11:03:41 +05:30
BVK Chaitanya
547e494f1b
lexer-rewrite rebase commit
2010-01-22 19:07:27 +05:30
Vladimir 'phcoder' Serbinenko
01fc7054b9
2010-01-21 Vladimir Serbinenko <phcoder@gmail.com>
...
* util/misc.c (make_system_path_relative_to_its_root): Fix typo.
2010-01-21 13:58:40 +01:00
Felix Zielcke
67eb14272d
2010-01-20 Felix Zielcke <fzielcke@z-51.de>
...
* util/misc.c (make_system_path_relative_to_its_root): Change the work
around for handling "/" to the correct fix. Fix a memory leak. Use
xstrdup instead of strdup.
2010-01-20 23:53:53 +01:00
Vladimir 'phcoder' Serbinenko
f7fcb23c76
merge mainline into pciclean
2010-01-20 20:40:30 +01:00
Robert Millan
96d73208a1
2010-01-20 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub.d/10_linux.in (linux_entry): Set gfxpayload=keep when it
can be reliably determined to be supported.
2010-01-20 17:01:12 +00:00
Robert Millan
f66924a414
2010-01-20 Robert Millan <rmh.grub@aybabtu.com>
...
* util/misc.c (make_system_path_relative_to_its_root): Work around
special-casing of "/", as previous incarnation of this routine did.
2010-01-20 14:40:00 +00:00
Robert Millan
34a66d995b
2010-01-20 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub.d/00_header.in: Fix stupid mistake from last commit.
2010-01-20 14:10:46 +00:00
Robert Millan
6419c43e4f
Fix indentation in util/grub.d/00_header.in output
2010-01-20 13:56:45 +00:00
Robert Millan
94fabf587a
2010-01-20 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub.d/00_header.in: Fix handling of locale_dir.
2010-01-20 13:55:30 +00:00
Vladimir 'phcoder' Serbinenko
61eb45eee7
Rename asprint into xasprintf and avsprintf into xvasprintf
2010-01-20 09:12:47 +01:00
Vladimir 'phcoder' Serbinenko
2d49abe9e7
merge mainline into asprintf
2010-01-20 07:36:17 +01:00
Colin Watson
917dd37040
2010-01-20 Dan Merillat <debian@dan.merillat.org>
...
* kern/device.c (grub_device_iterate): Allocate new part_ent
structure based on sizeof (*p) rather than sizeof (p->next), to
account for structure padding.
* util/grub-probe.c (probe_raid_level): Return -1 immediately if
disk is NULL, which might happen for LVM physical volumes with no
LVM signature.
2010-01-20 02:11:07 +00:00
Robert Millan
e3538adaea
2009-12-20 Robert Millan <rmh.grub@aybabtu.com>
...
* kern/mips/yeeloong/init.c (grub_video_sm712_init)
(grub_video_video_init, grub_video_bitmap_init)
(grub_font_manager_init, grub_term_gfxterm_init)
(grub_at_keyboard_init): New extern declarations.
(grub_machine_init): Initialize gfxterm and at_keyboard.
* kern/main.c (grub_main): Revert grub_printf delay kludge.
* util/grub-install.in: Revert embed of `at_keyboard.mod' and
`gfxterm.mod' into core image.
* conf/mips.rmk (pkglib_IMAGES, kernel_img_SOURCES)
(kernel_img_CFLAGS, kernel_img_ASFLAGS, kernel_img_LDFLAGS)
(kernel_img_FORMAT): Copy to ...
* conf/mips-qemu-mips.rmk (pkglib_IMAGES, kernel_img_SOURCES)
(kernel_img_CFLAGS, kernel_img_ASFLAGS, kernel_img_LDFLAGS)
(kernel_img_FORMAT): ... here, and ...
* conf/mips-yeeloong.rmk (pkglib_IMAGES, kernel_img_SOURCES)
(kernel_img_CFLAGS, kernel_img_ASFLAGS, kernel_img_LDFLAGS)
(kernel_img_FORMAT): ... here.
(kernel_img_SOURCES): Add files necessary for output (gfxterm)
and input (at_keyboard) terminals in kernel.
(kernel_img_CFLAGS): Add `-DUSE_ASCII_FAILBACK'.
(pkglib_MODULES): Remove `pci.mod'.
(pci_mod_SOURCES, pci_mod_CFLAGS, pci_mod_LDFLAGS)
(sm712_mod_SOURCES, sm712_mod_CFLAGS, sm712_mod_LDFLAGS)
(at_keyboard_mod_SOURCES, at_keyboard_mod_CFLAGS)
(at_keyboard_mod_LDFLAGS): Remove variables.
2010-01-20 01:19:53 +00:00
Robert Millan
ca2a220a74
Resync
2010-01-20 00:47:55 +00:00
Robert Millan
e022a2d667
Sync with trunk
2010-01-18 20:51:35 +00:00
Robert Millan
3d8b4e4e26
Resync with trunk
2010-01-18 19:34:26 +00:00
Vladimir 'phcoder' Serbinenko
b6aa46f5f5
merge gfxmenu into gfxmenu+multiterm
2010-01-18 16:38:13 +01:00
BVK Chaitanya
2997c41ffd
update copyright year
2010-01-18 16:58:31 +05:30
BVK Chaitanya
d8d4217e3c
merge trunk
2010-01-18 16:58:03 +05:30
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
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
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
Robert Millan
885d1a8d90
Support --help and --version in grub-bin2h.
2010-01-14 20:33:10 +00:00
Colin Watson
7d1468e4b6
merge from trunk
2010-01-14 14:04:44 +00: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
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
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
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
85a2cf749f
merge mainline into mips
2010-01-10 13:34:48 +01: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