From patchwork Thu May 11 23:22:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 23856 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 EE60BC7EE24 for ; Thu, 11 May 2023 23:22:18 +0000 (UTC) Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by mx.groups.io with SMTP id smtpd.web10.11658.1683847338494313938 for ; Thu, 11 May 2023 16:22:18 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=obniHEAs; spf=pass (domain: gmail.com, ip: 209.85.208.43, mailfrom: max.oss.09@gmail.com) Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-50c8d87c775so12440618a12.3 for ; Thu, 11 May 2023 16:22:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683847337; x=1686439337; 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=obniHEAsbS4Bc2I0ko7KANumOfh71g2bDAypZA2uJjvu1GiDTKPjsYIPVEOGCPetVc vYi99kfV1vhmO9I6cAgFyR4dWOt2jk/QsOK7Cj8ESD6/y4bTmC0QQQ8cz2cpQCWUzqyV Rt0jWnSIRV1CHbBifeFKANpO7B9EiR33astxFjYOA68AW56NvEMUiKXMe6/XAVRBAI6M wAlHI5Bz+1Ve+brAWrTNeJeY5ZPFTMz34YilPd4Ate14EXI4E6z62uf2x9vUWkUENswY +cXEHfiO0pnj0govBcT69h9p9M4MwefAaxvdjtOIjRXK7GO0GCtnia+rvVdv7fpnzumk Z1hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683847337; x=1686439337; 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=lHwJXqN5mmokrF5SaTiJweF/veFub2wF19PPyxeiz6nm4GBv4X1EB9uTpnr4QM8/wo uRUCVqrWYMDpplp0HCxlDCpD7hSfpGmQtPSJuBWnTE4eoXhXck5kOcHw1iZXZMEGisR0 7Un4MkliUQCJ6bjzx6g6pzft+sGZctWbpzr8mu/VOE2sX3mWZfta8gMzJpsI5DWHXKUa kzEOnU5fH0MwolbP3JrPhcVWcX4/UDGAdNDwLRXPhlwCE1y6PDtQ0gADZw1Gx8RHtOT2 r+KLUVhz2O93NFFLjCEEZvZPAuYlGPti6mbwU/+UGsDJiVEAhBcI8sI1M/4ILKdy2xUc e0/A== X-Gm-Message-State: AC+VfDwH1UvSh6HjJd+PW1Ktlh8oJz+L+7udD1BLjzDg+srH1DM8n+l3 GIhiFhOMssqS33UWcFi4PmSUDH7qYc8= X-Google-Smtp-Source: ACHHUZ6PdToDq40ioixfCbuuStwUeChWTbFKCJC0fB3WbZGUvLZhe/yMjJeZdZ9iXYzo0ou4Ra37ow== X-Received: by 2002:a05:6402:503:b0:50b:d75d:3155 with SMTP id m3-20020a056402050300b0050bd75d3155mr18020529edv.37.1683847336818; Thu, 11 May 2023 16:22:16 -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 n25-20020a056402061900b0050a276e7ba8sm3480162edv.36.2023.05.11.16.22.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 16:22:16 -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:22:11 +0200 Message-Id: <20230511232214.993328-2-max.oss.09@gmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230511232214.993328-1-max.oss.09@gmail.com> References: <20230511232214.993328-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:22:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181168 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:22:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 23859 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 E8575C7EE22 for ; Thu, 11 May 2023 23:22:28 +0000 (UTC) Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by mx.groups.io with SMTP id smtpd.web10.11659.1683847339335454106 for ; Thu, 11 May 2023 16:22:19 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=Ms5gJEWT; spf=pass (domain: gmail.com, ip: 209.85.208.52, mailfrom: max.oss.09@gmail.com) Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-50bc4b88998so16328109a12.3 for ; Thu, 11 May 2023 16:22:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683847337; x=1686439337; 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=Ms5gJEWT8uM50hhs6t2qt+dxmKcJpZbWaQ4r1yebZHznajbytRnSHBnclxjeyHP4Uf WpFZdZGvjlJCR6Hlsze6jbR4iLwjRkDUsb04IEDxQrj3k0aZigs1YWMHbPfAx25ScscG XxSryvoMh/MaMjegms+u4EBCdxZiTH/fbt7dPUJ9EerzU7gbhZuhjcz2S+kzh945TCK/ V3/crtVCdiZ4F7+jr5RdPic4QI7nPDAJXEJOTXrpqKV6iXudPnhKA7fWB65wayvq4mXL Nvklal3613O32XRqhlGz/eLEPjvTEZqqREAxeyptfajA9fk3tQi+hIOnhd0IR8vzOmRH 8DXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683847337; x=1686439337; 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=cdpHFrVR4gpMHZ/Fw6Fszn4GWGhOtgaQQ3MgIOFBlX98GdDzpy63HOXQ3hQEfvoxDa ghDnRdOEQenCJ5g3hviAJPoML/ugi/dt5qw0+bQGj+YAKdxQ1RgdJLQks2WJBsdFuoNi CrSj0Z7XkXhCSzHcHeJkv8HeXOA0eF01cW1TKSmf6bqZ8GhUaoVDIDYWPrxYz2spQPJH p7aBcyPjnmFjbv2FlYDpoFXsYiBeSIKuGc6VaQa4Ag1ERaVRw8fWOtGotxlFbO+LaRix sREPwmI31L7cxPsMO28RGdm2jPYpvaQsLxrlKBGuR7nhrJrelzBxozPvyZIpkvn4hJr7 nsfA== X-Gm-Message-State: AC+VfDzQt7uKMJfSUGUCdDayx13loH71WBFqevxgCOaslXfAXraBII+v kVYd+vZPgdCvkFs3mNX5J4Ivc+ZemqU= X-Google-Smtp-Source: ACHHUZ7+GaIMl4cIJKpyOaM0ky1GCHtWBZF332Xj+SOCFq6X4hhqFnCloenUK+Muftng+4I+U1Uh/g== X-Received: by 2002:aa7:d8cb:0:b0:50b:d76a:7904 with SMTP id k11-20020aa7d8cb000000b0050bd76a7904mr16580902eds.28.1683847337646; Thu, 11 May 2023 16:22:17 -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 n25-20020a056402061900b0050a276e7ba8sm3480162edv.36.2023.05.11.16.22.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 16:22:17 -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:22:12 +0200 Message-Id: <20230511232214.993328-3-max.oss.09@gmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230511232214.993328-1-max.oss.09@gmail.com> References: <20230511232214.993328-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:22:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181169 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:22:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 23858 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 F10ADC7EE25 for ; Thu, 11 May 2023 23:22:28 +0000 (UTC) Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) by mx.groups.io with SMTP id smtpd.web10.11660.1683847339848998143 for ; Thu, 11 May 2023 16:22:20 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=llE3xjkU; spf=pass (domain: gmail.com, ip: 209.85.208.49, mailfrom: max.oss.09@gmail.com) Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-50bcae898b2so16368095a12.0 for ; Thu, 11 May 2023 16:22:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683847338; x=1686439338; 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=llE3xjkUaDj71fmOUtw3RYHq4FnJ6/1t/oj1Wh4kaBLk8PdOinc5mrYlc7R2UUlScL mqE8qu+CiOm2mse6ExHGd9/UjWK3x21cFpXMxGtWcwQjElU+fZK0DESQemi4jARqwXZU xGN1ABZKpFmOZ/zgcda0W0dYKfCc0OikC9gpn/MRq3Gd05W/myigfbl5NLCNl18submm zV749CDUlY1W4iuUgrC6tj8z+TnuSNQxB7zatwVlXet5esqrIWItCEUd+4cep8Nh2DSv 1+iifmlxbl47s9XKCrKnGRIp7ML+VmlvWfzeuy7XPDIEoX3+cjn/n1B4FFQF0ewzTwTp YSfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683847338; x=1686439338; 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=Aeto6QzyO671Y0NDr6imA8Px7GKilBDlLRF6JC+WZBIJAOTPZCNY/Y/pZ2TnwZv1Pg /0OY8nelwooe1gm8kIyOdpIzYtGFtePA9MdbC8azxaq1Hw5YrlP6CwRAzB7kdQ5HZO2b cGAylGQbCjxahGcNbIw23HYBTFmSw7rryh5PxiRU8uPV5kxUjitF9xmMyhKv5DUq9yXK qR1xYZM3Lwv1XI1VDOLrwV50IOHfRO+btuz5/wCfQDdJU8J+wjtC8cMwCinVZ7mocspU Nkz3FPmc+U7TGLjeo0B6WeCJZtBxae7UUbwk4TAMdOFovcokVyejzC991Erux4hYcQl9 JDiA== X-Gm-Message-State: AC+VfDwsvWBszMuEKSA6Hln9Q44F8qe9r8lzgs9rQiiM+e6o4a37Kdmr vumIpje7xyYmkNfeOJA42n0ltuEbeeo= X-Google-Smtp-Source: ACHHUZ5M1XdjrSDHhhXvkqE6uYRAgW1ThFUOFcs4P/HKJx8a9tyZp07cUKa3m1Xhnsf36+krOOPUig== X-Received: by 2002:aa7:d8cb:0:b0:50b:d76a:7904 with SMTP id k11-20020aa7d8cb000000b0050bd76a7904mr16580914eds.28.1683847338218; Thu, 11 May 2023 16:22:18 -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 n25-20020a056402061900b0050a276e7ba8sm3480162edv.36.2023.05.11.16.22.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 16:22:17 -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:22:13 +0200 Message-Id: <20230511232214.993328-4-max.oss.09@gmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230511232214.993328-1-max.oss.09@gmail.com> References: <20230511232214.993328-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:22:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181170 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:22:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 23857 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 F0CD6C7EE24 for ; Thu, 11 May 2023 23:22:28 +0000 (UTC) Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by mx.groups.io with SMTP id smtpd.web11.11594.1683847340482790351 for ; Thu, 11 May 2023 16:22:20 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=YdQtH3gb; spf=pass (domain: gmail.com, ip: 209.85.218.54, mailfrom: max.oss.09@gmail.com) Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-965d2749e2eso1350282366b.1 for ; Thu, 11 May 2023 16:22:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683847339; x=1686439339; 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=YdQtH3gbDKDU3WM8/zGZrZ/0peE47P+RPfUcTpUwdfEkP5v4XtAuvS4w9b/g82f+r1 KAqBwpJ5/8YP+98QvNIJ/uEe3rhepaUvMMN37xw7xoIL0hLZ9px4Xc6jXYcBBIkUydIT Fcm9D1rNWuAqTDr3eR9Far7lYT5bgpM0OlZ9qZDn1DaVSNAarvXYsbJZuPYeSfmEKR8W H0GZJz1vOgiM+soq1qPrw60cat5ztofxmmYaniDAMLfrPvcp+oIvk8JYeR+WTOhJc2Oa JfpRoWdPL0HEVVuMZ0NK5Wyy/FlTH+CQx1IH8a6LEcBeyT2uyWSXe3UnnWYB2nx64pHh M9NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683847339; x=1686439339; 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=KXEmyq3eKXPKbVb5Vrve393mEyQZzaD+tbyJTlojkIHuvEFIpARx/kFlE7gvZSeVlw pqcTlxnIg58k9G9RK2m+Y9anES0fPaTJOdk4MF6Y037KqyTCmo0D1F09KllOwFt6x0Ov qBstt3sgZcsZIh2Or4wmcV7JXGzHdLksSIa3nZrpVZ6fqt6KyPauyKAieysOAaeUKUqi orurgrLOXt/pw/WxqQdPmkSXUF7EeWn7AhP3giEt9s52PPWt6G5unFzS0D+ofgx9LjBq XgdDy3BKOM97mUtKWyN2hkBk8rh9VFVQp8pqFH3aMD2JXbsZGeSzc1UEjQqKpoyS80UK OQIA== X-Gm-Message-State: AC+VfDw0SGSdo+topbQN0ZkOyggg3/LiPYIHyzgV3o4+6HRv6t6Ae5ip wEChfqtgFf3NYPmV01s+paP0GF3V0Uk= X-Google-Smtp-Source: ACHHUZ7pIQAGLTgY9glFaAFM7bhYmIqaTyOXLj/NCmpSSdezuUkUHIinegfjD4s//dDSZe9aqLKjtA== X-Received: by 2002:a17:907:1c9e:b0:96a:9c6:d75a with SMTP id nb30-20020a1709071c9e00b0096a09c6d75amr9519557ejc.24.1683847338912; Thu, 11 May 2023 16:22:18 -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 n25-20020a056402061900b0050a276e7ba8sm3480162edv.36.2023.05.11.16.22.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 16:22:18 -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:22:14 +0200 Message-Id: <20230511232214.993328-5-max.oss.09@gmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230511232214.993328-1-max.oss.09@gmail.com> References: <20230511232214.993328-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:22:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181171 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"