On Tue, May 9, 2023 at 1:09 PM Jose Quaresma <quaresma.j...@gmail.com> wrote: > > Hi Max, > > This also needs an entry on meta/conf/distro/include/maintainers.inc >
Max, I'm already maintaining perf, so if you want to put my name beside libraceevent for a v3, that's fine with me. Bruce > Jose > > Max Krummenacher <max.oss...@gmail.com> escreveu no dia terça, 9/05/2023 à(s) > 17:13: >> >> From: Max Krummenacher <max.krummenac...@toradex.com> >> >> 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 >> >> Signed-off-by: Max Krummenacher <max.krummenac...@toradex.com> >> --- >> ...not-preserve-ownership-in-cp-command.patch | 40 +++++++++++++++++++ >> .../libtraceevent/libtraceevent_1.7.2.bb | 25 ++++++++++++ >> 2 files changed, 65 insertions(+) >> create mode 100644 >> meta/recipes-kernel/libtraceevent/libtraceevent/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch >> create mode 100644 meta/recipes-kernel/libtraceevent/libtraceevent_1.7.2.bb >> >> 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 @@ >> +From ed0a31000305d937abe47c44d705b5b52bb36f79 Mon Sep 17 00:00:00 2001 >> +From: Khem Raj <raj.k...@gmail.com> >> +Date: Thu, 22 Dec 2022 18:32:17 -0800 >> +Subject: [PATCH] makefile: Do not preserve ownership in cp command >> + >> +Fixes >> + >> +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] >> + >> +Upstream-Status: Pending >> +Signed-off-by: Khem Raj <raj.k...@gmail.com> >> +--- >> + Makefile | 4 ++-- >> + 1 file changed, 2 insertions(+), 2 deletions(-) >> + >> +diff --git a/Makefile b/Makefile >> +index 965ff47..0e782cb 100644 >> +--- a/Makefile >> ++++ b/Makefile >> +@@ -287,7 +287,7 @@ $(BUILD_PREFIX): force >> + $(Q)$(call build_prefix,$(prefix)) >> + >> + define do_make_pkgconfig_file >> +- cp -f ${PKG_CONFIG_SOURCE_FILE}.template ${PKG_CONFIG_FILE}; \ >> ++ install -m 0644 ${PKG_CONFIG_SOURCE_FILE}.template >> ${PKG_CONFIG_FILE}; \ >> + sed -i "s|INSTALL_PREFIX|${1}|g" ${PKG_CONFIG_FILE}; \ >> + sed -i "s|LIB_VERSION|${EVENT_PARSE_VERSION}|g" ${PKG_CONFIG_FILE}; \ >> + sed -i "s|LIB_DIR|${libdir_relative}|g" ${PKG_CONFIG_FILE}; \ >> +@@ -335,7 +335,7 @@ install: install_libs install_plugins >> + >> + install_libs: libs install_headers install_pkgconfig >> + $(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ)); \ >> +- cp -fpR $(LIB_INSTALL) $(DESTDIR)$(libdir_SQ) >> ++ cp --no-preserve=ownership --recursive $(LIB_INSTALL) >> $(DESTDIR)$(libdir_SQ) >> + $(Q)$(call install_ld_config) >> + >> + install_pkgconfig: $(PKG_CONFIG_FILE) >> +-- >> +2.39.0 >> + >> 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 @@ >> +# Copyright (C) 2022 Khem Raj <raj.k...@gmail.com> >> +# 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 = "1c6f0f3b2bb47571fc455dc565dc343152517d98" >> +SRC_URI = >> "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;branch=${BPN};protocol=https >> \ >> + >> file://0001-makefile-Do-not-preserve-ownership-in-cp-command.patch" >> + >> +S = "${WORKDIR}/git" >> + >> +inherit pkgconfig >> + >> +do_install() { >> + oe_runmake install DESTDIR=${D} pkgconfig_dir=${libdir}/pkgconfig >> +} >> + >> +PACKAGES += "${PN}-plugins" >> + >> +FILES:${PN}-plugins += "${libdir}/traceevent/plugins" >> -- >> 2.35.3 >> >> >> >> > > > -- > Best regards, > > José Quaresma -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#181123): https://lists.openembedded.org/g/openembedded-core/message/181123 Mute This Topic: https://lists.openembedded.org/mt/98787450/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-