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

Transform -C option to grub-mkstandalone to --core-compress available

Browse source 
in all grub-install flavours.
This commit is contained in:
Vladimir Serbinenko 2013-12-07 16:18:22 +01:00
parent 4c4ea9c7b5
commit f23bc65103
7 changed files with 59 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-12-07 Vladimir Serbinenko <phcoder@gmail.com>
Transform -C option to grub-mkstandalone to --core-compress available
in all grub-install flavours.
2013-12-07 Vladimir Serbinenko <phcoder@gmail.com> 2013-12-07 Vladimir Serbinenko <phcoder@gmail.com>
Merge GRUBFS and GRUB_FS variables. Merge GRUBFS and GRUB_FS variables.

12
include/grub/util/install.h
View file

@ -41,6 +41,9 @@
{ "compress", GRUB_INSTALL_OPTIONS_INSTALL_COMPRESS, \ { "compress", GRUB_INSTALL_OPTIONS_INSTALL_COMPRESS, \
"no,xz,gz,lzo", OPTION_ARG_OPTIONAL, \ "no,xz,gz,lzo", OPTION_ARG_OPTIONAL, \
N_("compress GRUB files [optional]"), 1 }, \ N_("compress GRUB files [optional]"), 1 }, \
{"core-compress", GRUB_INSTALL_OPTIONS_INSTALL_CORE_COMPRESS, \
N_("xz|none|auto"), \
0, N_("choose the compression to use for core image"), 2}, \
/* TRANSLATORS: platform here isn't identifier. It can be translated. */ \ /* TRANSLATORS: platform here isn't identifier. It can be translated. */ \
{ "directory", 'd', N_("DIR"), 0, \ { "directory", 'd', N_("DIR"), 0, \
N_("use images and modules under DIR [default=%s/<platform>]"), 1 }, \ N_("use images and modules under DIR [default=%s/<platform>]"), 1 }, \
@ -111,7 +114,8 @@ enum grub_install_options {
GRUB_INSTALL_OPTIONS_DIRECTORY2, GRUB_INSTALL_OPTIONS_DIRECTORY2,
GRUB_INSTALL_OPTIONS_LOCALE_DIRECTORY, GRUB_INSTALL_OPTIONS_LOCALE_DIRECTORY,
GRUB_INSTALL_OPTIONS_THEMES_DIRECTORY, GRUB_INSTALL_OPTIONS_THEMES_DIRECTORY,
GRUB_INSTALL_OPTIONS_GRUB_MKIMAGE GRUB_INSTALL_OPTIONS_GRUB_MKIMAGE,
GRUB_INSTALL_OPTIONS_INSTALL_CORE_COMPRESS
}; };
extern char *grub_install_source_directory; extern char *grub_install_source_directory;
@ -146,15 +150,13 @@ void
grub_install_make_image_wrap (const char *dir, const char *prefix, grub_install_make_image_wrap (const char *dir, const char *prefix,
const char *outname, char *memdisk_path, const char *outname, char *memdisk_path,
char *config_path, char *config_path,
const char *format, int note, const char *format, int note);
grub_compression_t comp);
void void
grub_install_make_image_wrap_file (const char *dir, const char *prefix, grub_install_make_image_wrap_file (const char *dir, const char *prefix,
FILE *fp, const char *outname, FILE *fp, const char *outname,
char *memdisk_path, char *memdisk_path,
char *config_path, char *config_path,
const char *mkimage_target, int note, const char *mkimage_target, int note);
grub_compression_t comp);
int int
grub_install_copy_file (const char *src, grub_install_copy_file (const char *src,

30
util/grub-install-common.c
View file

@ -297,12 +297,30 @@ handle_install_list (struct install_list *il, const char *val,
static char **pubkeys; static char **pubkeys;
static size_t npubkeys; static size_t npubkeys;
static grub_compression_t compression;
int int
grub_install_parse (int key, char *arg) grub_install_parse (int key, char *arg)
{ {
switch (key) switch (key)
{ {
case 'C':
if (grub_strcmp (arg, "xz") == 0)
{
#ifdef HAVE_LIBLZMA
compression = GRUB_COMPRESSION_XZ;
#else
grub_util_error ("%s",
_("grub-mkimage is compiled without XZ support"));
#endif
}
else if (grub_strcmp (arg, "none") == 0)
compression = GRUB_COMPRESSION_NONE;
else if (grub_strcmp (arg, "auto") == 0)
compression = GRUB_COMPRESSION_AUTO;
else
grub_util_error (_("Unknown compression format %s"), arg);
return 1;
case 'k': case 'k':
pubkeys = xrealloc (pubkeys, pubkeys = xrealloc (pubkeys,
sizeof (pubkeys[0]) sizeof (pubkeys[0])
@ -401,8 +419,7 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
FILE *fp, const char *outname, FILE *fp, const char *outname,
char *memdisk_path, char *memdisk_path,
char *config_path, char *config_path,
const char *mkimage_target, int note, const char *mkimage_target, int note)
grub_compression_t comp)
{ {
const struct grub_install_image_target_desc *tgt; const struct grub_install_image_target_desc *tgt;
const char *const compnames[] = const char *const compnames[] =
@ -468,7 +485,7 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
"--format '%s' --compression '%s' %s %s\n", "--format '%s' --compression '%s' %s %s\n",
dir, prefix, dir, prefix,
outname, mkimage_target, outname, mkimage_target,
compnames[comp], note ? "--note" : "", s); compnames[compression], note ? "--note" : "", s);
tgt = grub_install_get_image_target (mkimage_target); tgt = grub_install_get_image_target (mkimage_target);
if (!tgt) if (!tgt)
@ -477,7 +494,7 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
grub_install_generate_image (dir, prefix, fp, outname, grub_install_generate_image (dir, prefix, fp, outname,
modules.entries, memdisk_path, modules.entries, memdisk_path,
pubkeys, npubkeys, config_path, tgt, pubkeys, npubkeys, config_path, tgt,
note, comp); note, compression);
while (dc--) while (dc--)
grub_install_pop_module (); grub_install_pop_module ();
} }
@ -486,8 +503,7 @@ void
grub_install_make_image_wrap (const char *dir, const char *prefix, grub_install_make_image_wrap (const char *dir, const char *prefix,
const char *outname, char *memdisk_path, const char *outname, char *memdisk_path,
char *config_path, char *config_path,
const char *mkimage_target, int note, const char *mkimage_target, int note)
grub_compression_t comp)
{ {
FILE *fp; FILE *fp;
@ -497,7 +513,7 @@ grub_install_make_image_wrap (const char *dir, const char *prefix,
strerror (errno)); strerror (errno));
grub_install_make_image_wrap_file (dir, prefix, fp, outname, grub_install_make_image_wrap_file (dir, prefix, fp, outname,
memdisk_path, config_path, memdisk_path, config_path,
mkimage_target, note, comp); mkimage_target, note);
grub_util_file_sync (fp); grub_util_file_sync (fp);
fclose (fp); fclose (fp);
} }

6
util/grub-install.c
View file

@ -1368,8 +1368,7 @@ main (int argc, char *argv[])
/* output */ imgfile, /* output */ imgfile,
/* memdisk */ NULL, /* memdisk */ NULL,
have_load_cfg ? load_cfg : NULL, have_load_cfg ? load_cfg : NULL,
/* image target */ mkimage_target, /* image target */ mkimage_target, 0);
0, GRUB_COMPRESSION_AUTO);
/* Backward-compatibility kludges. */ /* Backward-compatibility kludges. */
switch (platform) switch (platform)
{ {
@ -1399,8 +1398,7 @@ main (int argc, char *argv[])
/* output */ dst, /* output */ dst,
/* memdisk */ NULL, /* memdisk */ NULL,
have_load_cfg ? load_cfg : NULL, have_load_cfg ? load_cfg : NULL,
/* image target */ mkimage_target, /* image target */ mkimage_target, 0);
0, GRUB_COMPRESSION_AUTO);
} }
break; break;
case GRUB_INSTALL_PLATFORM_ARM_EFI: case GRUB_INSTALL_PLATFORM_ARM_EFI:

3
util/grub-mknetdir.c
View file

@ -149,8 +149,7 @@ process_input_dir (const char *input_dir, enum grub_install_plat platform)
output = grub_util_path_concat_ext (2, grubdir, "core", targets[platform].ext); output = grub_util_path_concat_ext (2, grubdir, "core", targets[platform].ext);
grub_install_make_image_wrap (input_dir, prefix, output, grub_install_make_image_wrap (input_dir, prefix, output,
0, load_cfg, 0, load_cfg,
targets[platform].mkimage_target, 0, targets[platform].mkimage_target, 0);
GRUB_COMPRESSION_AUTO);
grub_install_pop_module (); grub_install_pop_module ();
/* TRANSLATORS: First %s is replaced by platform name. Second one by filename. */ /* TRANSLATORS: First %s is replaced by platform name. Second one by filename. */

37
util/grub-mkrescue.c
View file

@ -241,8 +241,7 @@ write_part (FILE *f, const char *srcdir)
static void static void
make_image_abs (enum grub_install_plat plat, make_image_abs (enum grub_install_plat plat,
const char *mkimage_target, const char *mkimage_target,
const char *output, const char *output)
grub_compression_t compress)
{ {
char *load_cfg; char *load_cfg;
FILE *load_cfg_f; FILE *load_cfg_f;
@ -266,8 +265,7 @@ make_image_abs (enum grub_install_plat plat,
grub_install_push_module ("iso9660"); grub_install_push_module ("iso9660");
grub_install_make_image_wrap (source_dirs[plat], "/boot/grub", output, grub_install_make_image_wrap (source_dirs[plat], "/boot/grub", output,
0, load_cfg, 0, load_cfg,
mkimage_target, 0, mkimage_target, 0);
compress);
grub_install_pop_module (); grub_install_pop_module ();
grub_install_pop_module (); grub_install_pop_module ();
grub_util_unlink (load_cfg); grub_util_unlink (load_cfg);
@ -276,12 +274,10 @@ make_image_abs (enum grub_install_plat plat,
static void static void
make_image (enum grub_install_plat plat, make_image (enum grub_install_plat plat,
const char *mkimage_target, const char *mkimage_target,
const char *output_sub, const char *output_sub)
grub_compression_t compress)
{ {
char *out = grub_util_path_concat (2, boot_grub, output_sub); char *out = grub_util_path_concat (2, boot_grub, output_sub);
make_image_abs (plat, mkimage_target, make_image_abs (plat, mkimage_target, out);
out, GRUB_COMPRESSION_AUTO);
free (out); free (out);
} }
@ -307,8 +303,7 @@ make_image_fwdisk_abs (enum grub_install_plat plat,
grub_install_push_module ("iso9660"); grub_install_push_module ("iso9660");
grub_install_make_image_wrap (source_dirs[plat], "()/boot/grub", output, grub_install_make_image_wrap (source_dirs[plat], "()/boot/grub", output,
0, load_cfg, mkimage_target, 0, 0, load_cfg, mkimage_target, 0);
GRUB_COMPRESSION_AUTO);
grub_install_pop_module (); grub_install_pop_module ();
} }
@ -483,8 +478,7 @@ main (int argc, char *argv[])
grub_install_make_image_wrap (source_dirs[GRUB_INSTALL_PLATFORM_I386_PC], grub_install_make_image_wrap (source_dirs[GRUB_INSTALL_PLATFORM_I386_PC],
"/boot/grub", output, "/boot/grub", output,
0, load_cfg, 0, load_cfg,
"i386-pc-eltorito", 0, "i386-pc-eltorito", 0);
GRUB_COMPRESSION_AUTO);
xorriso_push ("-b"); xorriso_push ("-b");
xorriso_push ("boot/grub/i386-pc/eltorito.img"); xorriso_push ("boot/grub/i386-pc/eltorito.img");
@ -528,8 +522,7 @@ main (int argc, char *argv[])
grub_install_make_image_wrap (source_dirs[GRUB_INSTALL_PLATFORM_I386_PC], grub_install_make_image_wrap (source_dirs[GRUB_INSTALL_PLATFORM_I386_PC],
"/boot/grub", output, "/boot/grub", output,
0, load_cfg, 0, load_cfg,
"i386-pc", 0, "i386-pc", 0);
GRUB_COMPRESSION_AUTO);
sz = ftello (sa); sz = ftello (sa);
fflush (sa); fflush (sa);
grub_util_fd_sync (fileno (sa)); grub_util_fd_sync (fileno (sa));
@ -554,7 +547,7 @@ main (int argc, char *argv[])
grub_install_push_module ("pata"); grub_install_push_module ("pata");
grub_install_push_module ("ahci"); grub_install_push_module ("ahci");
grub_install_push_module ("at_keyboard"); grub_install_push_module ("at_keyboard");
make_image (GRUB_INSTALL_PLATFORM_I386_MULTIBOOT, "i386-multiboot", "i386-multiboot/core.elf", GRUB_COMPRESSION_AUTO); make_image (GRUB_INSTALL_PLATFORM_I386_MULTIBOOT, "i386-multiboot", "i386-multiboot/core.elf");
grub_install_pop_module (); grub_install_pop_module ();
grub_install_pop_module (); grub_install_pop_module ();
grub_install_pop_module (); grub_install_pop_module ();
@ -775,22 +768,22 @@ main (int argc, char *argv[])
make_image_fwdisk (GRUB_INSTALL_PLATFORM_MIPSEL_ARC, "mipsel-arc", "arc.exe"); make_image_fwdisk (GRUB_INSTALL_PLATFORM_MIPSEL_ARC, "mipsel-arc", "arc.exe");
grub_install_push_module ("pata"); grub_install_push_module ("pata");
make_image (GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS, "mipsel-qemu_mips-elf", "roms/mipsel-qemu_mips.elf", GRUB_COMPRESSION_AUTO); make_image (GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS, "mipsel-qemu_mips-elf", "roms/mipsel-qemu_mips.elf");
make_image (GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON, "mipsel-loongson-elf", "loongson.elf", GRUB_COMPRESSION_XZ); make_image (GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON, "mipsel-loongson-elf", "loongson.elf");
make_image (GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON, "mipsel-yeeloong-flash", "mipsel-yeeloong.bin", GRUB_COMPRESSION_XZ); make_image (GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON, "mipsel-yeeloong-flash", "mipsel-yeeloong.bin");
make_image (GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON, "mipsel-fuloong2f-flash", "mipsel-fuloong2f.bin", GRUB_COMPRESSION_XZ); make_image (GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON, "mipsel-fuloong2f-flash", "mipsel-fuloong2f.bin");
make_image (GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS, "mips-qemu_mips-elf", "roms/mips-qemu_mips.elf", GRUB_COMPRESSION_AUTO); make_image (GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS, "mips-qemu_mips-elf", "roms/mips-qemu_mips.elf");
grub_install_push_module ("at_keyboard"); grub_install_push_module ("at_keyboard");
make_image (GRUB_INSTALL_PLATFORM_I386_QEMU, "i386-qemu", "roms/qemu.img", GRUB_COMPRESSION_AUTO); make_image (GRUB_INSTALL_PLATFORM_I386_QEMU, "i386-qemu", "roms/qemu.img");
grub_install_push_module ("ahci"); grub_install_push_module ("ahci");
make_image (GRUB_INSTALL_PLATFORM_I386_COREBOOT, "i386-coreboot", "roms/coreboot.elf", GRUB_COMPRESSION_AUTO); make_image (GRUB_INSTALL_PLATFORM_I386_COREBOOT, "i386-coreboot", "roms/coreboot.elf");
grub_install_pop_module (); grub_install_pop_module ();
grub_install_pop_module (); grub_install_pop_module ();
grub_install_pop_module (); grub_install_pop_module ();

30
util/grub-mkstandalone.c
View file

@ -25,7 +25,6 @@
#include <argp.h> #include <argp.h>
#include <string.h> #include <string.h>
static grub_compression_t compression;
static char *output_image; static char *output_image;
static char **files; static char **files;
static int nfiles; static int nfiles;
@ -35,8 +34,7 @@ static FILE *memdisk;
enum enum
{ {
OPTION_OUTPUT = 'o', OPTION_OUTPUT = 'o',
OPTION_FORMAT = 'C', OPTION_FORMAT = 'O'
OPTION_COMPRESION = 'C'
}; };
static struct argp_option options[] = { static struct argp_option options[] = {
@ -44,8 +42,7 @@ static struct argp_option options[] = {
{"output", 'o', N_("FILE"), {"output", 'o', N_("FILE"),
0, N_("save output in FILE [required]"), 2}, 0, N_("save output in FILE [required]"), 2},
{"format", 'O', N_("FILE"), 0, 0, 2}, {"format", 'O', N_("FILE"), 0, 0, 2},
{"compression", 'C', N_("xz|none|auto"), {"compression", 'C', N_("xz|none|auto"), OPTION_HIDDEN, 0, 2},
0, N_("choose the compression to use for core image"), 2},
{0, 0, 0, 0, 0, 0} {0, 0, 0, 0, 0, 0}
}; };
@ -70,6 +67,9 @@ help_filter (int key, const char *text, void *input __attribute__ ((unused)))
static error_t static error_t
argp_parser (int key, char *arg, struct argp_state *state) argp_parser (int key, char *arg, struct argp_state *state)
{ {
if (key == 'C')
key = GRUB_INSTALL_OPTIONS_INSTALL_CORE_COMPRESS;
if (grub_install_parse (key, arg)) if (grub_install_parse (key, arg))
return 0; return 0;
@ -95,23 +95,6 @@ argp_parser (int key, char *arg, struct argp_state *state)
break; break;
} }
case 'C':
if (grub_strcmp (arg, "xz") == 0)
{
#ifdef HAVE_LIBLZMA
compression = GRUB_COMPRESSION_XZ;
#else
grub_util_error ("%s",
_("grub-mkimage is compiled without XZ support"));
#endif
}
else if (grub_strcmp (arg, "none") == 0)
compression = GRUB_COMPRESSION_NONE;
else if (grub_strcmp (arg, "auto") == 0)
compression = GRUB_COMPRESSION_AUTO;
else
grub_util_error (_("Unknown compression format %s"), arg);
break;
case ARGP_KEY_ARG: case ARGP_KEY_ARG:
files[nfiles++] = xstrdup (arg); files[nfiles++] = xstrdup (arg);
break; break;
@ -365,8 +348,7 @@ main (int argc, char *argv[])
grub_install_make_image_wrap (grub_install_source_directory, grub_install_make_image_wrap (grub_install_source_directory,
"(memdisk)/boot/grub", output_image, "(memdisk)/boot/grub", output_image,
memdisk_img, NULL, memdisk_img, NULL,
grub_util_get_target_name (format), 0, grub_util_get_target_name (format), 0);
compression);
grub_util_unlink (memdisk_img); grub_util_unlink (memdisk_img);
return 0; return 0;