From 1795ddca0ece92202b9fcd5d479fc90ecfa85e06 Mon Sep 17 00:00:00 2001 From: Andrey Vagin Date: Thu, 11 Jul 2013 19:05:31 +0400 Subject: [PATCH] zdtm: fix path to libriries on RPi Remove the first part from linues like this: libc.so.6 => /lib/arm-linux-gnueabihf/libc.so.6 (0xb6d83000) Signed-off-by: Andrey Vagin Signed-off-by: Pavel Emelyanov --- test/zdtm.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/test/zdtm.sh b/test/zdtm.sh index 2d88f2779..9553ef93c 100755 --- a/test/zdtm.sh +++ b/test/zdtm.sh @@ -222,7 +222,20 @@ construct_root() cp $ps_path $root/bin mkdir -p $libdir $libdir2 - for i in `ldd $test_path $ps_path | grep -P '^\s' | awk '{ print $1 }' | grep -v vdso`; do + + # $ ldd /bin/ps test/zdtm/live/static/env00 + # /bin/ps: + # /usr/lib/arm-linux-gnueabihf/libcofi_rpi.so (0xb6f39000) + # libprocps.so.0 => /lib/arm-linux-gnueabihf/libprocps.so.0 (0xb6f04000) + # libgcc_s.so.1 => /lib/arm-linux-gnueabihf/libgcc_s.so.1 (0xb6edc000) + # libc.so.6 => /lib/arm-linux-gnueabihf/libc.so.6 (0xb6dad000) + # /lib/ld-linux-armhf.so.3 (0xb6f46000) + # test/zdtm/live/static/env00: + # /usr/lib/arm-linux-gnueabihf/libcofi_rpi.so (0xb6efe000) + # libc.so.6 => /lib/arm-linux-gnueabihf/libc.so.6 (0xb6dc5000) + # /lib/ld-linux-armhf.so.3 (0xb6f0b000) + + for i in `ldd $test_path $ps_path | grep -P '^\s' | sed "s/.*=> //" | awk '{ print $1 }' | grep -v vdso`; do local lib=`basename $i` [ -f $libdir/$lib ] && continue || [ -f $i ] && cp $i $libdir && cp $i $libdir2 && continue ||