diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template index 250f011087..a1fe214566 100644 --- a/srcpkgs/linux-tools/template +++ b/srcpkgs/linux-tools/template @@ -1,7 +1,7 @@ # Template file for 'linux-tools' pkgname=linux-tools version=4.1 -revision=4 +revision=5 build_style=meta wrksrc="linux-${version}" short_desc="Linux kernel tools meta-pkg" @@ -34,8 +34,7 @@ post_extract() { do_build() { cd ${wrksrc}/tools/perf make ${makejobs} CC=$CC LD=$LD CFLAGS="$CFLAGS" EXTRA_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ - WERROR=0 DESTDIR=${DESTDIR}/usr \ - perfexecdir='lib/perf' \ + WERROR=0 DESTDIR=${DESTDIR} prefix=/usr lib=lib/perf \ NO_GTK2=1 \ PERF_VERSION=${version}_${revision} \ all man @@ -75,14 +74,13 @@ do_install() { # perf cd ${wrksrc}/tools/perf make CC=$CC LD=$LD CFLAGS="$CFLAGS" EXTRA_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ - WERROR=0 DESTDIR=${DESTDIR}/usr \ - perfexecdir='lib/perf' \ + WERROR=0 DESTDIR=${DESTDIR} prefix=/usr lib=lib/perf \ NO_GTK2=1 \ PERF_VERSION=${version}_${revision} \ install install-man # move completion in new directory vmkdir usr/share/bash-completion/completions - mv ${DESTDIR}/usr/etc/bash_completion.d/perf \ + mv ${DESTDIR}/etc/bash_completion.d/perf \ ${DESTDIR}/usr/share/bash-completion/completions # usbip @@ -142,7 +140,7 @@ perf_package() { pkg_install() { vmove usr/bin/perf vmove usr/bin/trace - vmove usr/lib/traceevent + vmove usr/lib/perf/traceevent vmove usr/libexec/perf-core vmove usr/share/bash-completion vmove "usr/share/man/man1/perf*"