From d6c9d29ca64a4a9eec3214235b6946e83b054cdf Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 21 Mar 2017 08:55:25 +0100 Subject: [PATCH 1/7] perf: Convert to versionless bee file --- perf-4.4.2-0.bee => perf.be0 | 2 ++ 1 file changed, 2 insertions(+) rename perf-4.4.2-0.bee => perf.be0 (94%) diff --git a/perf-4.4.2-0.bee b/perf.be0 similarity index 94% rename from perf-4.4.2-0.bee rename to perf.be0 index c38099952..4a3965a5e 100755 --- a/perf-4.4.2-0.bee +++ b/perf.be0 @@ -1,5 +1,7 @@ #!/bin/env beesh +# BEE_VERSION perf-4.4.2-0 + PGRP=( core ) KERNELVERSION=${PKGVERSION} From c68bc406ecdebed757e0704d580c596588e3c7d2 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 21 Mar 2017 09:04:55 +0100 Subject: [PATCH 2/7] perf: Update URL --- perf.be0 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/perf.be0 b/perf.be0 index 4a3965a5e..18c9137e2 100755 --- a/perf.be0 +++ b/perf.be0 @@ -5,8 +5,7 @@ PGRP=( core ) KERNELVERSION=${PKGVERSION} -#SRCURL[0]="https://github.com/torvalds/linux/tarball/v${PKGVERSION} perf-${PKGVERSION}.tar.bz2" -SRCURL[0]="ftp://ftp.kernel.org/pub/linux/kernel/v${PKGVERSION[1]}.x/linux-${PKGVERSION}.tar.xz" +SRCURL[0]=https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-$KERNELVERSION.tar.xz # EXCLUDE="" From ade6b5cbea611b592269baf1cdb116978e7c0cb2 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 21 Mar 2017 09:16:00 +0100 Subject: [PATCH 3/7] perf: Remove PGRP definition --- perf.be0 | 1 - 1 file changed, 1 deletion(-) diff --git a/perf.be0 b/perf.be0 index 18c9137e2..f021d9948 100755 --- a/perf.be0 +++ b/perf.be0 @@ -2,7 +2,6 @@ # BEE_VERSION perf-4.4.2-0 -PGRP=( core ) KERNELVERSION=${PKGVERSION} SRCURL[0]=https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-$KERNELVERSION.tar.xz From 5afcc8dc15705676dd9aef30cb10793a402ccdf7 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 21 Mar 2017 09:18:40 +0100 Subject: [PATCH 4/7] perf: Disable build archive We don't need another archive of the complete kernel, so save the time and space. --- perf.be0 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/perf.be0 b/perf.be0 index f021d9948..db1c3e048 100755 --- a/perf.be0 +++ b/perf.be0 @@ -6,6 +6,8 @@ KERNELVERSION=${PKGVERSION} SRCURL[0]=https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-$KERNELVERSION.tar.xz +OPT_ARCHIVE_BUILD=no + # EXCLUDE="" mee_configure() { From 5b8d176899b9e39a4dc16df340eddb90205a4c19 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 21 Mar 2017 09:21:02 +0100 Subject: [PATCH 5/7] perf: Update from version 4.4.2 to version 4.4.52 Match current default kernel. --- perf.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perf.be0 b/perf.be0 index db1c3e048..22d077ae0 100755 --- a/perf.be0 +++ b/perf.be0 @@ -1,6 +1,6 @@ #!/bin/env beesh -# BEE_VERSION perf-4.4.2-0 +# BEE_VERSION perf-4.4.52-0 KERNELVERSION=${PKGVERSION} From 9c932cdaf06d865f2f437b727263226c71417030 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 21 Mar 2017 09:37:37 +0100 Subject: [PATCH 6/7] perf: Use standard bee commands MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Luckily, perf uses standard build rules, so bee is able to do everything be itself. This way, make flags can also be specified, and for example parallel builds are also possible. ``` […] [BEE] => entering bee_build() .. [BEE] make -j 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 BUILD: Doing 'make -j8' parallel build Auto-detecting system features: ... dwarf: [ on ] ... glibc: [ on ] ... gtk2: [ on ] ... libaudit: [ OFF ] ... libbfd: [ OFF ] ... libelf: [ on ] ... libnuma: [ on ] ... numa_num_possible_cpus: [ OFF ] ... libperl: [ on ] ... libpython: [ on ] ... libslang: [ on ] ... libunwind: [ OFF ] ... libdw-dwarf-unwind: [ on ] ... zlib: [ on ] ... lzma: [ on ] ... get_cpuid: [ on ] ... bpf: [ on ] […] [BEE] => entering bee_install() .. [BEE] make -j 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=/dev/shm/bee-root/perf/perf-4.4.52-0/image ``` --- perf.be0 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/perf.be0 b/perf.be0 index 22d077ae0..a85b47b39 100755 --- a/perf.be0 +++ b/perf.be0 @@ -14,13 +14,13 @@ mee_configure() { cd ${S}/tools/perf } -mee_build() { - echo "build $@" - make prefix=${PREFIX} -} - -mee_install() { - echo "install $@" - - make install prefix=${PREFIX} DESTDIR=${D} -} +#mee_build() { +# echo "build $@" +# make prefix=${PREFIX} +#} + +#mee_install() { +# echo "install $@" +# +# make install prefix=${PREFIX} DESTDIR=${D} +#} From 92b9bd754c831a002db97b475090095183ee61fb Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 21 Mar 2017 09:43:01 +0100 Subject: [PATCH 7/7] perf: Use bee variable to specify source directory --- perf.be0 | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/perf.be0 b/perf.be0 index a85b47b39..acafe8802 100755 --- a/perf.be0 +++ b/perf.be0 @@ -6,21 +6,20 @@ KERNELVERSION=${PKGVERSION} SRCURL[0]=https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-$KERNELVERSION.tar.xz +sourcesubdir_append tools/perf + OPT_ARCHIVE_BUILD=no # EXCLUDE="" -mee_configure() { - cd ${S}/tools/perf -} +#mee_configure() { +# bee_configure +#} #mee_build() { -# echo "build $@" -# make prefix=${PREFIX} +# bee_build #} #mee_install() { -# echo "install $@" -# -# make install prefix=${PREFIX} DESTDIR=${D} +# bee_install #}