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-11-18 16:12:50 +01:00
commit 421db3da06
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -8,6 +8,11 @@
* util/grub-install-common.c (grub_install_copy_files): Fix module * util/grub-install-common.c (grub_install_copy_files): Fix module
destination directory. destination directory.
2013-11-18 Colin Watson <cjwatson@ubuntu.com>
* tests/util/grub-shell.in: Don't fail on emu platform if po/*.gmo
files have not been built.
2013-11-18 Colin Watson <cjwatson@ubuntu.com> 2013-11-18 Colin Watson <cjwatson@ubuntu.com>
* grub-core/osdep/unix/hostdisk.c (grub_util_make_temporary_file): * grub-core/osdep/unix/hostdisk.c (grub_util_make_temporary_file):

6
tests/util/grub-shell.in
View file

@ -434,7 +434,11 @@ elif [ x$boot = xemu ]; then
mkdir -p "$grubdir/locale" mkdir -p "$grubdir/locale"
cp "@builddir@/"unicode.pf2 "$grubdir/fonts/unicode.pf2" cp "@builddir@/"unicode.pf2 "$grubdir/fonts/unicode.pf2"
cp -R "@srcdir@/themes/starfield" "$grubdir/themes/starfield" cp -R "@srcdir@/themes/starfield" "$grubdir/themes/starfield"
cp -R "@srcdir@/po/"*.gmo "$grubdir/locale/" for file in "@srcdir@/po/"*.gmo; do
if [ -f "$file" ]; then
cp "$file" "$grubdir/locale/"
fi
done
cp "${cfgfile}" "$grubdir/grub.cfg" cp "${cfgfile}" "$grubdir/grub.cfg"
cp "${source}" "$grubdir/testcase.cfg" cp "${source}" "$grubdir/testcase.cfg"
@builddir@/grub-core/grub-emu -m "$device_map" -d "$grubdir" | tr -d "\r" | do_trim @builddir@/grub-core/grub-emu -m "$device_map" -d "$grubdir" | tr -d "\r" | do_trim