From: Hilko Bengen Date: Tue, 31 Aug 2021 15:00:10 +0000 (+0200) Subject: appliance: Fix searching for shared libraries on usr-merged Debian systems X-Git-Tag: archive/raspbian/1%1.44.1-2+rpi1^2~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6b4746eac7e072bbe5090ca47ad1b288a4192a11;p=libguestfs.git appliance: Fix searching for shared libraries on usr-merged Debian systems If /lib is a symlink to usr/lib, paths to shared libraries as determined by ld.so may differ from dpkg's file lists. We turn the filename search pattern into a glob expression by prefixing it with a '*', so the required packages are found again: $ dpkg -S /lib/x86_64-linux-gnu/libpcre2-8.so.0 dpkg-query: no path found matching pattern /lib/x86_64-linux-gnu/libpcre2-8.so.0 $ dpkg -S */lib/x86_64-linux-gnu/libpcre2-8.so.0 libpcre2-8-0:amd64: /usr/lib/x86_64-linux-gnu/libpcre2-8.so.0 Gbp-Pq: Name 0021-appliance-Fix-searching-for-shared-libraries-on-usr-.patch --- diff --git a/appliance/Makefile.am b/appliance/Makefile.am index ceecf7aa..88fec6c0 100644 --- a/appliance/Makefile.am +++ b/appliance/Makefile.am @@ -85,7 +85,7 @@ if HAVE_RPM QUERY_FILES_CMD := xargs rpm -qf --qf '%{name}\n' endif if HAVE_DPKG -QUERY_FILES_CMD := xargs dpkg -S | cut -d: -f1 +QUERY_FILES_CMD := sed -e 's,^/,\*/,' | xargs dpkg -S | cut -d: -f1 endif if HAVE_PACMAN QUERY_FILES_CMD := xargs pacman -Qo | sed -r 's/.* is owned by ([^ ]+) .*/\1/'