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

syslinux: Fix syslinux_test in out-of-tree builds

Browse source 
syslinux_parse simplifies some filenames by removing things like ".."
segments, but the tests assumed that @abs_top_srcdir@ would be
untouched, which is not true in the case of out-of-tree builds where
@abs_top_srcdir@ may contain ".." segments.

Performing the substitution requires some awkwardness in Makefile.am due
to details of how config.status works.

Signed-off-by: Colin Watson <cjwatson@ubuntu.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Colin Watson 2019-02-27 10:26:30 +00:00 • committed by Daniel Kiper
parent 62daa27056
commit f8f35acb5b
3 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
grub-core/lib/syslinux_parse.c
View file

@ -807,6 +807,10 @@ print_file (struct output_buffer *outbuf,
return print_escaped (outbuf, from, to);
}
/*
* Makefile.am mimics this when generating tests/syslinux/ubuntu10.04_grub.cfg,
* so changes here may need to be reflected there too.
*/
static void
simplify_filename (char *str)
{