Make copy_binaries compatible with lddtree from pax-utils-0.6

On some system the output from the new lddtree does not match with what
genkernel expects, however lddtree have insted gained a new option that
essentially gives what we want with less code.

Signed-off-by: Peter Hjalmarsson <xake@rymdraket.net>
cleanup-cruft
Peter Hjalmarsson 12 years ago
parent 543181ebef
commit 6cc7e382d6

@ -33,6 +33,14 @@ copy_binaries() {
fi fi
done done
# This must be OUTSIDE the for loop, we only want to run lddtree etc ONCE. # This must be OUTSIDE the for loop, we only want to run lddtree etc ONCE.
# lddtree does not have the -V (version) nor the -l (list) options prior to version 1.18
if lddtree -V > /dev/null 2>&1 ; then
lddtree -l "$@" \
| sort \
| uniq \
| cpio -p --make-directories --dereference --quiet "${destdir}" \
|| gen_die "Binary ${f} or some of its library dependencies could not be copied"
else
lddtree "$@" \ lddtree "$@" \
| tr ')(' '\n' \ | tr ')(' '\n' \
| awk '/=>/{ if($3 ~ /^\//){print $3}}' \ | awk '/=>/{ if($3 ~ /^\//){print $3}}' \
@ -40,6 +48,7 @@ copy_binaries() {
| uniq \ | uniq \
| cpio -p --make-directories --dereference --quiet "${destdir}" \ | cpio -p --make-directories --dereference --quiet "${destdir}" \
|| gen_die "Binary ${f} or some of its library dependencies could not be copied" || gen_die "Binary ${f} or some of its library dependencies could not be copied"
fi
} }
log_future_cpio_content() { log_future_cpio_content() {

Loading…
Cancel
Save