Version updates of trace-cmd and sysbench

meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb → meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb

@@ -2,20 +2,20 @@ SUMMARY = "System performance benchmark"
 HOMEPAGE = "http://github.com/akopytov/sysbench"
 SECTION = "console/tests"
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-inherit autotools
+DEPENDS = "libtool libaio luajit"
+
+inherit autotools-brokensep pkgconfig
 
 # The project has moved from Sourceforge to Launchpad, to Github. Use the source tarball from
 # Launchpad until the next release is available from Github.
-SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+files/${BPN}_${PV}.orig.tar.gz \
-           file://0001-Adding-volatile-modifier-to-tmp-variable-in-memory-t.patch \
-           "
+SRC_URI = "git://github.com/akopytov/sysbench.git;protocol=https;branch=master"
+SRCREV = "ebf1c90da05dea94648165e4f149abc20c979557"
 
-SRC_URI[md5sum] = "3a6d54fdd3fe002328e4458206392b9d"
-SRC_URI[sha256sum] = "83fa7464193e012c91254e595a89894d8e35b4a38324b52a5974777e3823ea9e"
+S = "${WORKDIR}/git"
 
-EXTRA_OECONF += "--enable-largefile"
+EXTRA_OECONF += "--enable-largefile --with-system-luajit"
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[aio] = "--enable-aio,--disable-aio,libaio,"
 PACKAGECONFIG[mysql] = "--with-mysql \

meta-oe/recipes-kernel/libtraceevent/libtraceevent/0001-libtraceevent-make-it-possible-to-set-libdir-and-man.patch

@@ -0,0 +1,33 @@
+From 2014d037d3488f1a53e1c0c83263e77322ac14ef Mon Sep 17 00:00:00 2001
+From: Peter Bergin <peter@berginkonsult.se>
+Date: Mon, 19 Sep 2022 17:21:28 +0200
+Subject: [PATCH] libtraceevent: make it possible to set libdir and mandir from
+ outside
+
+When building in build frameworks such as openembedded it is desired
+to use the defintion of libdir and mandir from the build framework.
+
+Upstream-Status: Submitted [https://lore.kernel.org/linux-trace-devel/20221031212140.170601-1-peter@berginkonsult.se]
+Signed-off-by: Peter Bergin <peter@berginkonsult.se>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 194bbdd..aa1984d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -45,8 +45,8 @@ endif
+
+ libdir_relative ?= $(libdir_relative_temp)
+ prefix ?= /usr/local
+-libdir = $(prefix)/$(libdir_relative)
+-man_dir = $(prefix)/share/man
++libdir ?= $(prefix)/$(libdir_relative)
++man_dir ?= $(prefix)/share/man
+ man_dir_SQ = '$(subst ','\'',$(man_dir))'
+ pkgconfig_dir ?= $(word 1,$(shell $(PKG_CONFIG) 		\
+ 			--variable pc_path pkg-config | tr ":" " "))
+-- 
+2.34.1
+

meta-oe/recipes-kernel/libtraceevent/libtraceevent_1.6.2.bb

@@ -0,0 +1,32 @@
+SUMMARY = "Library that provides APIs to access kernel tracepoint events"
+
+LICENSE = "GPL-2.0-only & LGPL-2.1-only"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 \
+    file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd \
+    "
+
+SRC_URI = " \
+    git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;branch=libtraceevent;protocol=https \
+    file://0001-libtraceevent-make-it-possible-to-set-libdir-and-man.patch \
+    "
+
+SRCREV = "424b11f6c3ab2e3bb199180e142fbcf9eebf2ac3"
+
+S = "${WORKDIR}/git"
+
+inherit pkgconfig
+
+do_install () {
+    oe_runmake 'DESTDIR=${D}' install
+    # Because makefile uses cp instead of install we need to change owner of files
+    chown -R root:root ${D}${libdir}
+    # Dirty hack to move .pc file to correct place
+    mkdir -p ${D}${libdir}/pkgconfig
+    find ${D} -type f -name ${PN}.pc -exec mv {} ${D}${libdir}/pkgconfig/ \; -quit
+    rm -rf ${D}/`echo ${TMPDIR} | cut -d/ -f2`
+}
+
+PACKAGES += "${PN}-plugins"
+
+FILES:${PN}-plugins += "${libdir}/traceevent/plugins"

meta-oe/recipes-kernel/libtracefs/libtracefs/0001-libtraceevent-make-it-possible-to-set-libdir-include.patch

@@ -0,0 +1,38 @@
+From 416c8a39a221a43245d5c89af4fae48f03fd9563 Mon Sep 17 00:00:00 2001
+From: Peter Bergin <peter@berginkonsult.se>
+Date: Mon, 19 Sep 2022 17:21:28 +0200
+Subject: [PATCH] libtraceevent: make it possible to set libdir,includedir and
+ mandir from outside
+
+When building in build frameworks such as openembedded it is desired
+to use the defintion of directories from the build framework.
+
+Upstream-Status: Submitted [https://lore.kernel.org/linux-trace-devel/20221101111143.191772-1-peter@berginkonsult.se/]
+Signed-off-by: Peter Bergin <peter@berginkonsult.se>
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index aa659b4..321fc4c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -52,12 +52,12 @@ endif
+
+ libdir_relative ?= $(libdir_relative_temp)
+ prefix ?= /usr/local
+-man_dir = $(prefix)/share/man
++man_dir ?= $(prefix)/share/man
+ man_dir_SQ = '$(subst ','\'',$(man_dir))'
+-libdir = $(prefix)/$(libdir_relative)
++libdir ?= $(prefix)/$(libdir_relative)
+ libdir_SQ = '$(subst ','\'',$(libdir))'
+ includedir_relative ?= include/tracefs
+-includedir = $(prefix)/$(includedir_relative)
++includedir ?= $(prefix)/$(includedir_relative)
+ includedir_SQ = '$(subst ','\'',$(includedir))'
+ pkgconfig_dir ?= $(word 1,$(shell $(PKG_CONFIG) 		\
+ 			--variable pc_path pkg-config | tr ":" " "))
+-- 
+2.34.1
+

meta-oe/recipes-kernel/libtracefs/libtracefs_1.4.2.bb

@@ -0,0 +1,30 @@
+SUMMARY = "Linux kernel trace file system library"
+
+LICENSE = "GPL-2.0-only & LGPL-2.1-only"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 \
+    file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd \
+    "
+
+DEPENDS = "libtraceevent"
+
+SRC_URI = " \
+    git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git;branch=libtracefs;protocol=https \
+    file://0001-libtraceevent-make-it-possible-to-set-libdir-include.patch \
+    "
+
+SRCREV = "5ba3308a912c4e1987d993a68aa35f217acdc728"
+
+S = "${WORKDIR}/git"
+
+inherit pkgconfig
+
+do_install () {
+    oe_runmake 'DESTDIR=${D}' install
+    # Because makefile uses cp instead of install we need to change owner of files
+    chown -R root:root ${D}${libdir}
+    # Dirty hack to move .pc file to correct place
+    mkdir -p ${D}${libdir}/pkgconfig
+    find ${D} -type f -name ${PN}.pc -exec mv {} ${D}${libdir}/pkgconfig/ \; -quit
+    rm -rf ${D}/`echo ${TMPDIR} | cut -d/ -f2`
+}

meta-oe/recipes-kernel/trace-cmd/trace-cmd/0001-trace-cmd-make-it-build-against-musl-C-library.patch

@@ -0,0 +1,28 @@
+From f83fc5ca06e15729274463532173247d10268215 Mon Sep 17 00:00:00 2001
+From: Peter Bergin <peter@berginkonsult.se>
+Date: Tue, 1 Nov 2022 11:53:25 +0100
+Subject: [PATCH] trace-cmd: make it build against musl C library
+
+Add missing header file to make it compile with musl C library.
+
+Upstream-Status: Submitted [https://lore.kernel.org/linux-trace-devel/20221101105803.191324-1-peter@berginkonsult.se/]
+Signed-off-by: Peter Bergin <peter@berginkonsult.se>
+---
+ lib/trace-cmd/trace-timesync-kvm.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/trace-cmd/trace-timesync-kvm.c b/lib/trace-cmd/trace-timesync-kvm.c
+index aa1799b1..bbef8b60 100644
+--- a/lib/trace-cmd/trace-timesync-kvm.c
++++ b/lib/trace-cmd/trace-timesync-kvm.c
+@@ -10,6 +10,7 @@
+ #include <sys/stat.h>
+ #include <dirent.h>
+ #include <ctype.h>
++#include <limits.h>
+
+ #include "trace-cmd.h"
+ #include "trace-cmd-private.h"
+-- 
+2.35.0
+