From dfdfe42e77bdaa9b36544e370ade18d2f9326564 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 20 May 2020 09:14:36 +0200 Subject: [PATCH 1/3] perf: Update to current mTEMPLATE --- perf.be0 | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/perf.be0 b/perf.be0 index 1972f6f4b..c738c99d9 100755 --- a/perf.be0 +++ b/perf.be0 @@ -1,8 +1,14 @@ -#!/bin/env beesh +#!/usr/bin/env beesh # BEE_VERSION perf-4.19.57-0 -SRCURL[0]=https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${PKGVERSION}.tar.xz +# more info: https://foo.bar.com + +SRCURL[0]="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${PKGVERSION}.tar.xz" + +# PATCHURL+=() + +# build_in_sourcedir sourcesubdir_append tools/perf @@ -12,6 +18,14 @@ mee_patch_post() { sed -i 's/lib = lib64/lib = lib/' Makefile.config } +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + #mee_configure() { # bee_configure #} @@ -27,4 +41,4 @@ mee_patch_post() { mee_install_post() { rm -vrf ${D}/etc/bash_completion.d rm -vrf ${D}/lib/perf/examples -} \ No newline at end of file +} From 1ce5204e523dd232ec946db42bd5a6f0ca96bddd Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 20 May 2020 09:38:42 +0200 Subject: [PATCH 2/3] perf: Update version from 4.19.57 to 5.6.14 Update to latest stable kernel version. After the update the following warnings are gone: Makefile.config:614: GTK2 not found, disables GTK2 support. Please install gtk2-devel or libgtk2.0-dev and Warning: Kernel ABI header at 'tools/include/uapi/drm/i915_drm.h' differs from latest version at 'include/uapi/drm/i915_drm.h' Warning: Kernel ABI header at 'tools/arch/x86/include/asm/cpufeatures.h' differs from latest version at 'arch/x86/include/asm/cpufeatures.h' Warning: Kernel ABI header at 'tools/arch/x86/include/uapi/asm/kvm.h' differs from latest version at 'arch/x86/include/uapi/asm/kvm.h' Warning: Kernel ABI header at 'tools/arch/x86/lib/memcpy_64.S' differs from latest version at 'arch/x86/lib/memcpy_64.S' Warning: Kernel ABI header at 'tools/include/uapi/linux/mman.h' differs from latest version at 'include/uapi/linux/mman.h' Warning: Kernel ABI header at 'tools/include/uapi/linux/bpf.h' differs from latest version at 'include/uapi/linux/bpf.h' Warning: Kernel ABI header at 'tools/include/uapi/drm/i915_drm.h' differs from latest version at 'include/uapi/drm/i915_drm.h' Warning: Kernel ABI header at 'tools/arch/x86/include/asm/cpufeatures.h' differs from latest version at 'arch/x86/include/asm/cpufeatures.h' Warning: Kernel ABI header at 'tools/arch/x86/include/uapi/asm/kvm.h' differs from latest version at 'arch/x86/include/uapi/asm/kvm.h' Warning: Kernel ABI header at 'tools/arch/x86/lib/memcpy_64.S' differs from latest version at 'arch/x86/lib/memcpy_64.S' Warning: Kernel ABI header at 'tools/include/uapi/linux/mman.h' differs from latest version at 'include/uapi/linux/mman.h' Warning: Kernel ABI header at 'tools/include/uapi/linux/bpf.h' differs from latest version at 'include/uapi/linux/bpf.h' --- perf.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perf.be0 b/perf.be0 index c738c99d9..75b923b49 100755 --- a/perf.be0 +++ b/perf.be0 @@ -1,10 +1,10 @@ #!/usr/bin/env beesh -# BEE_VERSION perf-4.19.57-0 +# BEE_VERSION perf-5.6.14-0 # more info: https://foo.bar.com -SRCURL[0]="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${PKGVERSION}.tar.xz" +SRCURL[0]="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${PKGVERSION}.tar.xz" # PATCHURL+=() From eefd863ecb27b519dc19a114f6831280f4a66646 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 20 May 2020 10:00:34 +0200 Subject: [PATCH 3/3] perf: Supply lower case prefix to "make install" The man pages can't be found: buczek@geniux:~$ perf help stat No manual entry for perf-stat The reason is, that the files get installed into "/" instread if "/usr", because upper case PREFIX seems to be ignored by the build system. So the man-pages where installed on the distmaster into /share/man, which is invalid and is not disted to other nodes. [BEE] make -j 12 install PREFIX=/usr EPREFIX=/usr BINDIR=/usr/bin SBINDIR=/usr/sbin LIBEXECDIR=/usr/libexec SYSCONFDIR=/etc SHAREDSTATEDIR=/var LOCALSTATEDIR=/var LIBDIR=/usr/lib INCLUDEDIR=/usr/include DATAROOTDIR=/usr/share DATADIR=/usr/share INFODIR=/usr/share/info LOCALEDIR=/usr/share/locale MANDIR=/usr/share/man DOCDIR=/usr/share/doc/perf DESTDIR=/scr atch/local/bee-buczek/perf/perf-5.6.14-0/image [...] -rwxr-xr-x root/root 1034256 2020-05-20 09:38 /lib/libperf-gtk.so drwxr-xr-x root/root 0 2020-05-20 09:38 /lib/traceevent/ drwxr-xr-x root/root 0 2020-05-20 09:38 /lib/traceevent/plugins/ -rwxr-xr-x root/root 18032 2020-05-20 09:38 /lib/traceevent/plugins/plugin_jbd2.so -rwxr-xr-x root/root 20328 2020-05-20 09:38 /lib/traceevent/plugins/plugin_hrtimer.so [...] Supply lower-cased prefixed argument as well, which seems to be honored: [BEE] make -j 12 install PREFIX=/usr EPREFIX=/usr BINDIR=/usr/bin SBINDIR=/usr/sbin LIBEXECDIR=/usr/libexec SYSCONFDIR=/etc SHAREDSTATEDIR=/var LOCALSTATEDIR=/var LIBDIR=/usr/lib INCLUDEDIR=/usr/include DATAROOTDIR=/usr/share DATADIR=/usr/share INFODIR=/usr/share/info LOCALEDIR=/usr/share/locale MANDIR=/usr/share/man DOCDIR=/usr/share/doc/perf DESTDIR=/scr atch/local/bee-buczek/perf/perf-5.6.14-0/image prefix=/usr [...] drwxr-xr-x root/root 0 2020-05-20 09:58 /usr/lib/traceevent/ drwxr-xr-x root/root 0 2020-05-20 09:58 /usr/lib/traceevent/plugins/ -rwxr-xr-x root/root 18032 2020-05-20 09:58 /usr/lib/traceevent/plugins/plugin_jbd2.so -rwxr-xr-x root/root 20328 2020-05-20 09:58 /usr/lib/traceevent/plugins/plugin_hrtimer.so [...] Because PREFIX is now honored, remove $D$PREFIX/lib/perf/examples instead of $D/lib/perf/examples. --- perf.be0 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/perf.be0 b/perf.be0 index 75b923b49..e9ba4b736 100755 --- a/perf.be0 +++ b/perf.be0 @@ -34,11 +34,11 @@ mee_patch_post() { # bee_build #} -#mee_install() { -# bee_install -#} +mee_install() { + bee_install prefix=$PREFIX +} mee_install_post() { rm -vrf ${D}/etc/bash_completion.d - rm -vrf ${D}/lib/perf/examples + rm -vrf ${D}${PREFIX}/lib/perf/examples }