From ae5de774f363c1471a6ca611a40dbe4d3bd1befe Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 27 Aug 2024 07:23:50 +0200 Subject: libtraceevent: upgrade 1.8.2 -> 1.8.3 Drop backport. (From OE-Core rev: 1125dc6679c72c6b377d802009c908465626a3e6) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../libtraceevent/libtraceevent/meson.patch | 45 ---------------------- .../libtraceevent/libtraceevent_1.8.2.bb | 23 ----------- .../libtraceevent/libtraceevent_1.8.3.bb | 23 +++++++++++ 3 files changed, 23 insertions(+), 68 deletions(-) delete mode 100644 meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch delete mode 100644 meta/recipes-kernel/libtraceevent/libtraceevent_1.8.2.bb create mode 100644 meta/recipes-kernel/libtraceevent/libtraceevent_1.8.3.bb (limited to 'meta/recipes-kernel/libtraceevent') diff --git a/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch b/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch deleted file mode 100644 index c723c236c0..0000000000 --- a/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 7f88c9ba5f27276e844252500a9f0ba2b350b919 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Sun, 27 Aug 2023 20:57:44 +0100 -Subject: [PATCH] Fixes for the Meson build of libtraceevent: - -- Make the plugin directory the same as the Makefiles -- Install the plugins as modules not static and versioned shared libraries - -Upstream-Status: Submitted [https://lore.kernel.org/linux-trace-devel/20240311111140.1789879-1-alex@linutronix.de/T/#u] -Signed-off-by: Ross Burton ---- - meson.build | 2 +- - plugins/meson.build | 3 +-- - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index 40ce38c..1eb7912 100644 ---- a/meson.build -+++ b/meson.build -@@ -25,7 +25,7 @@ htmldir = join_paths(prefixdir, get_option('htmldir')) - libdir = join_paths(prefixdir, get_option('libdir')) - plugindir = get_option('plugindir') - if plugindir == '' -- plugindir = join_paths(libdir, 'libtraceevent/plugins') -+ plugindir = join_paths(libdir, 'traceevent/plugins') - endif - - add_project_arguments( -diff --git a/plugins/meson.build b/plugins/meson.build -index 74ad664..4919be4 100644 ---- a/plugins/meson.build -+++ b/plugins/meson.build -@@ -19,11 +19,10 @@ plugins = [ - - pdeps = [] - foreach plugin : plugins -- pdeps += library( -+ pdeps += shared_module( - plugin.replace('.c', ''), - plugin, - name_prefix: '', -- version: library_version, - dependencies: [libtraceevent_dep], - include_directories: [incdir], - install: true, diff --git a/meta/recipes-kernel/libtraceevent/libtraceevent_1.8.2.bb b/meta/recipes-kernel/libtraceevent/libtraceevent_1.8.2.bb deleted file mode 100644 index d4ace54884..0000000000 --- a/meta/recipes-kernel/libtraceevent/libtraceevent_1.8.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (C) 2022 Khem Raj -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "API to access the kernel tracefs directory" -HOMEPAGE = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/" -LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 \ - file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd" -SECTION = "libs" - -SRCREV = "6f6d5802f31992e7527a4c32b43a32fda6bf6bdf" -SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;branch=${BPN};protocol=https \ - file://meson.patch" - -S = "${WORKDIR}/git" - -inherit meson pkgconfig - -EXTRA_OEMESON = "-Ddoc=false" - -PACKAGES += "${PN}-plugins" - -FILES:${PN}-plugins += "${libdir}/traceevent/plugins" diff --git a/meta/recipes-kernel/libtraceevent/libtraceevent_1.8.3.bb b/meta/recipes-kernel/libtraceevent/libtraceevent_1.8.3.bb new file mode 100644 index 0000000000..68174305f2 --- /dev/null +++ b/meta/recipes-kernel/libtraceevent/libtraceevent_1.8.3.bb @@ -0,0 +1,23 @@ +# Copyright (C) 2022 Khem Raj +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "API to access the kernel tracefs directory" +HOMEPAGE = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/" +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 \ + file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd" +SECTION = "libs" + +SRCREV = "645a883516e343ee970ebb80398cfd7b7dbd227e" +SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;branch=${BPN};protocol=https \ + " + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +EXTRA_OEMESON = "-Ddoc=false" + +PACKAGES += "${PN}-plugins" + +FILES:${PN}-plugins += "${libdir}/traceevent/plugins" -- cgit v1.2.3-54-g00ecf