Vladimir 'phcoder' Serbinenko
0e8489094a
mainstream merged into pci
2009-11-25 15:15:30 +01:00
Felix Zielcke
34c67f1f1c
Merge upstream
2009-11-25 14:37:27 +01:00
Yves Blusseau
6717926e6e
2009-11-25 Yves Blusseau <yves.blusseau@zetam.org>
...
* configure.ac: move the call to AM_GNU_GETTEXT to avoid warnings when
aclocal is run.
2009-11-25 12:23:16 +01:00
Robert Millan
08806a54c5
2009-11-25 Robert Millan <rmh.grub@aybabtu.com>
...
* normal/main.c (grub_normal_read_line): Fix off-by-one
buffer overflow..
2009-11-25 03:48:33 +00:00
Robert Millan
3956deed5c
Merge upstream trunk.
2009-11-25 01:54:19 +00:00
Robert Millan
1eaa5c3ae0
* Add gettext to Build-Depends and gettext-base to grub-common's
...
Depends.
2009-11-25 01:51:28 +00:00
Robert Millan
13b33fba6f
2009-11-25 Robert Millan <rmh.grub@aybabtu.com>
...
* normal/main.c (grub_normal_execute): Replace "parser.sh" with
"parser.grub" in grub_command_execute() call.
2009-11-25 01:50:33 +00:00
Carles Pina i Estany
4a8572e9d8
2009-11-24 Carles Pina i Estany <carles@pina.cat>
...
* conf/i386-coreboot.rmk (kernel_img_HEADERS): Add i18n.h.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/i386-pc.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* gettext/gettex.c: Include <grub/i18n.h>.
* include/grub/misc.h (grub_gettext_dummy, grub_gettext): Move from
here ...
* include/grub/i18n.h: ... to here
* include/grub/i18n.h: ... to here.
* kern/misc.c: Include <grub/i18n.h>
(grub_gettext_dummy): Move above user.
2009-11-24 21:42:14 +00:00
Felix Zielcke
92e37a2b52
releasing version 1.97+20091124-1
2009-11-24 21:48:02 +01:00
Felix Zielcke
d81ca840f4
Merge trunk
2009-11-24 21:04:42 +01:00
Felix Zielcke
bee48093d6
2009-11-24 Felix Zielcke <fzielcke@z-51.de>
...
* util/Makefile.in (install-local): Convert a `for' into a normal
shell expansion.
2009-11-24 21:01:40 +01:00
Felix Zielcke
d17fb2dcfc
Add a dependency on 'dpkg (>= 1.15.4) | install-info' for grub-common
...
as recommended by Policy and lintian.
2009-11-24 20:53:32 +01:00
Robert Millan
a031e91cf8
2009-11-24 Robert Millan <rmh.grub@aybabtu.com>
...
* autogen.sh: Add automake call.
* config.guess: Remove.
* config.sub: Likewise.
* install-sh: Likewise.
2009-11-24 18:51:35 +00:00
Felix Zielcke
e4adc51d0a
Merge upstream
2009-11-24 19:47:13 +01:00
Felix Zielcke
05dacf2e8f
Ship the locale files in grub-common.
2009-11-24 19:46:03 +01:00
Felix Zielcke
26bec39d67
2009-11-24 Felix Zielcke <fzielcke@z-51.de>
...
* util/Makefile.in (install-local): Fix the use of $lang shell variable.
2009-11-24 19:44:24 +01:00
Felix Zielcke
57998f0c3c
Merge trunk
2009-11-24 18:49:42 +01:00
Felix Zielcke
8e2532fd0f
2009-11-24 Felix Zielcke <fzielcke@z-51.de>
...
* util/Makefile.in (install-local): Convert a make `$(foreach)'
function to a normal shell `for'.
2009-11-24 18:43:46 +01:00
Felix Zielcke
fb614b6ed8
Merge upstream
2009-11-24 15:57:15 +01:00
Felix Zielcke
fefa1b7deb
2009-11-24 Felix Zielcke <fzielcke@z-51.de>
...
* conf/i386-coreboot.rmk (grub_mkimage_SOURCES): Add `gnulib/progname.c'.
2009-11-24 15:47:48 +01:00
Felix Zielcke
1a7959404c
Merge upstream
2009-11-24 15:11:05 +01:00
Felix Zielcke
c793884a38
Ship grub-mkrelpath in grub-common.
2009-11-24 15:09:42 +01:00
Felix Zielcke
80f740932f
rules: grub-emu is now built as a port.
2009-11-24 15:08:13 +01:00
Felix Zielcke
4501250b6c
2009-11-24 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub-mkrelpath.c: New file.
* conf/common.rmk (bin_UTILITIES): Add grub-mkrelpath.
(grub_mkrelpath_SOURCES): New variable.
* include/grub/util/misc.h: New function prototype.
* util/misc.c (make_system_path_relative_to_its_root): New function.
* util/grub-mkconfig_lib.in (bindir): New variable.
(grub_mkrelpath): Likewise.
(make_system_path_relative_to_its_root): Use grub-mkrelpath.
* util/probe.c (probe): Make the file path relative to its root.
Change a info message to use the GRUB path. Enable again the
check if we can read the file with GRUB facilities.
* util/i386/pc/grub-setup.c (setup): Make core.img path relative
to its root.
2009-11-24 15:00:25 +01:00
Felix Zielcke
0f9d533d44
Fix duplicated changelog entry
2009-11-24 13:56:13 +01:00
Felix Zielcke
972ee9e7bc
* Set TARGET_CC= to really use gcc-4.4 everywhere. Also pass it and CC
...
as arguments to ./configure instead of env vars so they get
preserved.
* Set TARGET_CC=$(CC) to really use gcc-4.4 everywhere. Also pass it
and CC as arguments to ./configure instead of env vars so they get
preserved.
2009-11-24 13:55:33 +01:00
Felix Zielcke
11d9778b86
2009-11-24 Felix Zielcke <fzielcke@z-51.de>
...
* Makefile.in: Don't include GRUB_CONTRIB makefiles with emu
platform.
2009-11-24 12:29:17 +01:00
Robert Millan
8725ccaad0
2009-11-24 Robert Millan <rmh.grub@aybabtu.com>
...
* zh_CN.po: New file.
* LINGUAS: Add `zh_CN'.
2009-11-24 10:49:49 +00:00
Robert Millan
285cd7ddd5
Move ChangeLog entries affecting po/ directory to po/ChangeLog
2009-11-24 10:45:26 +00:00
Felix Zielcke
4465287d1b
2009-11-24 Felix Zielcke <fzielcke@z-51.de>
...
* util/getroot.c (grub_util_get_dev_abstraction): Properly use
strncmp().
2009-11-24 09:55:28 +01:00
Felix Zielcke
6a71e6cb40
add a missing comma in control
2009-11-24 09:41:44 +01:00
Felix Zielcke
381d196e93
Add a build dependency on automake and python.
2009-11-24 09:36:57 +01:00
Felix Zielcke
9c5635196a
Add a missing ) in patches/903_grub_legacy_0_based_partitions.diff
2009-11-24 09:34:50 +01:00
Felix Zielcke
3d4dba4304
patches/903_grub_legacy_0_based_partitions.diff: Update.
2009-11-24 09:03:19 +01:00
Felix Zielcke
1e3ad09a1f
s/fake devices/fake GRUB devices
2009-11-24 08:36:21 +01:00
Felix Zielcke
87257e14da
Create fake devices for devices not listed in device.map.
...
This also makes dmraid and multipath work as long as
search --fs-uuid works. (Closes : #442382 , #540549 , LP: #392136 )
2009-11-24 08:29:49 +01:00
Felix Zielcke
c4a934e450
Merge upstream
2009-11-24 08:29:10 +01:00
Felix Zielcke
62b47f220a
2009-11-24 Felix Zielcke <fzielcke@z-51.de>
...
* util/getroot.c (grub_util_is_dmraid): New function.
(grub_util_get_dev_abstraction): Treat dmraid and multipath
devices as normal ones, not as LVM.
2009-11-24 08:20:48 +01:00
Vladimir 'phcoder' Serbinenko
947fa16c8b
Important speedup by not redrawing too much
2009-11-24 07:17:18 +01:00
Vladimir 'phcoder' Serbinenko
4545f150f3
Various cleanups
2009-11-24 05:02:30 +01:00
Vladimir 'phcoder' Serbinenko
93fd2dd809
Optimise gfxterm in gfxmenu by avoiding indirect repainting
2009-11-24 04:22:22 +01:00
Vladimir 'phcoder' Serbinenko
8f41eb5582
Use return instead of exit () in gentrigtables.c
2009-11-24 04:21:07 +01:00
Vladimir 'phcoder' Serbinenko
a9c12f8533
Remove hardcoded hotkeys
2009-11-24 04:20:18 +01:00
Vladimir 'phcoder' Serbinenko
a5c894bcd9
Enable gfxmenu on grub-emu
2009-11-24 04:19:33 +01:00
Vladimir 'phcoder' Serbinenko
59f746dc5f
merged mainstream into crypto
2009-11-24 02:54:35 +01:00
Vladimir 'phcoder' Serbinenko
3dcf83ba7d
merged mainstream into gfxmenu
2009-11-24 01:22:41 +01:00
Robert Millan
662290ce76
2009-11-23 Robert Millan <rmh.grub@aybabtu.com>
...
* po/id.po: New file.
* LINGUAS: Add `id'.
2009-11-23 22:41:37 +00:00
Carles Pina i Estany
1eafb9b92b
* Fixes date in the ChangeLog entry
2009-11-23 21:29:39 +00:00
Carles Pina i Estany
e44249de6d
2009-11-22 Carles Pina i Estany <carles@pina.cat>
...
* conf/common.rmk: Add grub-gettext_lib target and updates
lib_DATA and CLEANFILES. Adds gettext.mod SOURCES, CFLAGS,
LDFLAGS.
* gettext/gettext.c: New file. (Reads mo files).
* include/grub/file.h (grub_file_pread): New prototype.
* include/grub/i18n.h (_): New prototype.
* include/grub/misc.h (grub_gettext_dummy, grub_gettext): New
prototypes.
* kern/misc.c (grub_gettext_dummy): New function.
* normal/menu_text.c: Include <grub/i18n.h>.
* normal/menu_text.c (print_timeout): Gettexttize string.
* normal/menu_text.c (print_message): Gettexttize string.
* po/POTFILES: Add `normal/menu_text.c'.
* po/ca.po: Add new translations.
* util/grub.d/00_header.in: Define locale_dir and lang. insmod
gettext module and defines locale_dir and lang in grub.cfg.
* NEWS: Add gettext support.
2009-11-23 21:14:30 +00:00
Carles Pina i Estany
c3ea6bd466
Final touches before merging
2009-11-23 20:59:24 +00:00