diff --git a/meta-oe/recipes-benchmark/sysbench/sysbench/0001-Adding-volatile-modifier-to-tmp-variable-in-memory-t.patch b/meta-oe/recipes-benchmark/sysbench/sysbench/0001-Adding-volatile-modifier-to-tmp-variable-in-memory-t.patch deleted file mode 100644 index d628e81b560..00000000000 --- a/meta-oe/recipes-benchmark/sysbench/sysbench/0001-Adding-volatile-modifier-to-tmp-variable-in-memory-t.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c1ebf893e32a0a77e820484d48a903523fef7c1b Mon Sep 17 00:00:00 2001 -From: Vasily Tarasov -Date: Fri, 10 Jun 2016 14:33:48 -0400 -Subject: [PATCH] Adding volatile modifier to tmp variable in memory test - -Issue explanation: - -./sysbench/sysbench --test=memory --num-threads=16 \ - --memory-block-size=268435456 \ - --memory-total-size=137438953472 \ - --memory-oper=read \ - --memory-access-mode=seq \ - --memory-scope=local run - -Without this commit the time to run the above command is 0.0004 seconds. -With this commit the time is greater than 3 seconds. Essentially, -without the volatile modifier, the compiler optimizes read access so -that no real access happens. - -Upstream-Status: Backport [part of v1.0.0 https://github.com/akopytov/sysbench/commit/8753cb93be4c0b81a20b704ced91e7a422da52b1] - -(cherry picked from commit 8753cb93be4c0b81a20b704ced91e7a422da52b1) -Signed-off-by: massimo toscanelli ---- - sysbench/tests/memory/sb_memory.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sysbench/tests/memory/sb_memory.c b/sysbench/tests/memory/sb_memory.c -index 2e8998f..7d22bb9 100644 ---- a/sysbench/tests/memory/sb_memory.c -+++ b/sysbench/tests/memory/sb_memory.c -@@ -244,7 +244,7 @@ sb_request_t memory_get_request(int tid) - int memory_execute_request(sb_request_t *sb_req, int thread_id) - { - sb_mem_request_t *mem_req = &sb_req->u.mem_request; -- int tmp = 0; -+ volatile int tmp = 0; - int idx; - int *buf, *end; - log_msg_t msg; diff --git a/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb b/meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb similarity index 59% rename from meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb rename to meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb index 4ac78fb8fd1..1e4fe38e243 100644 --- a/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb +++ b/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 \ diff --git a/meta-oe/recipes-kernel/libtraceevent/libtraceevent/0001-libtraceevent-make-it-possible-to-set-libdir-and-man.patch b/meta-oe/recipes-kernel/libtraceevent/libtraceevent/0001-libtraceevent-make-it-possible-to-set-libdir-and-man.patch new file mode 100644 index 00000000000..a592d5a9e0b --- /dev/null +++ b/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 +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 +--- + 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 + diff --git a/meta-oe/recipes-kernel/libtraceevent/libtraceevent_1.6.2.bb b/meta-oe/recipes-kernel/libtraceevent/libtraceevent_1.6.2.bb new file mode 100644 index 00000000000..238dbfa7ad7 --- /dev/null +++ b/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" diff --git a/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-libtraceevent-make-it-possible-to-set-libdir-include.patch b/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-libtraceevent-make-it-possible-to-set-libdir-include.patch new file mode 100644 index 00000000000..a459bb909a3 --- /dev/null +++ b/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 +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 +--- + 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 + diff --git a/meta-oe/recipes-kernel/libtracefs/libtracefs_1.4.2.bb b/meta-oe/recipes-kernel/libtracefs/libtracefs_1.4.2.bb new file mode 100644 index 00000000000..b9d130a48e5 --- /dev/null +++ b/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` +} diff --git a/meta-oe/recipes-kernel/trace-cmd/files/0001-trace-cmd-make-it-build-with-musl.patch b/meta-oe/recipes-kernel/trace-cmd/files/0001-trace-cmd-make-it-build-with-musl.patch deleted file mode 100644 index 220991804b9..00000000000 --- a/meta-oe/recipes-kernel/trace-cmd/files/0001-trace-cmd-make-it-build-with-musl.patch +++ /dev/null @@ -1,132 +0,0 @@ -From b63f13d2df91ede45288653b21e0d30a6b45f2ac Mon Sep 17 00:00:00 2001 -From: Beniamin Sandu -Date: Mon, 30 Nov 2020 18:24:48 +0200 -Subject: [PATCH] trace-cmd: make it build with musl - -Signed-off-by: Beniamin Sandu ---- - include/trace-cmd/trace-cmd.h | 1 + - lib/trace-cmd/trace-msg.c | 1 + - lib/trace-cmd/trace-plugin.c | 2 ++ - lib/tracefs/tracefs-events.c | 1 + - tracecmd/trace-agent.c | 1 + - tracecmd/trace-setup-guest.c | 1 + - tracecmd/trace-tsync.c | 15 ++++++++++----- - 7 files changed, 17 insertions(+), 5 deletions(-) - -diff --git a/include/trace-cmd/trace-cmd.h b/include/trace-cmd/trace-cmd.h -index f3c95f3..a697905 100644 ---- a/include/trace-cmd/trace-cmd.h -+++ b/include/trace-cmd/trace-cmd.h -@@ -6,6 +6,7 @@ - #ifndef _TRACE_CMD_H - #define _TRACE_CMD_H - -+#include - #include "traceevent/event-parse.h" - - #define TRACECMD_MAGIC { 23, 8, 68 } -diff --git a/lib/trace-cmd/trace-msg.c b/lib/trace-cmd/trace-msg.c -index 4a0bfa9..fc1f2c7 100644 ---- a/lib/trace-cmd/trace-msg.c -+++ b/lib/trace-cmd/trace-msg.c -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - #include "trace-write-local.h" - #include "trace-cmd-local.h" -diff --git a/lib/trace-cmd/trace-plugin.c b/lib/trace-cmd/trace-plugin.c -index 92f9edf..c2ef3dc 100644 ---- a/lib/trace-cmd/trace-plugin.c -+++ b/lib/trace-cmd/trace-plugin.c -@@ -8,6 +8,8 @@ - #include - #include - #include -+#include -+ - #include "trace-cmd.h" - #include "trace-local.h" - -diff --git a/lib/tracefs/tracefs-events.c b/lib/tracefs/tracefs-events.c -index 8e825f5..a8d8560 100644 ---- a/lib/tracefs/tracefs-events.c -+++ b/lib/tracefs/tracefs-events.c -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #include "kbuffer.h" - #include "tracefs.h" -diff --git a/tracecmd/trace-agent.c b/tracecmd/trace-agent.c -index b581696..abfefac 100644 ---- a/tracecmd/trace-agent.c -+++ b/tracecmd/trace-agent.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - - #include "trace-local.h" - #include "trace-msg.h" -diff --git a/tracecmd/trace-setup-guest.c b/tracecmd/trace-setup-guest.c -index 899848c..99595a1 100644 ---- a/tracecmd/trace-setup-guest.c -+++ b/tracecmd/trace-setup-guest.c -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #include "trace-local.h" - #include "trace-msg.h" -diff --git a/tracecmd/trace-tsync.c b/tracecmd/trace-tsync.c -index e639788..b8b5ac3 100644 ---- a/tracecmd/trace-tsync.c -+++ b/tracecmd/trace-tsync.c -@@ -104,13 +104,15 @@ int tracecmd_host_tsync(struct buffer_instance *instance, - - pthread_attr_init(&attrib); - pthread_attr_setdetachstate(&attrib, PTHREAD_CREATE_JOINABLE); -- if (!get_first_cpu(&pin_mask, &mask_size)) -- pthread_attr_setaffinity_np(&attrib, mask_size, pin_mask); - - ret = pthread_create(&instance->tsync_thread, &attrib, - tsync_host_thread, &instance->tsync); -- if (!ret) -+ if (!ret) { -+ if (!get_first_cpu(&pin_mask, &mask_size)) -+ pthread_setaffinity_np(instance->tsync_thread, mask_size, pin_mask); - instance->tsync_thread_running = true; -+ } -+ - if (pin_mask) - CPU_FREE(pin_mask); - pthread_attr_destroy(&attrib); -@@ -243,11 +245,14 @@ unsigned int tracecmd_guest_tsync(char *tsync_protos, - pthread_attr_init(&attrib); - tsync->sync_proto = proto; - pthread_attr_setdetachstate(&attrib, PTHREAD_CREATE_JOINABLE); -- if (!get_first_cpu(&pin_mask, &mask_size)) -- pthread_attr_setaffinity_np(&attrib, mask_size, pin_mask); - - ret = pthread_create(thr_id, &attrib, tsync_agent_thread, tsync); - -+ if (!ret) { -+ if (!get_first_cpu(&pin_mask, &mask_size)) -+ pthread_setaffinity_np(*thr_id, mask_size, pin_mask); -+ } -+ - if (pin_mask) - CPU_FREE(pin_mask); - pthread_attr_destroy(&attrib); --- -2.25.1 - diff --git a/meta-oe/recipes-kernel/trace-cmd/trace-cmd/0001-trace-cmd-make-it-build-against-musl-C-library.patch b/meta-oe/recipes-kernel/trace-cmd/trace-cmd/0001-trace-cmd-make-it-build-against-musl-C-library.patch new file mode 100644 index 00000000000..2affaf804fa --- /dev/null +++ b/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 +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 +--- + 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 + #include + #include ++#include + + #include "trace-cmd.h" + #include "trace-cmd-private.h" +-- +2.35.0 + diff --git a/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb b/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb deleted file mode 100644 index 66407073829..00000000000 --- a/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "User-space front-end command-line tool for ftrace" - -LICENSE = "GPL-2.0-only & LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=873f48a813bded3de6ebc54e6880c4ac" - -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;branch=master \ - file://0001-trace-cmd-make-it-build-with-musl.patch" - -SRCREV = "530b1a0caef39466e16bbd49de5afef89656f03f" - -S = "${WORKDIR}/git" - -do_install() { - oe_runmake etcdir=${sysconfdir} DESTDIR=${D} install - mkdir -p ${D}${libdir}/traceevent/plugins/${BPN} - mv ${D}/${libdir}/traceevent/plugins/*.so ${D}${libdir}/traceevent/plugins/${BPN}/ -} - -FILES:${PN} += "${libdir}/traceevent/plugins" diff --git a/meta-oe/recipes-kernel/trace-cmd/trace-cmd_3.1.2.bb b/meta-oe/recipes-kernel/trace-cmd/trace-cmd_3.1.2.bb new file mode 100644 index 00000000000..e1900f97214 --- /dev/null +++ b/meta-oe/recipes-kernel/trace-cmd/trace-cmd_3.1.2.bb @@ -0,0 +1,25 @@ +SUMMARY = "User-space front-end command-line tool for ftrace" + +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 libtracefs zstd swig-native bison-native" + +SRC_URI = " \ + git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;branch=master \ + file://0001-trace-cmd-make-it-build-against-musl-C-library.patch \ + " + +SRCREV = "d4cbf2c8ba2b8f27020085bc49c982664ae9e04f" + +S = "${WORKDIR}/git" + +inherit bash-completion pkgconfig + +do_install () { + oe_runmake 'DESTDIR=${D}' install +} +