vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of git.sv.gnu.org:/srv/git/grub

Browse source
This commit is contained in:
Vladimir Serbinenko 2013-12-23 18:17:29 +01:00
commit 72f099578e
7 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ChangeLog
View file

@ -1,3 +1,26 @@
2013-12-23 Colin Watson <cjwatson@debian.org>
Update some documentation to refer to Git rather than Bazaar.
* docs/grub.texi (Obtaining and Building GRUB): Refer to Git rather
than Bazaar.
* po/README: Likewise. Fix spelling mistake.
2013-12-23 Colin Watson <cjwatson@ubuntu.com>
Don't distribute config.h.
* Makefile.am (platform_HEADERS): Move to ...
(nodist_platform_HEADERS): ... here. Fixes gettext_strings_test
failure when building from a distributed tarball.
2013-12-23 Colin Watson <cjwatson@ubuntu.com>
* configure.ac: Fix spelling.
* grub-core/commands/parttool.c: Fix grammar.
* grub-core/disk/ldm.c: Use consistent capitalisation for "LDM
Embedding Partition".
2013-12-23 Vladimir Serbinenko <phcoder@gmail.com> 2013-12-23 Vladimir Serbinenko <phcoder@gmail.com>
ARM64 support for grub-mkrescue. ARM64 support for grub-mkrescue.

2
Makefile.am
View file

@ -127,7 +127,7 @@ widthspec.h: $(FONT_SOURCE) build-grub-gen-widthspec
CLEANFILES += widthspec.h CLEANFILES += widthspec.h
# Install config.h into platformdir # Install config.h into platformdir
platform_HEADERS = config.h nodist_platform_HEADERS = config.h
pkgdata_DATA += grub-mkconfig_lib pkgdata_DATA += grub-mkconfig_lib

4
configure.ac
View file

@ -1168,7 +1168,7 @@ enable_grub_emu_usb=no
fi fi
if test x"$enable_grub_emu_sdl" = xno ; then if test x"$enable_grub_emu_sdl" = xno ; then
grub_emu_sdl_excuse="explicitely disabled" grub_emu_sdl_excuse="explicitly disabled"
fi fi
[if [ x"$grub_emu_sdl_excuse" = x ]; then [if [ x"$grub_emu_sdl_excuse" = x ]; then
# Check for libSDL libraries.] # Check for libSDL libraries.]
@ -1184,7 +1184,7 @@ AC_CHECK_LIB([SDL], [SDL_Init], [LIBSDL="-lSDL"],
[fi] [fi]
if test x"enable_grub_emu_sdl" = xyes && test x"$grub_emu_sdl_excuse" != x ; then if test x"enable_grub_emu_sdl" = xyes && test x"$grub_emu_sdl_excuse" != x ; then
AC_MSG_ERROR([SDL support for grub-emu was explicitely requested but can't be compiled ($grub_emu_sdl_excuse)]) AC_MSG_ERROR([SDL support for grub-emu was explicitly requested but can't be compiled ($grub_emu_sdl_excuse)])
fi fi
if test x"$grub_emu_sdl_excuse" = x ; then if test x"$grub_emu_sdl_excuse" = x ; then
enable_grub_emu_sdl=yes enable_grub_emu_sdl=yes

2
docs/grub.texi
View file

@ -6385,7 +6385,7 @@ just do:
@end group @end group
@end example @end example
Also, the latest version is available using Bazaar. See Also, the latest version is available using Git. See
@uref{http://www.gnu.org/software/grub/grub-download.html} for more @uref{http://www.gnu.org/software/grub/grub-download.html} for more
information. information.

2
grub-core/commands/parttool.c
View file

@ -133,7 +133,7 @@ show_help (grub_device_t dev)
} }
} }
if (! found) if (! found)
grub_printf_ (N_("Sorry no parttool is available for %s\n"), grub_printf_ (N_("Sorry, no parttool is available for %s\n"),
dev->disk->partition->partmap->name); dev->disk->partition->partmap->name);
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }

2
grub-core/disk/ldm.c
View file

@ -1012,7 +1012,7 @@ grub_util_ldm_embed (struct grub_disk *disk, unsigned int *nsectors,
usable for bootloaders (called generically usable for bootloaders (called generically
"embedding zone") and this operation is "embedding zone") and this operation is
called "embedding". */ called "embedding". */
N_("your LDM embedding Partition is too small;" N_("your LDM Embedding Partition is too small;"
" embedding won't be possible")); " embedding won't be possible"));
*nsectors = lv->size; *nsectors = lv->size;
if (*nsectors > max_nsectors) if (*nsectors > max_nsectors)

6
po/README
View file

@ -1,6 +1,6 @@
If you checked out this source tree directly from GRUB Bazaar, you might If you checked out this source tree directly from GRUB Git, you might be
be wondering where are the POT and PO files. Here are some instructions wondering where are the POT and PO files. Here are some instructions
that will hopefully clarify the situation. that will hopefully clarify the situation.
- If you're a user or a distributor, simply fill the po directory by - If you're a user or a distributor, simply fill the po directory by
@ -16,7 +16,7 @@ that will hopefully clarify the situation.
(http://translationproject.org/). The GRUB project doesn't interact (http://translationproject.org/). The GRUB project doesn't interact
with translators directly (but we dearly appreciate your work!). with translators directly (but we dearly appreciate your work!).
- If you're a developer adding/removing/modifiing translatable strings, - If you're a developer adding/removing/modifying translatable strings,
you can check that these turn into a sane POT file by using the you can check that these turn into a sane POT file by using the
`po/grub.pot' make rule. `po/grub.pot' make rule.