diff --git a/distro/adaptation-pkg/debian b/distro/adaptation-pkg/debian index 17312fc02..85084c173 100644 --- a/distro/adaptation-pkg/debian +++ b/distro/adaptation-pkg/debian @@ -67,18 +67,18 @@ otc_ddt:: packetdrill:: pbzip2:: pepc:: -perf-bench-futex: linux-perf -perf-c2c: linux-perf +perf:: +perf-bench-futex: perf +perf-c2c: perf perf-event-tests:: -perf-mem: linux-perf -perf-node: linux-perf -perf-probe: linux-perf -perf-profile: linux-perf -perf-record-report: linux-perf -perf-report-srcline: linux-perf -perf-sanity-tests: linux-perf -perf-stat: linux-perf -perf: linux-perf +perf-mem: perf +perf-node: perf +perf-probe: perf +perf-profile: perf +perf-record-report: perf +perf-report-srcline: perf +perf-sanity-tests: perf +perf-stat: perf pft:: phoronix-test-suite:: phpbench:: diff --git a/distro/adaptation-pkg/ubuntu b/distro/adaptation-pkg/ubuntu index cd427f4af..5b064b5cc 100644 --- a/distro/adaptation-pkg/ubuntu +++ b/distro/adaptation-pkg/ubuntu @@ -68,18 +68,18 @@ otc_ddt:: packetdrill:: pbzip2:: pepc:: -perf-bench-futex: linux-tools-common -perf-c2c: linux-tools-common +perf-bench-futex: perf +perf-c2c: perf perf-event-tests:: -perf-mem: linux-tools-common -perf-node: linux-tools-common -perf-probe: linux-tools-common -perf-profile: linux-tools-common -perf-record-report: linux-tools-common -perf-report-srcline: linux-tools-common -perf-sanity-tests: linux-tools-common -perf-stat: linux-tools-common -perf: linux-tools-common +perf-mem: perf +perf-node: perf +perf-probe: perf +perf-profile: perf +perf-record-report: perf +perf-report-srcline: perf +perf-sanity-tests: perf +perf-stat: perf +perf:: pft:: phoronix-test-suite:: phpbench:: @@ -121,7 +121,7 @@ turbostat: linux-tools-generic unixbench:: uperf:: v4l2:: -vm-scalability:: +vm-scalability:: vmem:: will-it-scale:: xfstests:: diff --git a/lkp-exec/install b/lkp-exec/install index 44d43f3c1..9638fd528 100755 --- a/lkp-exec/install +++ b/lkp-exec/install @@ -144,6 +144,20 @@ verify_install() { local pkg=$1 local pkg_lkp=$pkg-lkp + # FIXME consider to put below mapping to adaptation + # + # These are not real packages in debian but are required commands, which are + # installed by the corresponding os packages. Need use the name of the os + # packages so that dpkg -V can do the right check. The other way is to use + # has_cmd to check installed or not, but "which perf" returns /usr/bin/perf that + # is a wrapper instead of actual perf. + # + # Here also use -f /.dockerenv as a hack to only do this inside docker to reduce + # unnecessary re-installation that requires clone the linux repo. + [ -f /.dockerenv -a $DISTRO = debian ] && { + [ "$pkg" = perf ] && pkg=linux-perf + } + case $DISTRO in debian|ubuntu) [[ ! $(dpkg -V "$pkg" 2>&1) ]] || [[ ! $(dpkg -V "${pkg_lkp}" 2>&1) ]];;