diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2018-11-22 00:03:05 +0100 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2018-11-22 00:19:03 +0100 |
| commit | 37fe7f743f5dd9fd5557d5b99489c4a98e720e0d (patch) | |
| tree | 44118bf0c0be04ceaab6d3cb894108d3bbd801bb | |
| parent | 25242cf5146d105a09332a35c1ce24cdc914bb3a (diff) | |
| download | drakx-37fe7f743f5dd9fd5557d5b99489c4a98e720e0d.tar drakx-37fe7f743f5dd9fd5557d5b99489c4a98e720e0d.tar.gz drakx-37fe7f743f5dd9fd5557d5b99489c4a98e720e0d.tar.bz2 drakx-37fe7f743f5dd9fd5557d5b99489c4a98e720e0d.tar.xz drakx-37fe7f743f5dd9fd5557d5b99489c4a98e720e0d.zip | |
fix collecting needed perl files with glibc-2.26
basically the ouput of strace changed with glibc-2.26:
"Since version 2.26, the glibc wrapper function for open() employs the
openat() system call, rather than the kernel's open() system call".
so support both ways (in case it would be backported):
open("foobar...)
openat(AT_FDCWD, "foobar...)
| -rw-r--r-- | rescue/NEWS | 1 | ||||
| -rwxr-xr-x | tools/install-xml-file-list | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/rescue/NEWS b/rescue/NEWS index a20f773f6..4d7fdc8b5 100644 --- a/rescue/NEWS +++ b/rescue/NEWS @@ -1,4 +1,5 @@ - add missing perl bits +- fix collecting needed perl files with glibc-2.26 Version 1.59 - 26 August 2018 by Thomas Backlund diff --git a/tools/install-xml-file-list b/tools/install-xml-file-list index 0fc8f7a76..64c70b9c6 100755 --- a/tools/install-xml-file-list +++ b/tools/install-xml-file-list @@ -160,7 +160,7 @@ sub collect_needed_perl_files { my (%local, %global); foreach my $script (@scripts) { foreach (`strace -efile perl -cw -I$local_rep $script 2>&1`) { - my ($f) = /^open\("(.*?)",.*\)\s*=\s*\d+$/ or next; + my ($f) = /^open(?:at\([^,]*, |)"(.*?)",.*\)\s*=\s*\d+$/ or next; if ($f =~ m!^\Q$local_rep\E/(.*)!) { $local{$1} = 1; } elsif (begins_with($f, '/dev/')) { |