From patchwork Thu May 11 23:21:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 23854 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2140AC7EE25 for ; Thu, 11 May 2023 23:21:39 +0000 (UTC) Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by mx.groups.io with SMTP id smtpd.web11.11575.1683847295953691833 for ; Thu, 11 May 2023 16:21:36 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=ksgZuQfb; spf=pass (domain: gmail.com, ip: 209.85.208.51, mailfrom: max.oss.09@gmail.com) Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-50be17a1eceso17358510a12.2 for ; Thu, 11 May 2023 16:21:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683847294; x=1686439294; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6h4ktFgu4anbaA8VVfvyjvqkFv/Bx72BwJ9qJEFj3Nc=; b=ksgZuQfbZMlNW4yf4iRAKWJesayr7fbnkQrC0BN03vuWAmwNazywGuSdqCh4LJjRhv GD41WXDkywopAXS+meng3SpwZKHDLDUsOFu2sedIAoHIo8+8QFtBWyGBYTkD6EV+O0Q6 f5fuS4uYrqmWU7ud2Kyj72o1o16761Bn2SGgKOnZS42Mki1p5S886dq0ahcTDw72a0LF S3x4xelqEX0XJ+BF/y946q5NjFJ5mxGUYp5anUERsNHPE3iLU1uZwwjeMpQyW6SP3O3J p5NbJAD5jvDdCSUeOD/dIokxBB/TB1FHJcCRly8Ha8XxNVZpsD584Tl2CkqEh5aqzESH fuPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683847294; x=1686439294; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6h4ktFgu4anbaA8VVfvyjvqkFv/Bx72BwJ9qJEFj3Nc=; b=gSK7UpykR1E1zBPx2AYlXh0thRjnDNKI0M7EB9cM2+QsMJpPk2i1zDp+MRGGXyEMB7 uXpI14GoNSVdBca+2qlGE50m/i3CFdrm+CCpCq8JzZQPHwJfqNwgvfSlplACzH1vY7Fm Zw+uItwZNmZtjcLzqsrp2cWeMNJSljQv+6fxTscZe4vbd9HWH288rj+gFeJAid5XzcDq Zb8iiGpr9ZQpMJrMERrqIgwdoeJBeLNrc5DJCp+Yd2LIKdiZYdHoi95tVz+tneABRBMt KMQIk2h9sMefuRZ8SC6JEXg2FWD7pNKslBQ5bYZPHTVuyy67vipzFHfjdDqkxrZa+p86 0UoA== X-Gm-Message-State: AC+VfDz6cTs7Amtg25c8t6nyd7lKe2CiE8Clt2d+JUnmYK899E8EN2e2 pPCPKWiZcJZFoO56TPCsJ22yh/JX1XU= X-Google-Smtp-Source: ACHHUZ6f8xnMTSpohk1w/Axd82hCsXsLWPWouGgjWYHqZdZQUdDH6eju+fnZxObdE1sjYZ0UJhA30g== X-Received: by 2002:aa7:cc8b:0:b0:50b:d2f2:43f with SMTP id p11-20020aa7cc8b000000b0050bd2f2043fmr16283384edt.35.1683847294013; Thu, 11 May 2023 16:21:34 -0700 (PDT) Received: from linuxdev2.toradex.int (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id y2-20020a056402134200b00504ecc4fa96sm3265163edw.95.2023.05.11.16.21.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 16:21:33 -0700 (PDT) From: Max Krummenacher To: openembedded-core@lists.openembedded.org Cc: bruce.ashfield@gmail.com, raj.khem@gmail.com, alexandre.belloni@bootlin.com, quaresma.jose@gmail.com, Max Krummenacher Subject: [OE-core][Patch v4 1/4] libtraceevent: import from meta-openembedded Date: Fri, 12 May 2023 01:21:26 +0200 Message-Id: <20230511232129.993289-2-max.oss.09@gmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230511232129.993289-1-max.oss.09@gmail.com> References: <20230511232129.993289-1-max.oss.09@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 11 May 2023 23:21:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181163 From: Max Krummenacher 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 --- meta/conf/distro/include/maintainers.inc | 1 + ...not-preserve-ownership-in-cp-command.patch | 40 +++++++++++++++++++ .../libtraceevent/libtraceevent_1.7.2.bb | 25 ++++++++++++ 3 files changed, 66 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/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index ec7ea90d16..3071671850 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -402,6 +402,7 @@ RECIPE_MAINTAINER:pn-libtirpc = "Anuj Mittal " RECIPE_MAINTAINER:pn-libtool = "Robert Yang " RECIPE_MAINTAINER:pn-libtool-cross = "Robert Yang " RECIPE_MAINTAINER:pn-libtool-native = "Robert Yang " +RECIPE_MAINTAINER:pn-libtraceevent = "Bruce Ashfield " RECIPE_MAINTAINER:pn-libtry-tiny-perl = "Tim Orling " RECIPE_MAINTAINER:pn-libucontext = "Khem Raj " RECIPE_MAINTAINER:pn-libunistring = "Anuj Mittal " 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 +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 +--- + 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 +# 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"