Fix grub-shell to avoid breaking "make distcheck"
Copying the themes directory in grub-shell isn't parallel-test-friendly and breaks on the second test when the source directory is read-only (as in "make distcheck"). Instead, add a hidden --themes-directory option to grub-mkrescue et al, and use it in grub-shell.
This commit is contained in:
parent
e3046431da
commit
3a82f8bb48
4 changed files with 33 additions and 4 deletions
|
@ -347,9 +347,10 @@ if test -z "$debug"; then
|
|||
fi
|
||||
|
||||
if [ x$boot != xnet ] && [ x$boot != xemu ]; then
|
||||
cp -R "@srcdir@/themes" "@builddir@"
|
||||
pkgdatadir="@builddir@" "@builddir@/grub-mkrescue" "--output=${isofile}" "--override-directory=${builddir}/grub-core" \
|
||||
--rom-directory="${rom_directory}" $mkimage_extra_arg ${mkrescue_args} \
|
||||
--rom-directory="${rom_directory}" \
|
||||
--themes-directory="@srcdir@/themes" \
|
||||
$mkimage_extra_arg ${mkrescue_args} \
|
||||
"/boot/grub/grub.cfg=${cfgfile}" "/boot/grub/testcase.cfg=${source}" \
|
||||
${files} >/dev/null 2>&1
|
||||
fi
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue