merge with mainline

diff --cc Makefile.util.def
index 0000000,fd3428e..87c33c0
mode 000000,100644..100644
--- /dev/null
--- 2/Makefile.util.def
+++ b/Makefile.util.def
@@@ -1,0 -1,510 +1,516 @@@
+ AutoGen definitions Makefile.tpl;
+ 
+ library = {
+   name = libgrub.a;
+   cflags = '$(CFLAGS_GCRY)';
+   cppflags = '$(CPPFLAGS_GCRY)';
+ 
+   common_nodist = grub_script.tab.c;
+   common_nodist = grub_script.yy.c;
+   common_nodist = libgrub_a_init.c;
+   common_nodist = grub_script.yy.h;
+   common_nodist = grub_script.tab.h;
+ 
+   common = grub-core/gnulib/error.c;
+   common = grub-core/gnulib/fnmatch.c;
+   common = grub-core/gnulib/getdelim.c;
+   common = grub-core/gnulib/getline.c;
+   common = grub-core/gnulib/getopt1.c;
+   common = grub-core/gnulib/getopt.c;
+   common = grub-core/gnulib/progname.c;
+ 
+   common = util/misc.c;
+   common = grub-core/kern/misc.c;
+   common = grub-core/kern/emu/mm.c;
+   common = grub-core/kern/emu/misc.c;
+   common = grub-core/kern/emu/hostfs.c;
+   common = grub-core/kern/emu/getroot.c;
+   common = grub-core/kern/emu/hostdisk.c;
+ 
+   common = grub-core/commands/blocklist.c;
+   common = grub-core/commands/extcmd.c;
+   common = grub-core/commands/ls.c;
+   common = grub-core/disk/dmraid_nvidia.c;
+   common = grub-core/disk/host.c;
+   common = grub-core/disk/loopback.c;
+   common = grub-core/disk/lvm.c;
+   common = grub-core/disk/mdraid_linux.c;
+   common = grub-core/disk/raid5_recover.c;
+   common = grub-core/disk/raid6_recover.c;
+   common = grub-core/disk/raid.c;
+   common = grub-core/fs/affs.c;
+   common = grub-core/fs/afs_be.c;
+   common = grub-core/fs/afs.c;
+   common = grub-core/fs/befs_be.c;
+   common = grub-core/fs/befs.c;
+   common = grub-core/fs/cpio.c;
+   common = grub-core/fs/ext2.c;
+   common = grub-core/fs/fat.c;
+   common = grub-core/fs/fshelp.c;
+   common = grub-core/fs/hfs.c;
+   common = grub-core/fs/hfsplus.c;
+   common = grub-core/fs/iso9660.c;
+   common = grub-core/fs/jfs.c;
+   common = grub-core/fs/minix.c;
+   common = grub-core/fs/nilfs2.c;
+   common = grub-core/fs/ntfs.c;
+   common = grub-core/fs/ntfscomp.c;
+   common = grub-core/fs/reiserfs.c;
+   common = grub-core/fs/sfs.c;
+   common = grub-core/fs/tar.c;
+   common = grub-core/fs/udf.c;
+   common = grub-core/fs/ufs2.c;
+   common = grub-core/fs/ufs.c;
+   common = grub-core/fs/xfs.c;
+   common = grub-core/kern/command.c;
+   common = grub-core/kern/device.c;
+   common = grub-core/kern/disk.c;
+   common = grub-core/kern/env.c;
+   common = grub-core/kern/err.c;
+   common = grub-core/kern/file.c;
+   common = grub-core/kern/fs.c;
+   common = grub-core/kern/list.c;
+   common = grub-core/kern/partition.c;
+   common = grub-core/lib/arg.c;
+   common = grub-core/lib/crc.c;
+   common = grub-core/lib/crypto.c;
+   common = grub-core/lib/envblk.c;
+   common = grub-core/lib/hexdump.c;
+   common = grub-core/lib/libgcrypt-grub/cipher/sha512.c;
+   common = grub-core/lib/LzFind.c;
+   common = grub-core/lib/LzmaEnc.c;
+   common = grub-core/lib/pbkdf2.c;
+   common = grub-core/normal/datetime.c;
+   common = grub-core/normal/misc.c;
+   common = grub-core/partmap/acorn.c;
+   common = grub-core/partmap/amiga.c;
+   common = grub-core/partmap/apple.c;
+   common = grub-core/partmap/gpt.c;
+   common = grub-core/partmap/msdos.c;
+   common = grub-core/partmap/sun.c;
+   common = grub-core/script/function.c;
+   common = grub-core/script/lexer.c;
+   common = grub-core/script/main.c;
+   common = grub-core/script/script.c;
+   common = grub-core/script/argv.c;
+ };
+ 
+ program = {
+   name = grub-bin2h;
+   common = util/bin2h.c;
+   ldadd = libgrub.a;
+   ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
+   mansection = 1;
+ };
+ 
+ program = {
+   name = grub-mkimage;
+   mansection = 1;
+ 
+   common = util/grub-mkimage.c;
+   common = util/resolve.c;
+   extra_dist = util/grub-mkimagexx.c;
+ 
+   ldadd = libgrub.a;
+   ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
+   cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibrootdir)\"';
+ };
+ 
+ program = {
+   name = grub-mkrelpath;
+   mansection = 1;
+ 
+   common = util/grub-mkrelpath.c;
+ 
+   ldadd = libgrub.a;
+   ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
+ };
+ 
+ program = {
+   name = grub-script-check;
+   mansection = 1;
+ 
+   common = util/grub-script-check.c;
+ 
+   ldadd = libgrub.a;
+   ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
+ };
+ 
+ program = {
+   name = grub-editenv;
+   mansection = 1;
+ 
+   common = util/grub-editenv.c;
+ 
+   ldadd = libgrub.a;
+   ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
+ };
+ 
+ program = {
+   name = grub-mkpasswd-pbkdf2;
+   mansection = 1;
+ 
+   common = util/grub-mkpasswd-pbkdf2.c;
+ 
+   ldadd = libgrub.a;
+   ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
+   cflags = '$(CFLAGS_GCRY)';
+   cppflags = '$(CPPFLAGS_GCRY)';
+ };
+ 
+ program = {
+   name = grub-macho2img;
+   mansection = 1;
+   common = util/grub-macho2img.c;
+   condition = COND_APPLE_CC;
+ };
+ 
+ program = {
+   name = grub-pe2elf;
+   mansection = 1;
+   common = util/grub-pe2elf.c;
+ 
+   ldadd = libgrub.a;
+   ldflags = '$(LIBINTL)';
+   condition = COND_GRUB_PE2ELF;
+ };
+ 
+ program = {
+   name = grub-fstest;
+   mansection = 1;
+   common = util/grub-fstest.c;
+ 
+   ldadd = libgrub.a;
+   ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
+   condition = COND_GRUB_FSTEST;
+ };
+ 
+ program = {
+   name = grub-mkfont;
+   mansection = 1;
+   common = util/grub-mkfont.c;
+   common = grub-core/unidata.c;
+ 
+   cflags = '$(freetype_cflags)';
+ 
+   ldadd = libgrub.a;
+   ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
+   ldflags = '$(freetype_libs)';
+   condition = COND_GRUB_MKFONT;
+ };
+ 
+ program = {
+   name = grub-mkdevicemap;
+   installdir = sbin;
+   mansection = 8;
+ 
+   common = util/grub-mkdevicemap.c;
+   common = util/deviceiter.c;
+   nosparc64 = util/devicemap.c;
+ 
+   sparc64_ieee1275 = util/ieee1275/ofpath.c;
+   sparc64_ieee1275 = util/ieee1275/devicemap.c;
+ 
+   ldadd = libgrub.a;
+   ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
+ };
+ 
+ program = {
+   name = grub-probe;
+   installdir = sbin;
+   mansection = 8;
+   common = util/grub-probe.c;
+ 
+   ldadd = libgrub.a;
+   ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
+ };
+ 
+ program = {
+   name = grub-setup;
+   installdir = sbin;
+   mansection = 8;
+   i386_pc = util/i386/pc/grub-setup.c;
+   i386_pc = util/raid.c;
+   i386_pc = util/lvm.c;
+ 
+   sparc64_ieee1275 = util/ieee1275/ofpath.c;
+   sparc64_ieee1275 = util/sparc64/ieee1275/grub-setup.c;
+   sparc64_ieee1275 = util/raid.c;
+   sparc64_ieee1275 = util/lvm.c;
+ 
+   ldadd = libgrub.a;
+   ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
+ 
+   enable = i386_pc;
+   enable = sparc64_ieee1275;
+ };
+ 
+ program = {
+   name = grub-ofpathname;
+   installdir = sbin;
+   ieee1275 = util/ieee1275/grub-ofpathname.c;
+   ieee1275 = util/ieee1275/ofpath.c;
+ 
+   ldadd = libgrub.a;
+   enable = sparc64_ieee1275;
+ };
+ 
+ data = {
+   common = util/grub.d/README;
+   installdir = grubconf;
+ };
+ 
+ script = {
+   name = '00_header';
+   common = util/grub.d/00_header.in;
+   installdir = grubconf;
+ };
+ 
+ script = {
+   name = '10_windows';
+   common = util/grub.d/10_windows.in;
+   installdir = grubconf;
+   condition = COND_HOST_WINDOWS;
+ };
+ 
+ script = {
+   name = '10_hurd';
+   common = util/grub.d/10_hurd.in;
+   installdir = grubconf;
+   condition = COND_HOST_HURD;
+ };
+ 
+ script = {
+   name = '10_kfreebsd';
+   common = util/grub.d/10_kfreebsd.in;
+   installdir = grubconf;
+   condition = COND_HOST_KFREEBSD;
+ };
+ 
+ script = {
+   name = '10_netbsd';
+   common = util/grub.d/10_netbsd.in;
+   installdir = grubconf;
+   condition = COND_HOST_NETBSD;
+ };
+ 
+ script = {
+   name = '10_linux';
+   common = util/grub.d/10_linux.in;
+   installdir = grubconf;
+   condition = COND_HOST_LINUX;
+ };
+ 
+ script = {
+   name = '20_linux_xen';
+   common = util/grub.d/20_linux_xen.in;
+   installdir = grubconf;
+   condition = COND_HOST_LINUX;
+ };
+ 
+ script = {
+   name = '30_os-prober';
+   common = util/grub.d/30_os-prober.in;
+   installdir = grubconf;
+ };
+ 
+ script = {
+   name = '40_custom';
+   common = util/grub.d/40_custom.in;
+   installdir = grubconf;
+ };
+ 
+ script = {
+   name = '41_custom';
+   common = util/grub.d/41_custom.in;
+   installdir = grubconf;
+ };
+ 
+ script = {
+   mansection = 1;
+   name = grub-mkrescue;
+   x86_noieee1275 = util/grub-mkrescue.in;
+   powerpc_ieee1275 = util/powerpc/ieee1275/grub-mkrescue.in;
+   enable = i386_pc;
+   enable = x86_efi;
+   enable = i386_qemu;
+   enable = i386_coreboot;
+   enable = powerpc_ieee1275;
+ };
+ 
+ script = {
+   mansection = 8;
+   installdir = sbin;
+   name = grub-install;
+ 
+   mips = util/grub-install.in;
+   i386_noefi_noieee1275 = util/grub-install.in;
+ 
+   x86_efi = util/i386/efi/grub-install.in;
+   i386_ieee1275 = util/ieee1275/grub-install.in;
+   powerpc_ieee1275 = util/ieee1275/grub-install.in;
+ 
+   enable = x86;
+   enable = mips;
+   enable = powerpc_ieee1275;
+ };
+ 
+ script = {
+   name = grub-mkconfig;
+   common = util/grub-mkconfig.in;
+   mansection = 8;
+   installdir = sbin;
+ };
+ 
+ script = {
+   name = grub-set-default;
+   common = util/grub-set-default.in;
+   mansection = 8;
+   installdir = sbin;
+ };
+ 
+ script = {
+   name = grub-reboot;
+   common = util/grub-reboot.in;
+   mansection = 8;
+   installdir = sbin;
+ };
+ 
+ script = {
+   name = grub-mkconfig_lib;
+   common = util/grub-mkconfig_lib.in;
+   installdir = noinst;
+ };
+ 
+ script = {
+   name = update-grub_lib;
+   common = util/update-grub_lib.in;
+   installdir = noinst;
+ };
+ 
+ script = {
+   name = grub-shell;
+   common = tests/util/grub-shell.in;
+   installdir = noinst;
+ };
+ 
+ script = {
+   name = grub-shell-tester;
+   common = tests/util/grub-shell-tester.in;
+   installdir = noinst;
+ };
+ 
+ script = {
+   testcase;
+   name = example_scripted_test;
+   common = tests/example_scripted_test.in;
+ };
+ 
+ script = {
+   testcase;
+   name = example_grub_script_test;
+   common = tests/example_grub_script_test.in;
+ };
+ 
+ script = {
+   testcase;
+   name = grub_script_echo1;
+   common = tests/grub_script_echo1.in;
+ };
+ 
+ script = {
+   testcase;
+   name = grub_script_echo_keywords;
+   common = tests/grub_script_echo_keywords.in;
+ };
+ 
+ script = {
+   testcase;
+   name = grub_script_vars1;
+   common = tests/grub_script_vars1.in;
+ };
+ 
+ script = {
+   testcase;
+   name = grub_script_for1;
+   common = tests/grub_script_for1.in;
+ };
+ 
+ script = {
+   testcase;
+   name = grub_script_while1;
+   common = tests/grub_script_while1.in;
+ };
+ 
+ script = {
+   testcase;
+   name = grub_script_if;
+   common = tests/grub_script_if.in;
+ };
+ 
+ script = {
+   testcase;
+   name = grub_script_blanklines;
+   common = tests/grub_script_blanklines.in;
+ };
+ 
+ script = {
+   testcase;
+   name = grub_script_final_semicolon;
+   common = tests/grub_script_final_semicolon.in;
+ };
+ 
+ script = {
+   testcase;
+   name = grub_script_dollar;
+   common = tests/grub_script_dollar.in;
+ };
+ 
+ script = {
+   testcase;
+   name = grub_script_comments;
+   common = tests/grub_script_comments.in;
+ };
+ 
+ script = {
+   testcase;
+   name = grub_script_functions;
+   common = tests/grub_script_functions.in;
+ };
+ 
+ script = {
+   testcase;
+   name = grub_script_break;
+   common = tests/grub_script_break.in;
+ };
+ 
+ script = {
+   testcase;
+   name = grub_script_continue;
+   common = tests/grub_script_continue.in;
+ };
+ 
+ script = {
+   testcase;
+   name = grub_script_shift;
+   common = tests/grub_script_shift.in;
+ };
+ 
++script = {
++  testcase;
++  name = grub_script_setparams;
++  common = tests/grub_script_setparams.in;
++};
++
+ program = {
+   testcase;
+   name = example_unit_test;
+   common = tests/example_unit_test.c;
+   common = tests/lib/unit_test.c;
+   common = grub-core/kern/list.c;
+   common = grub-core/kern/misc.c;
+   common = grub-core/tests/lib/test.c;
+   cflags = -Wno-format;
+   ldadd = libgrub.a;
+   ldflags = '$(LIBDEVMAPPER)';
+ };

diff --cc grub-core/script/argv.c
Simple merge

diff --cc grub-core/script/execute.c
Simple merge

diff --cc grub-core/script/main.c
Simple merge