Commit Graph

6719 Commits

Author SHA1 Message Date
robertmh
5c90cdd262 date fix 2009-08-30 15:08:50 +00:00
fzielcke-guest
9ca9101271 * Asturian (ast.po) by Marcos.
* Georgian (ka.po) by Aiet Kolkhi.
2009-08-30 14:10:26 +00:00
fzielcke-guest
34e32c2860 Change po/POTFILES.in to use grub-pc.templates.in and templates.in
Run debconf-updatepo again in clean target
Run debconf-updatepo
2009-08-30 13:07:34 +00:00
fzielcke-guest
c0fff914e0 change a wrong fi' in debian/rules 2009-08-30 12:46:56 +00:00
rmh
3af6971c6f Fix a pair of problems introduced in my last commits 2009-08-30 12:39:29 +00:00
rmh
3166d82e75 Fix syntax error 2009-08-30 12:33:03 +00:00
rmh
dd66f732fa Disable Linux-specific strings on GNU/kFreeBSD. Enable translations in grub2/linux_cmdline_default. Add grub2/kfreebsd_* strings (still unused). 2009-08-30 12:32:25 +00:00
phcoder
965632c10f snow32 support. 2009-08-30 14:26:41 +02:00
rmh
642638e001 Merge postinst, postrm, templates, dirs, config and install from grub-pc. 2009-08-30 12:23:50 +00:00
rmh
1bc87b905e * Merge config, templates, postinst, postrm, dirs and install files
into a single source.
2009-08-30 11:51:21 +00:00
fzielcke-guest
0197f13a80 German (de.po) by Helge Kreutzmann. (Closes: #544261) 2009-08-30 07:41:22 +00:00
fzielcke-guest
a3947b4959 releasing version 1.96+20090829-1 2009-08-29 16:45:45 +00:00
fzielcke-guest
55526a5584 fix the sed expression in merge_debconf_into_conf() in *.postinst 2009-08-29 15:24:49 +00:00
fzielcke-guest
36a14bfa1d Read in /etc/default/grub in *.config files. 2009-08-29 15:01:24 +00:00
fzielcke-guest
26f27249ad * Italian (it.po) by Luca Monducci. (Closes: #544200)
* Factorise the editing of the temporary file. Thanks to Martin F
  Krafft.
2009-08-29 14:56:40 +00:00
fzielcke-guest
b6e3586c9f revert r1462 2009-08-29 14:48:46 +00:00
fzielcke-guest
ca97a15f08 releasing version 1.96+20090829-1 2009-08-29 14:17:46 +00:00
fzielcke-guest
bf071946f9 remove empty lines at the end of grub-pc.templates 2009-08-29 14:17:06 +00:00
fzielcke-guest
e92a5632f1 Revert the whole change to handle GRUB_CMDLINE_LINUX{,DEFAULT}
with debconf. Ucf doestn't seem to work well with it and that upload
was meant to go to experimental not unstable.
2009-08-29 13:52:15 +00:00
fzielcke-guest
77e5f5623b * Check that GRUB_CMDLINE_LINUX and GRUB_CMDLINUX_LINUX_DEFAULT is at
the start of line in *.postinst.
* Don't check that $GRUB_CMDLINE_LINUX{,DEFAULT} are non zero in
  grub-pc.config.
* Add empty GRUB_CMDLINE_LINUX to /usr/share/grub/default/grub.
2009-08-29 13:12:24 +00:00
fzielcke-guest
d87705a6da Add empty GRUB_CMDLINE_LINUX to /usr/share/grub/default/grub. 2009-08-29 12:58:24 +00:00
phcoder
64bf71d0b1 2009-08-28 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/i386/xnu.h: Add license header.
	include grub/err.h explicitly.
2009-08-29 12:57:38 +00:00
fzielcke-guest
f601b7fc77 Don't check that {,DEFAULT} are non zero in grub-pc.config. 2009-08-29 12:33:45 +00:00
fzielcke-guest
e14f1fb890 * Remove also efiemu files from /boot/grun on purge if requested.
* Russian (ru.po) by Yuri Kozlov. (Closes: #544077)
* Check that GRUB_CMDLINE_LINUX and GRUB_CMDLINUX_LINUX_DEFAULT is at
  the start of line in *.postinst.
2009-08-29 11:42:38 +00:00
rmh
6ae9517a58 * New SVN snapshot.
- Fix filesystem mapping on GNU/kFreeBSD.  (Closes: #543950)
2009-08-29 00:45:36 +00:00
robertmh
c90edae43a 2009-08-29 Robert Millan <rmh.grub@aybabtu.com>
* util/grub.d/10_freebsd.in: Detect `ufs1' and `ufs2' and map them
        to `ufs' in the vfs.root.mountfrom kernel parameter.
2009-08-29 00:34:33 +00:00
robertmh
d8888b5cb4 2009-08-29 Robert Millan <rmh.grub@aybabtu.com>
* term/i386/pc/serial.c: Include `<grub/machine/memory.h>'.

        [GRUB_MACHINE_PCBIOS] (serial_hw_io_addr): Macroify initialization
        value (0x0400 -> GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR).

        [! GRUB_MACHINE_PCBIOS] (GRUB_SERIAL_PORT_NUM): Calculate using
        `ARRAY_SIZE' macro.
2009-08-29 00:24:32 +00:00
phcoder
74f391dded Changelog 2009-08-28 21:17:23 +02:00
phcoder
49ffc6c627 finished merge 2009-08-28 20:59:54 +02:00
phcoder
42b29c0fab Merge branch 'usb' into utf2 2009-08-28 20:59:09 +02:00
phcoder
b8dae8de40 utf16_to_utf8 2009-08-28 20:58:50 +02:00
phcoder
fd4370fc33 Move grub_usb_get_string. 2009-08-28 20:09:44 +02:00
phcoder
6f07b921bc 2009-08-28 Vladimir Serbinenko <phcoder@gmail.com>
* kern/file.c (grub_file_read): Check offset.
	* fs/hfs.c (grub_hfs_read_file): Remove unnecessary offset check.
	* fs/jfs.c (grub_jfs_read_file): Likewise.
	* fs/ntfs.c (grub_ntfs_read): Likewise.
	* fs/reiserfs.c (grub_reiserfs_read): Likewise.
	* fs/minix.c (grub_minix_read_file): Correct offset check.
	* fs/ufs.c (grub_ufs_read_file): Likewise.
2009-08-28 16:29:34 +00:00
fzielcke-guest
21fd369b9d Remove also efiemu files from /boot/grun on purge if requested. 2009-08-28 15:47:45 +00:00
fzielcke-guest
897109ba44 * New SVN snapshot.
* New grub-extras SVN snapshot.
  - Add 915resolution support to the GMA500 (poulsbo) graphics chipset.
    Thanks to Pedro Bulach Gapski. (Closes: #543917)
2009-08-28 14:53:52 +00:00
cjwatson
b4f34077c8 2009-08-28 Colin Watson <cjwatson@ubuntu.com>
* term/i386/pc/console.c (bios_data_area): Cast
	GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR explicitly.
2009-08-28 14:10:02 +00:00
phcoder
e7c69859a2 2009-08-28 Vladimir Serbinenko <phcoder@gmail.com>
1-bit optimised blitters.

	* include/grub/fbblit.h (grub_video_fbblit_replace_32bit_1bit): New
	prototype.
	(grub_video_fbblit_replace_24bit_1bit): Likewise.
	(grub_video_fbblit_replace_16bit_1bit): Likewise.
	(grub_video_fbblit_replace_8bit_1bit): Likewise.
	(grub_video_fbblit_blend_XXXA8888_1bit): Likewise.
	(grub_video_fbblit_blend_XXX888_1bit): Likewise.
	(grub_video_fbblit_blend_XXX565_1bit): Likewise.
	* video/fb/fbblit.c (grub_video_fbblit_replace_32bit_1bit): New
	function.
	(grub_video_fbblit_replace_24bit_1bit): Likewise.
	(grub_video_fbblit_replace_16bit_1bit): Likewise.
	(grub_video_fbblit_replace_8bit_1bit): Likewise.
	(grub_video_fbblit_blend_XXXA8888_1bit): Likewise.
	(grub_video_fbblit_blend_XXX888_1bit): Likewise.
	(grub_video_fbblit_blend_XXX565_1bit): Likewise.
	* video/fb/video_fb.c (common_blitter): Use 1-bit optimised blitters
	when possible.
	* video/video.c (grub_video_get_blit_format): Return
	GRUB_VIDEO_BLIT_FORMAT_1BIT_PACKED if bpp = 1.
2009-08-28 13:54:20 +00:00
cjwatson
a57da43f0d 2009-08-28 Colin Watson <cjwatson@ubuntu.com>
* normal/cmdline.c (grub_cmdline_get): Supply a format string as
	the first argument to grub_printf.
2009-08-28 13:25:10 +00:00
cjwatson
4cbe67e509 2009-08-28 Colin Watson <cjwatson@ubuntu.com>
2009-08-28  Robert Millan  <rmh.grub@aybabtu.com>

	Add `getkeystatus' terminal method.  Add a new `keystatus' command
	to query it.

	* include/grub/term.h (GRUB_TERM_STATUS_SHIFT,
	GRUB_TERM_STATUS_CTRL, GRUB_TERM_STATUS_ALT): Definitions for
	modifier key bitmasks.
	(struct grub_term_input): Add `getkeystatus' member.
	(grub_getkeystatus): Add prototype.
	* kern/term.c (grub_getkeystatus): New function.

	* include/grub/i386/pc/memory.h
	(GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR): New macro.
	(struct grub_machine_bios_data_area): Define necessary parts of BIOS
	Data Area layout.
	* term/i386/pc/console.c (grub_console_getkeystatus): New function.
	(grub_console_term_input): Set `getkeystatus' member.
	* term/usb_keyboard.c (grub_usb_hid): Macroify HID protocol
	constants.
	(grub_usb_keyboard_getreport): Likewise.
	(grub_usb_keyboard_checkkey): Likewise.
	(grub_usb_keyboard_getkeystatus): New function.
	(grub_usb_keyboard_term): Set `getkeystatus' member.

	* commands/keystatus.c: New file.
	* conf/common.rmk (pkglib_MODULES): Add keystatus.mod.
	(keystatus_mod_SOURCES): New variable.
	(keystatus_mod_CFLAGS): Likewise.
	(keystatus_mod_LDFLAGS): Likewise.
	* conf/i386-coreboot.rmk (grub_emu_SOURCES): Add
	commands/keystatus.c.
	* conf/i386-efi.rmk (grub_emu_SOURCES): Likewise.
	* conf/i386-ieee1275.rmk (grub_emu_SOURCES): Likewise.
	* conf/i386-pc.rmk (grub_emu_SOURCES): Likewise.
	* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.
	* conf/sparc64-ieee1275.rmk (grub_emu_SOURCES): Likewise.
	* conf/x86_64-efi.rmk (grub_emu_SOURCES): Likewise.
	* DISTLIST: Add commands/keystatus.c.
2009-08-28 13:20:34 +00:00
phcoder
6e2a90859a 2009-08-28 Vladimir Serbinenko <phcoder@gmail.com>
Split befs.mod and afs.mod into *_be.mod and *.mod

	* conf/common.rmk (grub_probe_SOURCES): Add afs_be.c and befs_be.c.
	(grub_fstest_SOURCES): Likewise.
	(pkglib_MODULES): Add afs_be.mod and befs_be.mod.
	(afs_be_mod_SOURCES): New variable.
	(afs_be_mod_CFLAGS): Likewise.
	(afs_be_mod_LDFLAGS): Likewise.
	(befs_be_mod_SOURCES): Likewise.
	(befs_be_mod_CFLAGS): Likewise.
	(befs_be_mod_LDFLAGS): Likewise.
	* conf/i386-coreboot.rmk (grub_emu_SOURCES): Add afs_be.c and befs_be.c.
	* conf/i386-efi.rmk (grub_emu_SOURCES): Likewise.
	* conf/i386-ieee1275.rmk (grub_emu_SOURCES): Likewise.
	* conf/i386-pc.rmk (grub_setup_SOURCES): Likewise.
	(grub_emu_SOURCES): Likewise.
	* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.
	* conf/sparc64-ieee1275.rmk (grub_emu_SOURCES): Likewise.
	* conf/x86_64-efi.rmk (grub_emu_SOURCES): Likewise.
	* fs/afs_be.c: New file.
	* fs/befs_be.c: New file.
	* fs/afs.c (GRUB_AFS_FSNAME_SUFFIX): New definition.
	(GRUB_AFS_FSNAME): Use GRUB_AFS_FSNAME_SUFFIX.
	(U16): Replaced with ...
	(grub_afs_to_cpu16): ...this. All users updated.
	(U32): Replaced with ...
	(grub_afs_to_cpu32): ...this. All users updated.
	(U64): Replaced with ...
	(grub_afs_to_cpu64): ...this. All users updated.
	(GRUB_AFS_BO_LITTLE_ENDIAN): Remove.
	(GRUB_AFS_BO_BIG_ENDIAN): Likewise.
	(grub_afs_validate_sblock): Check only one endiannness.
	(GRUB_MOD_INIT (befs)) [MODE_BIGENDIAN && MODE_BFS]: Rename to ..
	(GRUB_MOD_INIT (befs_be)) [MODE_BIGENDIAN && MODE_BFS]: ... this.
	(GRUB_MOD_INIT (afs)) [MODE_BIGENDIAN && !MODE_BFS]: Rename to ..
	(GRUB_MOD_INIT (afs_be)) [MODE_BIGENDIAN && !MODE_BFS]: ... this.
	(GRUB_MOD_FINI (befs)) [MODE_BIGENDIAN && MODE_BFS]: Rename to ..
	(GRUB_MOD_FINI (befs_be)) [MODE_BIGENDIAN && MODE_BFS]: ... this.
	(GRUB_MOD_FINI (afs)) [MODE_BIGENDIAN && !MODE_BFS]: Rename to ..
	(GRUB_MOD_FINI (afs_be)) [MODE_BIGENDIAN && !MODE_BFS]: ... this.
2009-08-28 13:01:26 +00:00
fzielcke-guest
7b097b4f2c French (fr.po) by Christian Perrier. (Closes: #544023) 2009-08-28 09:49:26 +00:00
fzielcke-guest
d8db2303aa Use `cp -p' to copy /usr/share/grub/default/grub to the temporary
file to preverse permissions.
2009-08-27 19:55:54 +00:00
fzielcke-guest
f602715433 Add missing quotes in grub-pc.config and *.postinst. 2009-08-26 17:14:51 +00:00
bean
32a716555d 2009-08-26 Bean <bean123ch@gmail.com>
* fs/xfs.c (GRUB_XFS_INO_INOINAG): Replace 1L with 1LL to support
	64-bit number.
	(GRUB_XFS_FSB_TO_BLOCK): Likewise.
	(grub_xfs_inode_block): Change return type to grub_uint64_t.
	(grub_xfs_read_inode): Change type of block to grub_uint64_t.
2009-08-26 14:17:34 +00:00
fzielcke-guest
247a2ce2ab forgot to commit grub-pc.config changes 2009-08-26 12:17:27 +00:00
fzielcke-guest
3fc74d391d releasing version 1.96+20090826-2 2009-08-26 12:11:23 +00:00
fzielcke-guest
c3c9d42989 releasing version 1.96+20090826-1 2009-08-26 09:00:59 +00:00
fzielcke-guest
a41284d13e Use the right templates in grub-pc.config. (Closes: #543615) 2009-08-26 08:49:23 +00:00
phcoder
552bf6c568 2009-08-25 Vladimir Serbinenko <phcoder@gmail.com>
NetBSD memory map support.

	* include/grub/i386/bsd.h (NETBSD_BTINFO_MEMMAP): New definition.
	(grub_netbsd_btinfo_mmap_header): New structure.
	(grub_netbsd_btinfo_mmap_entry): Likewise.
	* loader/i386/bsd.c (grub_netbsd_boot): Pass memory map.
2009-08-26 00:32:57 +00:00
phcoder
1ae2078cd8 2009-08-25 Vladimir Serbinenko <phcoder@gmail.com>
Enable bsd.mod on coreboot.

	* conf/i386-coreboot.rmk (pkglib_MODULES): Add bsd.mod.
	(bsd_mod_SOURCES): New variable.
	(bsd_mod_CFLAGS): Likewise.
	(bsd_mod_LDFLAGS): Likewise.
	(bsd_mod_ASFLAGS): Likewise.
	* loader/i386/bsd.c [!GRUB_MACHINE_PCBIOS]: Fix includes.
	(grub_bsd_get_device) [!GRUB_MACHINE_PCBIOS]: Set *biosdev to 0xff.
2009-08-25 23:18:48 +00:00