pull-in emu-lite

diff --cc grub-core/conf/any-emu.rmk
Simple merge

diff --cc grub-core/kern/emu/hostdisk.c
Simple merge

diff --cc grub-core/kern/emu/misc.c
Simple merge

diff --cc grub-core/kern/misc.c
Simple merge

diff --cc tests/util/grub-shell.in
index abdcaab8b8cbeb5fa2229b24156f12bf772f7985,17da6c8c03747e26a77a48502e4f809e918e5b16..4af6a71e34acb4179dff1a50cc741b64dde99f12
--- 1/tests/util/grub-shell.in
--- 2/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@@ -123,15 -123,11 +123,15 @@@ source /boot/grub/testcase.cf
  halt
  EOF
  
 +rootdir=`mktemp -d`
 +(cd @abs_top_builddir@ && make DESTDIR=$rootdir install) >/dev/null 2>&1
 +
  isofile=`mktemp`
 -grub-mkrescue --grub-mkimage=${builddir}/grub-mkimage --output=${isofile} \
 -  --override-directory=${builddir} \
 -  /boot/grub/grub.cfg=${cfgfile} /boot/grub/testcase.cfg=${source} \
 -  >/dev/null 2>&1
 +sh @abs_top_builddir@/grub-mkrescue --grub-mkimage=${builddir}/grub-mkimage \
 +  --override-directory=${builddir}/grub-core --output=${isofile} \
-   --root-directory=${rootdir} /boot/grub/grub.cfg=${cfgfile} \
++  boot/grub/grub.cfg=${cfgfile} \
 +  /boot/grub/testcase.cfg=${source} >/dev/null 2>&1
 +rm -rf $rootdir
  
  hdafile=`mktemp`
  cp ${isofile} ${hdafile}

diff --cc util/grub-mkrescue.in
Simple merge

diff --cc util/grub-script-check.c
Simple merge