Andrey Borzenkov
5ae584c0b0
fix Mingw W64-32 cross compile failure due to printf redefinition in libintl.h
...
In file included from util/misc.c:36:0:
./include/grub/emu/misc.h:56:1: error: 'libintl_printf' is an unrecognized format function type [-Werror=format=]
char * EXPORT_FUNC(xasprintf) (const char *fmt, ...) __attribute__ ((format (printf, 1, 2))) WARN_UNUSED_RESULT;
^
./include/grub/emu/misc.h:58:1: error: 'libintl_printf' is an unrecognized format function type [-Werror=format=]
The reason is libintl.h which redefines printf as libintl_printf. The problem
is not present in native MinGW build which avoids redefinition. Use
(format (__printf__) instead which is valid replacement in GCC.
v2: add grub-core/lib/libgcrypt/src/g10lib.h
v3: modify g10lib.h during import
2014-01-25 21:49:41 +04:00
Andrey Borzenkov
1440b7ebae
do not set default prefix in grub-mkimage
...
Default prefix is likely wrong on Unix and completely wrong on Windows.
Let caller set it explicitly to avoid any ambiguity.
2014-01-25 19:54:51 +04:00
Vladimir Serbinenko
61c8482b20
Fix several translatable strings.
...
Suggested by: D. Prévot.
2014-01-24 18:20:27 +01:00
Vladimir Serbinenko
95cd131ea0
* util/grub-install.c: List available targets.
2014-01-24 18:09:25 +01:00
Colin Watson
d08059309f
* util/grub-install.c (write_to_disk): Add an info message.
2014-01-23 12:05:36 +00:00
Vladimir Serbinenko
b204b718cc
* util/grub-install.c: Fix a typo.
2014-01-18 20:02:51 +01:00
Vladimir Serbinenko
ae80f31270
* util/grub-mount.c: Extend GCC warning workaround to grub-mount.
2014-01-18 16:43:29 +01:00
Colin Watson
ff66b8e7d8
Prefer more portable test(1) constructs
...
* util/grub.d/00_header.in (make_timeout): Use && rather than test
-a.
* util/grub.d/10_windows.in: Likewise.
* util/grub.d/10_netbsd.in (netbsd_load_fs_module): Use || rather
than test -o.
* util/grub.d/30_os-prober.in: Use && rather than test -a, and ||
rather than test -o.
2014-01-17 15:29:43 +00:00
Andrey Borzenkov
0776112c53
add part_apple to EFI rescue image to fix missing prefix
...
On Mac rescue image is booted from HFS+ partition, so bootpath looks like
/ACPI(a0341d0,0)/PCI(1,1f)/ATAPI(0,0,0)/HD(3,5d1,ca3,0000000000000000,20,0)/EndEntire
grub fails to find device for this path because it cannot scan partition
table. The simplest fix is to add part_apple by default.
2014-01-12 15:29:21 +04:00
Andrey Borzenkov
e7cfa8d5e1
Change grub-mkrescue to use bootaa64.efi too
...
Also add ChangeLog entry for previous change.
2014-01-07 20:34:25 +04:00
Andrey Borzenkov
c9e839e2ca
use {grub,boot}aa64.efi for boot images on AArch64
...
According to UEFI 2.4 specification, default boot file name on AArch64
is BOOTAA64.EFI (3.4.1.1 Removable Media Boot Behavior). Also set default
GRUB image name to grubaa64.efi to match it.
2014-01-07 10:38:54 +04:00
Andrey Borzenkov
46f8d358ef
* util/grub-probe.c: Improve help message and simplify list handling.
2013-12-24 20:30:16 +01:00
Vladimir Serbinenko
faf4a65e1e
Revert grub-file usage in grub-mkconfig.
2013-12-24 17:47:27 +01:00
Andrey Borzenkov
569766e49b
* util/grub.d/00_header.in: Improve compatibility with old config.
2013-12-24 17:26:05 +01:00
Vladimir Serbinenko
e88f0420b9
Make grub_util_devmapper_part_to_disk and grub_util_find_partition_start
...
follow the same algorithm to avoid method mismatch. Don't assume
DMRAID- UUID to mean full disk but instead check that mapping is linear.
2013-12-24 14:16:57 +01:00
Vladimir Serbinenko
808e97c4e7
ARM64 support for grub-mkrescue.
2013-12-23 18:17:09 +01:00
Vladimir Serbinenko
e388db904c
Install modinfo.sh to keep build information around.
2013-12-23 18:17:09 +01:00
Vladimir Serbinenko
a4d610026f
ARM64 grub-file and grub-mkconfig support.
2013-12-23 18:17:09 +01:00
Andrey Borzenkov
77ec462a56
grub-mkconfig: fix Xen platform conditions
2013-12-22 23:47:26 +04:00
Andrey Borzenkov
3bf2db8959
split grub-mkresecue help text to facilitate translations
...
Split single string in help message into several strings used before in shell
grub-mkrescue to minimize changes to existing translations.
Reported by Benno Schulenberg
2013-12-22 22:51:54 +04:00
Lars Wendler
3deedfc033
* util/grub-mkconfig.in: Skip non-executable files.
2013-12-22 16:38:28 +01:00
Vladimir Serbinenko
ca3e20886e
Build fixes for argp.h with older gcc.
2013-12-21 18:08:25 +01:00
Vladimir Serbinenko
27db1a9b64
* util/grub-glue-efi.c: Use "universal binary" rather "fat binary"
...
in strings.
Suggested by: David Prévot.
2013-12-21 16:12:24 +01:00
Vladimir Serbinenko
ae558c2ccf
Enable -Wformat=2 if it's supported.
2013-12-21 15:28:28 +01:00
Vladimir Serbinenko
74763e9615
* util/misc.c (grub_util_get_image_size): Check for overflow.
2013-12-21 14:28:14 +01:00
Vladimir Serbinenko
62ce03cf40
* util/import_gcry.py: Skip sample keys.
2013-12-21 14:07:42 +01:00
Vladimir Serbinenko
f4d70fd02b
* util/misc.c (grub_qsort_strcmp): Don't discard const attribute.
2013-12-21 14:04:50 +01:00
Vladimir Serbinenko
579ee114b1
Add missing static qualifiers.
2013-12-21 13:50:13 +01:00
Vladimir Serbinenko
ee5283d66b
Add missing includes.
2013-12-21 13:47:27 +01:00
David Prévot
496a6b3024
Correct some translatable strings.
2013-12-21 03:03:31 +01:00
Colin Watson
971038be55
* util/grub-mkrescue.c: Rephrase mkrescue description.
2013-12-21 02:37:14 +01:00
Vladimir Serbinenko
bfdfeb2508
Clarify several translatable messages.
2013-12-21 01:41:16 +01:00
Vladimir Serbinenko
c00c34efe1
Merge branch 'master' of git.sv.gnu.org:/srv/git/grub
2013-12-20 17:13:24 +01:00
Vladimir Serbinenko
871aa709af
* util/grub-install.c: Inform user about install platform.
2013-12-20 16:57:48 +01:00
Colin Watson
3bc1b2daab
Fix various build problems on GNU/Hurd.
...
* grub-core/osdep/unix/getroot.c (strip_extra_slashes): Move inside
!defined (__GNU__).
(xgetcwd): Likewise.
* include/grub/emu/hostdisk.h (grub_util_hurd_get_disk_info)
[__GNU__]: Add prototype.
* util/getroot.c (grub_util_biosdisk_get_grub_dev) [__GNU__]: Format
long int using %ld rather than %d.
2013-12-20 14:02:27 +00:00
Vladimir Serbinenko
57a691b7e7
Decrease number of strings to translate.
2013-12-18 07:26:13 +01:00
Vladimir Serbinenko
636977b089
Mark strings for translation and add remaining ones to exclude list.
2013-12-18 06:50:24 +01:00
Vladimir Serbinenko
ee4450eb6f
* util/grub-file.c (main): Fix sizeof usage.
2013-12-18 06:20:20 +01:00
Vladimir Serbinenko
8f5add13ff
Implement syslinux parser.
2013-12-18 05:28:05 +01:00
Vladimir Serbinenko
f4dab3d1ac
Use grub_xasprintf to format translated error messages containing
...
64-bit quantity.
2013-12-17 16:41:09 +01:00
Vladimir Serbinenko
d6c2782a90
Unify message for unsupported relocation.
2013-12-17 16:17:46 +01:00
Vladimir Serbinenko
50d2e9596f
Mark miscompile error for translation.
2013-12-17 16:05:39 +01:00
Vladimir Serbinenko
18e76955be
Use %I64 and not %ll when using OS printf if compiling for windows.
2013-12-17 16:04:47 +01:00
Vladimir Serbinenko
d218ec9738
Update Mac code to match new register_efi prototype.
2013-12-17 16:02:36 +01:00
Vladimir Serbinenko
b8765fa082
Implement better integration with Mac firmware.
2013-12-17 15:21:02 +01:00
Vladimir Serbinenko
ec824e0f2a
Implement grub_file tool and use it to implement generating of config
...
in separate root.
2013-12-17 14:39:48 +01:00
Vladimir Serbinenko
a82010503e
Update exclude.pot and mark few strings for translation.
2013-12-17 01:18:09 +01:00
Vladimir Serbinenko
6cc8959712
* util/grub-mkrescue.c: Fix incorrect file usage in fallback code.
...
Reported by: Jon McCune
2013-12-17 00:33:55 +01:00
Vladimir Serbinenko
6f1f6a0c82
Add support for converting PE+ to Elf64.
2013-12-16 15:30:50 +01:00
Vladimir Serbinenko
f4171ebd34
Handle X86_64_PC64 relocation.
...
Those are generated by some cygwin compilers.
2013-12-16 14:24:19 +01:00