diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2023-05-12 01:22:11 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-05-22 10:53:47 +0100 |
commit | 2d5f1b7ac1e5f235ad0d295c3333b85c1d42f3fa (patch) | |
tree | 3be51c73d296efdbd553ee039982523b462b6a27 | |
parent | d4b1dfde1fde99f64f272dd8da9bd395c8b279cb (diff) | |
download | poky-2d5f1b7ac1e5f235ad0d295c3333b85c1d42f3fa.tar.gz |
libtraceevent: import from meta-openembedded
Import from meta-openembedded at commit d250a0dc0 ("libtraceevent:
upgrade 1.7.1 -> 1.7.2").
Starting with kernel 6.4 libtraceevent is a dependency of perf. While
one can still build perf without it by opting out one would loose its
functionality compared with building perf from kernels before 6.4
(From OE-Core rev: 45dddecd1eebc76a9835844c9bd36ac865a792c9)
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
3 files changed, 66 insertions, 0 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 395c187c1b..b509e7947e 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc | |||
@@ -406,6 +406,7 @@ RECIPE_MAINTAINER:pn-libtirpc = "Anuj Mittal <anuj.mittal@intel.com>" | |||
406 | RECIPE_MAINTAINER:pn-libtool = "Robert Yang <liezhi.yang@windriver.com>" | 406 | RECIPE_MAINTAINER:pn-libtool = "Robert Yang <liezhi.yang@windriver.com>" |
407 | RECIPE_MAINTAINER:pn-libtool-cross = "Robert Yang <liezhi.yang@windriver.com>" | 407 | RECIPE_MAINTAINER:pn-libtool-cross = "Robert Yang <liezhi.yang@windriver.com>" |
408 | RECIPE_MAINTAINER:pn-libtool-native = "Robert Yang <liezhi.yang@windriver.com>" | 408 | RECIPE_MAINTAINER:pn-libtool-native = "Robert Yang <liezhi.yang@windriver.com>" |
409 | RECIPE_MAINTAINER:pn-libtraceevent = "Bruce Ashfield <bruce.ashfield@gmail.com>" | ||
409 | RECIPE_MAINTAINER:pn-libtry-tiny-perl = "Tim Orling <tim.orling@konsulko.com>" | 410 | RECIPE_MAINTAINER:pn-libtry-tiny-perl = "Tim Orling <tim.orling@konsulko.com>" |
410 | RECIPE_MAINTAINER:pn-libucontext = "Khem Raj <raj.khem@gmail.com>" | 411 | RECIPE_MAINTAINER:pn-libucontext = "Khem Raj <raj.khem@gmail.com>" |
411 | RECIPE_MAINTAINER:pn-libunistring = "Anuj Mittal <anuj.mittal@intel.com>" | 412 | RECIPE_MAINTAINER:pn-libunistring = "Anuj Mittal <anuj.mittal@intel.com>" |
diff --git a/meta/recipes-kernel/libtraceevent/libtraceevent/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch b/meta/recipes-kernel/libtraceevent/libtraceevent/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch new file mode 100644 index 0000000000..5e88048817 --- /dev/null +++ b/meta/recipes-kernel/libtraceevent/libtraceevent/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From ed0a31000305d937abe47c44d705b5b52bb36f79 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 22 Dec 2022 18:32:17 -0800 | ||
4 | Subject: [PATCH] makefile: Do not preserve ownership in cp command | ||
5 | |||
6 | Fixes | ||
7 | |||
8 | ERROR: libtraceevent-1.7.0-r0 do_package_qa: QA Issue: libtraceevent: /usr/lib/libtraceevent.a is owned by uid 1000, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated] | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | Makefile | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/Makefile b/Makefile | ||
17 | index 965ff47..0e782cb 100644 | ||
18 | --- a/Makefile | ||
19 | +++ b/Makefile | ||
20 | @@ -287,7 +287,7 @@ $(BUILD_PREFIX): force | ||
21 | $(Q)$(call build_prefix,$(prefix)) | ||
22 | |||
23 | define do_make_pkgconfig_file | ||
24 | - cp -f ${PKG_CONFIG_SOURCE_FILE}.template ${PKG_CONFIG_FILE}; \ | ||
25 | + install -m 0644 ${PKG_CONFIG_SOURCE_FILE}.template ${PKG_CONFIG_FILE}; \ | ||
26 | sed -i "s|INSTALL_PREFIX|${1}|g" ${PKG_CONFIG_FILE}; \ | ||
27 | sed -i "s|LIB_VERSION|${EVENT_PARSE_VERSION}|g" ${PKG_CONFIG_FILE}; \ | ||
28 | sed -i "s|LIB_DIR|${libdir_relative}|g" ${PKG_CONFIG_FILE}; \ | ||
29 | @@ -335,7 +335,7 @@ install: install_libs install_plugins | ||
30 | |||
31 | install_libs: libs install_headers install_pkgconfig | ||
32 | $(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ)); \ | ||
33 | - cp -fpR $(LIB_INSTALL) $(DESTDIR)$(libdir_SQ) | ||
34 | + cp --no-preserve=ownership --recursive $(LIB_INSTALL) $(DESTDIR)$(libdir_SQ) | ||
35 | $(Q)$(call install_ld_config) | ||
36 | |||
37 | install_pkgconfig: $(PKG_CONFIG_FILE) | ||
38 | -- | ||
39 | 2.39.0 | ||
40 | |||
diff --git a/meta/recipes-kernel/libtraceevent/libtraceevent_1.7.2.bb b/meta/recipes-kernel/libtraceevent/libtraceevent_1.7.2.bb new file mode 100644 index 0000000000..089b6814c7 --- /dev/null +++ b/meta/recipes-kernel/libtraceevent/libtraceevent_1.7.2.bb | |||
@@ -0,0 +1,25 @@ | |||
1 | # Copyright (C) 2022 Khem Raj <raj.khem@gmail.com> | ||
2 | # Released under the MIT license (see COPYING.MIT for the terms) | ||
3 | |||
4 | SUMMARY = "API to access the kernel tracefs directory" | ||
5 | HOMEPAGE = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/" | ||
6 | LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" | ||
7 | LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 \ | ||
8 | file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd" | ||
9 | SECTION = "libs" | ||
10 | |||
11 | SRCREV = "1c6f0f3b2bb47571fc455dc565dc343152517d98" | ||
12 | SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;branch=${BPN};protocol=https \ | ||
13 | file://0001-makefile-Do-not-preserve-ownership-in-cp-command.patch" | ||
14 | |||
15 | S = "${WORKDIR}/git" | ||
16 | |||
17 | inherit pkgconfig | ||
18 | |||
19 | do_install() { | ||
20 | oe_runmake install DESTDIR=${D} pkgconfig_dir=${libdir}/pkgconfig | ||
21 | } | ||
22 | |||
23 | PACKAGES += "${PN}-plugins" | ||
24 | |||
25 | FILES:${PN}-plugins += "${libdir}/traceevent/plugins" | ||