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" From patchwork Thu May 11 23:21:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 23855 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 E7EACC7EE22 for ; Thu, 11 May 2023 23:21:58 +0000 (UTC) Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by mx.groups.io with SMTP id smtpd.web10.11649.1683847317603279136 for ; Thu, 11 May 2023 16:21:57 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=gCV6hu1F; spf=pass (domain: gmail.com, ip: 209.85.218.46, mailfrom: max.oss.09@gmail.com) Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-956ff2399c9so1778192666b.3 for ; Thu, 11 May 2023 16:21:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683847316; x=1686439316; 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=T2WsTA583fzrBARrI3rRtRCEDjlThqmJE2E4DJIP+pI=; b=gCV6hu1F2dcFn7maQYTYKUlWF2LkMu5P2nkt//zYb2a4L7OW0BPG9hJc5YnsvDTkJU WdHl1dYGSogkW8oHqKiFye4CdW6eyw2KOVY2zPMEiBJ3gxK7QYc/TW07CvyBm+S2/cAB 2PXynTSzD5SdYrRnuLBhgkeYGw5BPwEnsPPJ6i8/xBK3pplh1/iKwj189ag23nYLD+M7 Ph4FqDYeh3NHSlDlcn3r/6nkUQAyvmV3EYFTxT89490MBkxHwHUeXQzj6UkdjA6+XIuZ NoHLTjy5wioOAwVvIa8JCfHJPB1+K/iVDHpCxHtri/nfuBw2JewoFaTjeXNGhTPPYvuS PeRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683847316; x=1686439316; 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=T2WsTA583fzrBARrI3rRtRCEDjlThqmJE2E4DJIP+pI=; b=ZAZzd/QvgBPeKlFLxEW+bpiJdlFDVvlKWwC3bOVaEShARQEbY1ZQT7nHoL69kkPt7r 49uP5EVfuM3wp2cYm8TzdTwiCwYSchWGWaWqt4m79ADh5NSb6aPoYbKu4vp1bCTep9oB S9eXLimNhY2IhMCCMnLr9ZDxqyISYAFAktbT0MRTpF04SvTOOWUomAlftH8YaFz4LTum yVPCfYPKU4lrisiIeha6LZwORpj1iU3PCw+u73Ldc/gBu/ixqtqnM8xmYDd7Z7WHsEAV CKKTgjTDuvH9D7xj8lkzlbsM43IAaMac80woiuouDffqSwrtlJO+l3pOeS2hP4B44N/X p6Gg== X-Gm-Message-State: AC+VfDxKcnGbfC4bNEpLd76WB7TdMSnb8hR38qcvJE0KZJU8y2qNLenm Spn3QxYxuLL2ss/7PnOFWNC/oFAm83Q= X-Google-Smtp-Source: ACHHUZ753YitxULbO/J2UTAwh1ciF9Rk4uIs9I1facjnjBTAg6iorZ+oLN2Z22x37gwqFUtl5ZdIRg== X-Received: by 2002:aa7:d594:0:b0:50b:c6c9:2145 with SMTP id r20-20020aa7d594000000b0050bc6c92145mr16724843edq.23.1683847294816; 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.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 16:21:34 -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 2/4] libtraceevent: fix qa issue reference to tmpdir Date: Fri, 12 May 2023 01:21:27 +0200 Message-Id: <20230511232129.993289-3-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:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181166 From: Max Krummenacher Make sure that the OE provided CFLAGS are passed to the compiler so that the -fdebug-prefix-map and -fmacro-prefix-map options are actually active. Fixes: | WARNING: libtraceevent-1.7.2-r0 do_package_qa: QA Issue: File /usr/lib/libtraceevent.a in package libtraceevent-staticdev contains reference to TMPDIR [buildpaths] | WARNING: libtraceevent-1.7.2-r0 do_package_qa: QA Issue: File /usr/lib/.debug/libtraceevent.so.1.7.2 in package libtraceevent-dbg contains reference to TMPDIR [buildpaths] Signed-off-by: Max Krummenacher --- meta/recipes-kernel/libtraceevent/libtraceevent_1.7.2.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-kernel/libtraceevent/libtraceevent_1.7.2.bb b/meta/recipes-kernel/libtraceevent/libtraceevent_1.7.2.bb index 089b6814c7..b5c0834d89 100644 --- a/meta/recipes-kernel/libtraceevent/libtraceevent_1.7.2.bb +++ b/meta/recipes-kernel/libtraceevent/libtraceevent_1.7.2.bb @@ -14,6 +14,8 @@ SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;branch=$ S = "${WORKDIR}/git" +export EXTRA_CFLAGS = "${CFLAGS}" + inherit pkgconfig do_install() { From patchwork Thu May 11 23:21:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 23852 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 1EB17C7EE24 for ; Thu, 11 May 2023 23:21:39 +0000 (UTC) Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by mx.groups.io with SMTP id smtpd.web11.11576.1683847297125367300 for ; Thu, 11 May 2023 16:21:37 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=P00I0QrH; spf=pass (domain: gmail.com, ip: 209.85.208.45, mailfrom: max.oss.09@gmail.com) Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-50bc2feb320so14306328a12.3 for ; Thu, 11 May 2023 16:21:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683847295; x=1686439295; 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=AC2upMy89IOj399CB7oI9EnAqmWjl3TSQTL/GMNUeyU=; b=P00I0QrHipy/AK8x/Nfhr+h6JR9jJEd7707KYGJfq7lVI+sfuiSDULilEKbbZhZvVE Rn9qgfF3raClBGQnnJFXm4yydSU//o4QzCtqlHYn3KekwWOsSAdMKRc0a07QZjmXAtle MIRb91/7/aprYQVNfwaimrQyiPbpr5QD9EzuNeZFrtiLAuyK9LuYLMjD51o/IVgeLzbw aHuDOkswxUltJxGS5d8V4HW9LiO1vFB6e+1HjfoqtwX9KETfb9aXhRMYIbRV8Wkdoktt yGu5lkzXQBzzmLMdrZADJ6q34+0VHkqDzO85NGfxZWa2GhNrmFesoelC0AgmXgIN3Gt9 vyrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683847295; x=1686439295; 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=AC2upMy89IOj399CB7oI9EnAqmWjl3TSQTL/GMNUeyU=; b=HDTGU8HElsQ6UcIVpTrMXlG4WTfRIR6YGVnGrY4bMPQgybna0WaHPqB1wrsv2tgflN c76myA6/FMFzUp9WnA1rYEhAPYAPwszhkZXj9VL+h5VCk560R6uNEutV/8dTck+moUi7 C/rR7FgbwXWfgCxhXo/zvF3hL2R8MTwAA52f/esgFJCcrVm8S7ngtPkG8zE9Hbd9fIq2 D0B1LArs7+6NMFoAohsd6WGU2r6LXgdWDfki3ufjRqFn8W+Csm3WeP+wADitDIlNrxrw ixOmz48VvbOHtxC7Idw7Bc6Jt8IMKzp8h/Ti1WE+baVc7vc+NacX65GJd/kAEiWFW92s rNUA== X-Gm-Message-State: AC+VfDwLpNBDlNqvz9drwz29olrMBJGrWTP5r+MWH3Sqi5vgrZf8txGt N5qW98y+qEBWCTux+8QVnZy2elnohpU= X-Google-Smtp-Source: ACHHUZ6fz+gmsXvvi/egiiXjTV995xBII6V8dlSvov9RoYvtuO6RjdgAI+loF5ckL/P6uNi5Ivw07A== X-Received: by 2002:a05:6402:31f6:b0:50c:358:1eba with SMTP id dy22-20020a05640231f600b0050c03581ebamr16984482edb.35.1683847295386; Thu, 11 May 2023 16:21:35 -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.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 16:21:35 -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 3/4] perf: make pkg-config available Date: Fri, 12 May 2023 01:21:28 +0200 Message-Id: <20230511232129.993289-4-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/181164 From: Max Krummenacher Fixup the to be called pkg-config as $(CROSS_COMPILE)pkg-config doesn't exist. With kernels < 6.4 pkg-config is only used for the gtk+-2.0 integration which is disabled in the OE config. Thus the issue wasn't exposed so far. With kernel 6.4 pkg-config is additionally used for libtraceevent and libtracefs. Signed-off-by: Max Krummenacher --- meta/recipes-kernel/perf/perf.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 2f28d16fba..80199a4515 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -87,6 +87,7 @@ EXTRA_OEMAKE = '\ perfexecdir=${libexecdir} \ NO_GTK2=1 \ ${PACKAGECONFIG_CONFARGS} \ + PKG_CONFIG=pkg-config \ TMPDIR="${B}" \ LIBUNWIND_DIR=${STAGING_EXECPREFIXDIR} \ ' @@ -287,6 +288,7 @@ do_configure:prepend () { sed -i 's,CC = $(CROSS_COMPILE)gcc,#CC,' ${S}/tools/perf/Makefile.perf sed -i 's,AR = $(CROSS_COMPILE)ar,#AR,' ${S}/tools/perf/Makefile.perf sed -i 's,LD = $(CROSS_COMPILE)ld,#LD,' ${S}/tools/perf/Makefile.perf + sed -i 's,PKG_CONFIG = $(CROSS_COMPILE)pkg-config,#PKG_CONFIG,' ${S}/tools/perf/Makefile.perf fi if [ -e "${S}/tools/lib/api/Makefile" ]; then sed -i 's,CC = $(CROSS_COMPILE)gcc,#CC,' ${S}/tools/lib/api/Makefile From patchwork Thu May 11 23:21:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 23853 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 353D2C77B7F for ; Thu, 11 May 2023 23:21:39 +0000 (UTC) Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) by mx.groups.io with SMTP id smtpd.web11.11577.1683847297928990964 for ; Thu, 11 May 2023 16:21:38 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=YXyrhOjQ; spf=pass (domain: gmail.com, ip: 209.85.208.44, mailfrom: max.oss.09@gmail.com) Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-50bceaf07b8so16966026a12.3 for ; Thu, 11 May 2023 16:21:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683847296; x=1686439296; 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=edcBmstFNHSQvZeoogrbXXz6RfKNvuTPWIDQX4qDR3g=; b=YXyrhOjQXT+++CReWGvn3ZAK6pTEgvc9WZZbhh2kmSGS8eB7i1WRxCGJ9XqwM4GVea Kqt74OfTaeIgLhI7Z7sn+ZsXq3Zn1gZZHhzwF/5DSElLp8O7zNDyipSnUwBSFNRwOiLe OcwxLem4CyXFlYZ4JqU4Ael5xAvoMOrY92OntG03GhDl2WRKUJANv4Oqky4Z+I5pT97v 3e4alhonYmTuf55lKcO8Hx8d+uRWrVQFY92b9h819NLC5mlqpMh0e401dfTd1EFiFrrB otvfel+NvlfAImVAnTuqDYuJBqik5kALmwEkfGmEaLToAU8IHpYYxT2+uf4+ZLV6iy3w voPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683847296; x=1686439296; 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=edcBmstFNHSQvZeoogrbXXz6RfKNvuTPWIDQX4qDR3g=; b=RImHhuelQ/1zuSbIcDn8/swL6ta+zqINh0if4ZSuBEXPqAAkwXKWqCQImeY9qYstmX mdq8CdIa5GlrGzXfnMb/0n30vhE5ndPDI2R4f5XaFhzGPoiZyZXTZeEBwP0jNz8MJk7s DxRME0w7AzBDwykl5zRqCKemXRoF1MXv05Z7/ac0oDzsyQJlsec5wBfujHqCPoeH6XMy E3khILjITp6KSzZSvdS2dzF0V3W7D0TgNEzzAxoCJufpDyB1LJWNFLVWZ2ja++gFU8Cl LDfS8LSiJLSw5VVAMWkEtORiQPFT7o+xHUnDRu/XfZ9RRiQkL4QFNCuU4WjHkuqQhrrW hPOg== X-Gm-Message-State: AC+VfDyw7lxTKGPOi7JvBIDwNikslaSnBOkXjOrAoQ5bfxI9yCuFzcIA EZpGexcaKeONKPUZq6CS0bmEyw8KfXc= X-Google-Smtp-Source: ACHHUZ42KlTmKewz8FMXQPc84qPgFwl/oT7RxlHtXcGK/rf+Ubfx8pa2mMTuUcS+WoSsVE6CMSi1qw== X-Received: by 2002:a05:6402:788:b0:50b:c665:55ea with SMTP id d8-20020a056402078800b0050bc66555eamr16436353edy.3.1683847296069; Thu, 11 May 2023 16:21:36 -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.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 16:21:35 -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 4/4] perf: add libtraceevent packageconfig Date: Fri, 12 May 2023 01:21:29 +0200 Message-Id: <20230511232129.993289-5-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/181165 From: Max Krummenacher With kernel 6.4-rc1 commit 6898e60f709b ("perf build: If libtraceevent isn't present error the build") having libtraceevent is a required dependency unless building it with 'NO_LIBTRACEEVENT=1'. Older kernels did build libtraceevent as provided by the kernel sources. (Unless LIBTRACEEVENT_DYNAMIC=1 was defined, then it tried to pickup an external provided libtraceevent and printed a warning if not found.) Add a libtraceevent packageconfig which adds the dependency on libtraceevent if set, otherwise builds with NO_LIBTRACEEVENT=1. For older kernels the old behaviour of building libtraceevent from the kernel sources isn't changed. Signed-off-by: Max Krummenacher --- meta/recipes-kernel/perf/perf.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 80199a4515..19f8aadaa0 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -11,7 +11,7 @@ LICENSE = "GPL-2.0-only" PR = "r9" -PACKAGECONFIG ??= "scripting tui libunwind" +PACKAGECONFIG ??= "scripting tui libunwind libtraceevent" PACKAGECONFIG[dwarf] = ",NO_DWARF=1" PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl python3 python3-setuptools-native" # gui support was added with kernel 3.6.35 @@ -27,6 +27,7 @@ PACKAGECONFIG[jvmti] = ",NO_JVMTI=1" PACKAGECONFIG[audit] = ",NO_LIBAUDIT=1,audit" PACKAGECONFIG[manpages] = ",,xmlto-native asciidoc-native" PACKAGECONFIG[cap] = ",,libcap" +PACKAGECONFIG[libtraceevent] = ",NO_LIBTRACEEVENT=1,libtraceevent" # Arm CoreSight PACKAGECONFIG[coresight] = "CORESIGHT=1,,opencsd"