From patchwork Fri Mar 20 12:27:25 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 83981 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 594EA108B918 for ; Fri, 20 Mar 2026 12:27:40 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.11414.1774009658713071333 for ; Fri, 20 Mar 2026 05:27:39 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2E7E7165C for ; Fri, 20 Mar 2026 05:27:32 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D8C983F7BD for ; Fri, 20 Mar 2026 05:27:37 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/7] sstate/relocatable: remove manual relocation of .pc files Date: Fri, 20 Mar 2026 12:27:25 +0000 Message-ID: <20260320122732.1630715-1-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Mar 2026 12:27:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/233599 There's no need to manually relocate .pc files in relocatable.bbclass as the path remapping in sstate.bbclass can do it, if we add .pc to SSTATE_SCAN_FILES. This removes some hardcoded behaviour, and puts absolute sysroot paths into the .pc files instead of paths like ${pcfiledir}/../../include, which makes it possible for pkgconfig to normalise and strip redundant paths. This also has the side effect of not forcibly turning .pc symlinks into real files, which the sed was doing. Signed-off-by: Ross Burton --- meta/classes-global/sstate.bbclass | 2 +- meta/classes/relocatable.bbclass | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/meta/classes-global/sstate.bbclass b/meta/classes-global/sstate.bbclass index 88449d19c7b..3b50985eab1 100644 --- a/meta/classes-global/sstate.bbclass +++ b/meta/classes-global/sstate.bbclass @@ -67,7 +67,7 @@ SSTATE_ALLOW_OVERLAP_FILES += "${DEPLOY_DIR_IMAGE}/grub-efi" SSTATE_ALLOW_OVERLAP_FILES += "${DEPLOY_DIR_IMAGE}/systemd-boot" SSTATE_ALLOW_OVERLAP_FILES += "${DEPLOY_DIR_IMAGE}/microcode" -SSTATE_SCAN_FILES ?= "*.la *-config *_config postinst-*" +SSTATE_SCAN_FILES ?= "*.la *-config *_config postinst-* *.pc" SSTATE_SCAN_CMD ??= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name \"".join(d.getVar("SSTATE_SCAN_FILES").split())}" \) -type f' SSTATE_SCAN_CMD_NATIVE ??= 'grep -Irl -e ${RECIPE_SYSROOT} -e ${RECIPE_SYSROOT_NATIVE} -e ${HOSTTOOLS_DIR} ${SSTATE_BUILDDIR}' SSTATE_HASHEQUIV_FILEMAP ?= " \ diff --git a/meta/classes/relocatable.bbclass b/meta/classes/relocatable.bbclass index d0a623fb0a9..35b2d6ec474 100644 --- a/meta/classes/relocatable.bbclass +++ b/meta/classes/relocatable.bbclass @@ -6,21 +6,8 @@ inherit chrpath -SYSROOT_PREPROCESS_FUNCS += "relocatable_binaries_preprocess relocatable_native_pcfiles" +SYSROOT_PREPROCESS_FUNCS += "relocatable_binaries_preprocess" python relocatable_binaries_preprocess() { rpath_replace(d.expand('${SYSROOT_DESTDIR}'), d) } - -relocatable_native_pcfiles() { - for dir in ${libdir}/pkgconfig ${datadir}/pkgconfig; do - files_template=${SYSROOT_DESTDIR}$dir/*.pc - # Expand to any files matching $files_template - files=$(echo $files_template) - # $files_template and $files will differ if any files were found - if [ "$files_template" != "$files" ]; then - rel=$(realpath -m --relative-to=$dir ${base_prefix}) - sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g" $files - fi - done -} From patchwork Fri Mar 20 12:27:26 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 83982 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 6F7E3108B91B for ; Fri, 20 Mar 2026 12:27:40 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.11417.1774009659569025618 for ; Fri, 20 Mar 2026 05:27:40 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D4DE81682 for ; Fri, 20 Mar 2026 05:27:32 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 7F1953F7BD for ; Fri, 20 Mar 2026 05:27:38 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/7] pkgconf: inherit pkgconfig Date: Fri, 20 Mar 2026 12:27:26 +0000 Message-ID: <20260320122732.1630715-2-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260320122732.1630715-1-ross.burton@arm.com> References: <20260320122732.1630715-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Mar 2026 12:27:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/233600 pkgconf needs to know the value of PKG_CONFIG_LIBDIR, so it needs to inherit the pkgconfig class. Signed-off-by: Ross Burton --- meta/recipes-devtools/pkgconf/pkgconf_2.5.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/pkgconf/pkgconf_2.5.1.bb b/meta/recipes-devtools/pkgconf/pkgconf_2.5.1.bb index e335c843bda..a8455577f63 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf_2.5.1.bb +++ b/meta/recipes-devtools/pkgconf/pkgconf_2.5.1.bb @@ -22,7 +22,7 @@ SRC_URI = "\ " SRC_URI[sha256sum] = "cd05c9589b9f86ecf044c10a2269822bc9eb001eced2582cfffd658b0a50c243" -inherit autotools +inherit autotools pkgconfig do_install:append () { # Install a wrapper which deals, as much as possible with pkgconf vs From patchwork Fri Mar 20 12:27:27 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 83980 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 5A127108B919 for ; Fri, 20 Mar 2026 12:27:40 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.11419.1774009660041545513 for ; Fri, 20 Mar 2026 05:27:40 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 85BD0165C for ; Fri, 20 Mar 2026 05:27:33 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 2F5463F7BD for ; Fri, 20 Mar 2026 05:27:39 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/7] pkgconf: ensure pkgconf-native doesn't try and look on the host Date: Fri, 20 Mar 2026 12:27:27 +0000 Message-ID: <20260320122732.1630715-3-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260320122732.1630715-1-ross.burton@arm.com> References: <20260320122732.1630715-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Mar 2026 12:27:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/233601 Neuter the native build of pkgconf so that it doesn't default to looking on the build host for .pc files, to avoid accidental host contamination. Signed-off-by: Ross Burton --- meta/recipes-devtools/pkgconf/pkgconf_2.5.1.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-devtools/pkgconf/pkgconf_2.5.1.bb b/meta/recipes-devtools/pkgconf/pkgconf_2.5.1.bb index a8455577f63..277ef9786c4 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf_2.5.1.bb +++ b/meta/recipes-devtools/pkgconf/pkgconf_2.5.1.bb @@ -24,6 +24,12 @@ SRC_URI[sha256sum] = "cd05c9589b9f86ecf044c10a2269822bc9eb001eced2582cfffd658b0a inherit autotools pkgconfig +# Tell the native pkgconf to use directories that don't exist, so we _need_ to +# tell it the paths with environment variables. +EXTRA_OECONF:append:class-native = " --with-pkg-config-dir='/not/exist' \ + --with-system-includedir=/not/exist/include \ + --with-system-libdir=/not/exist/lib" + do_install:append () { # Install a wrapper which deals, as much as possible with pkgconf vs # pkg-config compatibility issues. From patchwork Fri Mar 20 12:27:28 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 83983 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 667EE108B919 for ; Fri, 20 Mar 2026 12:27:50 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.11415.1774009660588781904 for ; Fri, 20 Mar 2026 05:27:40 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2C4A8165C for ; Fri, 20 Mar 2026 05:27:34 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D368C3F7BD for ; Fri, 20 Mar 2026 05:27:39 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/7] pkgconf: minimise wrapper Date: Fri, 20 Mar 2026 12:27:28 +0000 Message-ID: <20260320122732.1630715-4-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260320122732.1630715-1-ross.burton@arm.com> References: <20260320122732.1630715-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Mar 2026 12:27:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/233602 There's no need to look at the passed arguments and unset variables, we want fdo's pkgconfig behaviour when called from the pkg-config wrapper and this can be done by exporting PKG_CONFIG_FDO_SYSROOT_RULES. Signed-off-by: Ross Burton --- .../pkgconf/pkgconf/pkg-config-wrapper | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper index 695f349566d..89081672abd 100755 --- a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper +++ b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper @@ -1,16 +1,7 @@ -#!/bin/sh -# pkgconf wrapper to deal with pkg-config/pkgconf compatibility issues -# -# Copyright (C) 2015 Christopher Larson -# License: MIT (see COPYING.MIT at the root of the repository for terms) +#! /bin/sh -for arg; do - case "$arg" in - --variable|--variable=*) - # pkg-config doesn't sysroot-prefix user variables - unset PKG_CONFIG_SYSROOT_DIR - ;; - esac -done +# Tell pkgconf to use pkgconfig behaviour when dealing with the sysroot to ease +# migration. +export PKG_CONFIG_FDO_SYSROOT_RULES="1" exec pkgconf "$@" From patchwork Fri Mar 20 12:27:29 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 83984 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 7F59A108B91C for ; Fri, 20 Mar 2026 12:27:50 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.11420.1774009661286809298 for ; Fri, 20 Mar 2026 05:27:41 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C2600165C for ; Fri, 20 Mar 2026 05:27:34 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 799E93F7BD for ; Fri, 20 Mar 2026 05:27:40 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 5/7] class/pkgconfig: use pkgconf instead of pkgconfig Date: Fri, 20 Mar 2026 12:27:29 +0000 Message-ID: <20260320122732.1630715-5-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260320122732.1630715-1-ross.burton@arm.com> References: <20260320122732.1630715-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Mar 2026 12:27:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/233603 The last meaningful change to freedesktop.org pkgconfig was in 2019, but pkgconf is actively maintained. Major distributions such as Fedora (and derivates), Debian (ditto), Arch Linux, Buildroot, and Alpine have all moved to pkgconf already. There's a subtle behaviour change between pkgconfig and pkgconf, whereas pkgconfig appends the sysroot to PKG_CONFIG_SYSTEM_INCLUDE_PATH pkgconf does not, so we need to sysroot-prefix those variables. Signed-off-by: Ross Burton --- meta/classes-recipe/pkgconfig.bbclass | 6 +++--- meta/conf/distro/include/default-providers.inc | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/classes-recipe/pkgconfig.bbclass b/meta/classes-recipe/pkgconfig.bbclass index c0d91393b36..4912b9904ba 100644 --- a/meta/classes-recipe/pkgconfig.bbclass +++ b/meta/classes-recipe/pkgconfig.bbclass @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # -DEPENDS:prepend = "pkgconfig-native " +DEPENDS:prepend = "pkgconf-native " export PKG_CONFIG_PATH ?= "" export PKG_CONFIG_LIBDIR ?= "${STAGING_LIBDIR}/pkgconfig:${STAGING_DATADIR}/pkgconfig" @@ -12,5 +12,5 @@ export PKG_CONFIG_LIBDIR ?= "${STAGING_LIBDIR}/pkgconfig:${STAGING_DATADIR}/pkgc export PKG_CONFIG_SYSROOT_DIR ?= "${STAGING_DIR_HOST}" export PKG_CONFIG_DISABLE_UNINSTALLED ?= "yes" -export PKG_CONFIG_SYSTEM_LIBRARY_PATH ?= "${base_libdir}:${libdir}" -export PKG_CONFIG_SYSTEM_INCLUDE_PATH ?= "${includedir}" +export PKG_CONFIG_SYSTEM_LIBRARY_PATH ?= "${STAGING_BASELIBDIR}:${STAGING_LIBDIR}" +export PKG_CONFIG_SYSTEM_INCLUDE_PATH ?= "${STAGING_INCDIR}" diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index 5101ad78f88..c0a5d1c75e5 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -56,9 +56,9 @@ PREFERRED_PROVIDER_getopt ?= "util-linux-getopt" PREFERRED_PROVIDER_openssl ?= "openssl" PREFERRED_PROVIDER_openssl-native ?= "openssl-native" PREFERRED_PROVIDER_nativesdk-openssl ?= "nativesdk-openssl" -PREFERRED_PROVIDER_pkgconfig ?= "pkgconfig" -PREFERRED_PROVIDER_nativesdk-pkgconfig ?= "nativesdk-pkgconfig" -PREFERRED_PROVIDER_pkgconfig-native ?= "pkgconfig-native" +PREFERRED_PROVIDER_pkgconfig ?= "pkgconf" +PREFERRED_PROVIDER_nativesdk-pkgconfig ?= "nativesdk-pkgconf" +PREFERRED_PROVIDER_pkgconfig-native ?= "pkgconf-native" PREFERRED_RPROVIDER_initd-functions ?= "initscripts" PREFERRED_PROVIDER_nativesdk-mesa ?= "nativesdk-mesa" From patchwork Fri Mar 20 12:27:30 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 83986 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 9691D108B91B for ; Fri, 20 Mar 2026 12:27:50 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.11416.1774009661817116628 for ; Fri, 20 Mar 2026 05:27:41 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6A1FD165C for ; Fri, 20 Mar 2026 05:27:35 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 206B53F7BD for ; Fri, 20 Mar 2026 05:27:41 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 6/7] pkgconfig: remove Date: Fri, 20 Mar 2026 12:27:30 +0000 Message-ID: <20260320122732.1630715-6-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260320122732.1630715-1-ross.burton@arm.com> References: <20260320122732.1630715-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Mar 2026 12:27:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/233604 We're now using pkgconf, so drop the pkgconfig recipe. Signed-off-by: Ross Burton --- meta/conf/distro/include/maintainers.inc | 1 - ...e-g-u-intptr-atomics-in-builtin-glib.patch | 157 ------------------ ...0001-Do-not-use-bool-as-a-field-name.patch | 36 ---- ...Update-AM_GLIB_GNU_GETTEXT-to-match-.patch | 41 ----- .../pkgconfig/pkgconfig/pkg-config-esdk.in | 24 --- .../pkgconfig/pkgconfig/pkg-config-native.in | 7 - .../pkgconfig/pkgconfig_git.bb | 78 --------- 7 files changed, 344 deletions(-) delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/0001-Backport-g-s-size-g-u-intptr-atomics-in-builtin-glib.patch delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/0001-Do-not-use-bool-as-a-field-name.patch delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-esdk.in delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig_git.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 86a11867a1d..f9a600ff114 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -605,7 +605,6 @@ RECIPE_MAINTAINER:pn-pigz = "Hongxu Jia " RECIPE_MAINTAINER:pn-pinentry = "Unassigned " RECIPE_MAINTAINER:pn-pixman = "Unassigned " RECIPE_MAINTAINER:pn-pkgconf = "Ross Burton " -RECIPE_MAINTAINER:pn-pkgconfig = "Ross Burton " RECIPE_MAINTAINER:pn-pm-utils = "Ross Burton " RECIPE_MAINTAINER:pn-pointercal-xinput = "Unassigned " RECIPE_MAINTAINER:pn-pong-clock = "Unassigned " diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/0001-Backport-g-s-size-g-u-intptr-atomics-in-builtin-glib.patch b/meta/recipes-devtools/pkgconfig/pkgconfig/0001-Backport-g-s-size-g-u-intptr-atomics-in-builtin-glib.patch deleted file mode 100644 index 5ef4cec8118..00000000000 --- a/meta/recipes-devtools/pkgconfig/pkgconfig/0001-Backport-g-s-size-g-u-intptr-atomics-in-builtin-glib.patch +++ /dev/null @@ -1,157 +0,0 @@ -From 5fb4ae80ae13ae134a33804b1938af0e9f27a222 Mon Sep 17 00:00:00 2001 -From: Dan Fuhry -Date: Sun, 26 Oct 2025 09:09:07 -0700 -Subject: [PATCH] Backport g(s)size -> g(u)intptr atomics in builtin glib for - gcc14 and clang15 - -pkg-config 0.29.2 doesn't build on clang 15 and up and -gcc 14 and up, due to -Wint-conversion now defaulting to being an error in -both compilers. The old version of glib 2.36 bundled with pkg-config uses -gssize/gssize as the return type of the g_atomic_pointer_* functions, which -newer versions of gcc and clang complain (rightly) is not portable (as -these are aliased to long and ulong, respectively). - -This was previously addressed in glib upstream commit c762d511 [1] by Alex -Richardson on Dec 14, 2022. The attached patch backports Alex's change to -glib 2.36 bundled with pkg-config, and also switches to the newer -__atomic_* intrinsics from commit 2eb37622 [2] (Philip Withnall). - -This patch has been tested on clang 17 and only clang 17. - -[1] -https://gitlab.gnome.org/GNOME/glib/-/commit/c762d511346d3cb84cea3557a246ccf8873b4a1c -[2] -https://gitlab.gnome.org/GNOME/glib/-/commit/2eb37622418a5c9f31a9d728a99bc621d3157ab0 - -Upstream-Status: Submitted [https://lists.freedesktop.org/archives/pkg-config/2024-May/001122.html] -Signed-off-by: Khem Raj ---- - glib/glib/gatomic.c | 14 +++++++------- - glib/glib/gatomic.h | 34 ++++++++++++++++++++-------------- - 2 files changed, 27 insertions(+), 21 deletions(-) - -diff --git a/glib/glib/gatomic.c b/glib/glib/gatomic.c -index eb2fe46..c0609eb 100644 ---- a/glib/glib/gatomic.c -+++ b/glib/glib/gatomic.c -@@ -385,7 +385,7 @@ gboolean - * - * Since: 2.30 - **/ --gssize -+gintptr - (g_atomic_pointer_add) (volatile void *atomic, - gssize val) - { -@@ -409,11 +409,11 @@ gssize - * - * Since: 2.30 - **/ --gsize -+guintptr - (g_atomic_pointer_and) (volatile void *atomic, - gsize val) - { -- return g_atomic_pointer_and ((volatile gpointer *) atomic, val); -+ return g_atomic_pointer_and ((gpointer *) atomic, val); - } - - /** -@@ -433,11 +433,11 @@ gsize - * - * Since: 2.30 - **/ --gsize -+guintptr - (g_atomic_pointer_or) (volatile void *atomic, - gsize val) - { -- return g_atomic_pointer_or ((volatile gpointer *) atomic, val); -+ return g_atomic_pointer_or ((gpointer *) atomic, val); - } - - /** -@@ -457,11 +457,11 @@ gsize - * - * Since: 2.30 - **/ --gsize -+guintptr - (g_atomic_pointer_xor) (volatile void *atomic, - gsize val) - { -- return g_atomic_pointer_xor ((volatile gpointer *) atomic, val); -+ return g_atomic_pointer_xor ((gpointer *) atomic, val); - } - - #elif defined (G_PLATFORM_WIN32) -diff --git a/glib/glib/gatomic.h b/glib/glib/gatomic.h -index e7fd1f2..124a3dd 100644 ---- a/glib/glib/gatomic.h -+++ b/glib/glib/gatomic.h -@@ -66,16 +66,16 @@ gboolean g_atomic_pointer_compare_and_exchange (volatile void *a - gpointer oldval, - gpointer newval); - GLIB_AVAILABLE_IN_ALL --gssize g_atomic_pointer_add (volatile void *atomic, -+gintptr g_atomic_pointer_add (volatile void *atomic, - gssize val); - GLIB_AVAILABLE_IN_2_30 --gsize g_atomic_pointer_and (volatile void *atomic, -+guintptr g_atomic_pointer_and (volatile void *atomic, - gsize val); - GLIB_AVAILABLE_IN_2_30 --gsize g_atomic_pointer_or (volatile void *atomic, -+guintptr g_atomic_pointer_or (volatile void *atomic, - gsize val); - GLIB_AVAILABLE_IN_ALL --gsize g_atomic_pointer_xor (volatile void *atomic, -+guintptr g_atomic_pointer_xor (volatile void *atomic, - gsize val); - - GLIB_DEPRECATED_IN_2_30_FOR(g_atomic_add) -@@ -167,28 +167,34 @@ G_END_DECLS - G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \ - (void) (0 ? (gpointer) *(atomic) : 0); \ - (void) (0 ? (val) ^ (val) : 0); \ -- (gssize) __sync_fetch_and_add ((atomic), (val)); \ -+ (guintptr) __atomic_fetch_add ((atomic), (val), __ATOMIC_SEQ_CST); \ - })) - #define g_atomic_pointer_and(atomic, val) \ - (G_GNUC_EXTENSION ({ \ -+ guintptr *gapa_atomic = (guintptr *) atomic; \ - G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \ -- (void) (0 ? (gpointer) *(atomic) : 0); \ -- (void) (0 ? (val) ^ (val) : 0); \ -- (gsize) __sync_fetch_and_and ((atomic), (val)); \ -+ G_STATIC_ASSERT (sizeof *(atomic) == sizeof (guintptr)); \ -+ (void) (0 ? (gpointer) *(atomic) : NULL); \ -+ (void) (0 ? (val) ^ (val) : 1); \ -+ (guintptr) __atomic_fetch_and (gapa_atomic, (val), __ATOMIC_SEQ_CST); \ - })) - #define g_atomic_pointer_or(atomic, val) \ - (G_GNUC_EXTENSION ({ \ -+ guintptr *gapa_atomic = (guintptr *) atomic; \ - G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \ -- (void) (0 ? (gpointer) *(atomic) : 0); \ -- (void) (0 ? (val) ^ (val) : 0); \ -- (gsize) __sync_fetch_and_or ((atomic), (val)); \ -+ G_STATIC_ASSERT (sizeof *(atomic) == sizeof (guintptr)); \ -+ (void) (0 ? (gpointer) *(atomic) : NULL); \ -+ (void) (0 ? (val) ^ (val) : 1); \ -+ (guintptr) __atomic_fetch_or (gapa_atomic, (val), __ATOMIC_SEQ_CST); \ - })) - #define g_atomic_pointer_xor(atomic, val) \ - (G_GNUC_EXTENSION ({ \ -+ guintptr *gapa_atomic = (guintptr *) atomic; \ - G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \ -- (void) (0 ? (gpointer) *(atomic) : 0); \ -- (void) (0 ? (val) ^ (val) : 0); \ -- (gsize) __sync_fetch_and_xor ((atomic), (val)); \ -+ G_STATIC_ASSERT (sizeof *(atomic) == sizeof (guintptr)); \ -+ (void) (0 ? (gpointer) *(atomic) : NULL); \ -+ (void) (0 ? (val) ^ (val) : 1); \ -+ (guintptr) __atomic_fetch_xor (gapa_atomic, (val), __ATOMIC_SEQ_CST); \ - })) - - #else /* defined(G_ATOMIC_LOCK_FREE) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) */ diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/0001-Do-not-use-bool-as-a-field-name.patch b/meta/recipes-devtools/pkgconfig/pkgconfig/0001-Do-not-use-bool-as-a-field-name.patch deleted file mode 100644 index bcb7e94d69b..00000000000 --- a/meta/recipes-devtools/pkgconfig/pkgconfig/0001-Do-not-use-bool-as-a-field-name.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b3b26a7e125e5e4f5b69975cc17eb6d33198ebaa Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi -Date: Thu, 11 Apr 2024 14:40:21 +0100 -Subject: [PATCH] Do not use bool as a field name - -C99 aliases `bool` to `_Bool`, and C23 introduces `bool` as a reserved -keyword. Let's avoid using `bool` as a field name. - -Upstream-Status: Backport [Backport from glib to bunlded version in pkg-config https://github.com/GNOME/glib/commit/9e320e1c43a4770ed1532248fe5416eb0c618120] -Signed-off-by: Martin Jansa ---- - glib/glib/goption.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/glib/glib/goption.c b/glib/glib/goption.c -index 0a22f6f..f439fd4 100644 ---- a/glib/glib/goption.c -+++ b/glib/glib/goption.c -@@ -166,7 +166,7 @@ typedef struct - gpointer arg_data; - union - { -- gboolean bool; -+ gboolean boolean; - gint integer; - gchar *str; - gchar **array; -@@ -1600,7 +1600,7 @@ free_changes_list (GOptionContext *context, - switch (change->arg_type) - { - case G_OPTION_ARG_NONE: -- *(gboolean *)change->arg_data = change->prev.bool; -+ *(gboolean *)change->arg_data = change->prev.boolean; - break; - case G_OPTION_ARG_INT: - *(gint *)change->arg_data = change->prev.integer; diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch b/meta/recipes-devtools/pkgconfig/pkgconfig/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch deleted file mode 100644 index 80310cd370e..00000000000 --- a/meta/recipes-devtools/pkgconfig/pkgconfig/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e404e27de77d8b993c4cc87013d707200b3a5547 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Tue, 17 May 2016 13:26:27 +0300 -Subject: [PATCH] glib-gettext.m4: Update AM_GLIB_GNU_GETTEXT to match glib - -This avoids - error: m4_copy: won't overwrite defined macro: glib_DEFUN - -Signed-off-by: Jussi Kukkonen -Upstream-Status: Pending - ---- - glib/m4macros/glib-gettext.m4 | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/glib/m4macros/glib-gettext.m4 b/glib/m4macros/glib-gettext.m4 -index 5217fd8..155b1d8 100644 ---- a/glib/m4macros/glib-gettext.m4 -+++ b/glib/m4macros/glib-gettext.m4 -@@ -313,7 +313,7 @@ msgstr "" - # on various variables needed by the Makefile.in.in installed by - # glib-gettextize. - dnl --glib_DEFUN([GLIB_GNU_GETTEXT], -+AU_DEFUN([GLIB_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_CC])dnl - - GLIB_LC_MESSAGES -@@ -383,7 +383,8 @@ glib_DEFUN([GLIB_GNU_GETTEXT], - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES -- ]) -+ ], -+ [[$0: This macro is deprecated. You should use upstream gettext instead.]]) - - # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) - # ------------------------------- --- -2.1.4 - diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-esdk.in b/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-esdk.in deleted file mode 100644 index 4fc9b0a4a7b..00000000000 --- a/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-esdk.in +++ /dev/null @@ -1,24 +0,0 @@ -#! /bin/sh - -# Orignal pkg-config-native action when called as pkg-config-native -# NO Change here -if [ "pkg-config-native" = "`basename $0`" ] ; then - PKG_CONFIG_PATH="@PATH_NATIVE@" - PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@" - unset PKG_CONFIG_SYSROOT_DIR -else - # in this case check if we are in the esdk - if [ "$OE_SKIP_SDK_CHECK" = "1" ] ; then - parentpid=`ps -o ppid= -p $$` - parentpid_info=`ps -wo comm= -o args= -p $parentpid` - - # check if we are being called from the kernel's make menuconfig - if ( echo $parentpid_info | grep -q check-lxdialog ) ; then - PKG_CONFIG_PATH="@PATH_NATIVE@" - PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@" - unset PKG_CONFIG_SYSROOT_DIR - fi - fi -fi - -pkg-config.real "$@" diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in b/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in deleted file mode 100644 index 8addefbb803..00000000000 --- a/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in +++ /dev/null @@ -1,7 +0,0 @@ -#! /bin/sh - -export PKG_CONFIG_PATH="@PATH_NATIVE@$EXTRA_NATIVE_PKGCONFIG_PATH" -export PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@" -unset PKG_CONFIG_SYSROOT_DIR - -pkg-config "$@" diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb deleted file mode 100644 index d4350be212b..00000000000 --- a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb +++ /dev/null @@ -1,78 +0,0 @@ -SUMMARY = "Helper tool used when compiling" -DESCRIPTION = "pkg-config is a helper tool used when compiling applications and libraries. It helps determined \ -the correct compiler/link options. It is also language-agnostic." -HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/" -BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=pkg-config" -SECTION = "console/utils" - -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRCREV = "d97db4fae4c1cd099b506970b285dc2afd818ea2" -PV = "0.29.2+git" - -SRC_URI = "git://gitlab.freedesktop.org/pkg-config/pkg-config.git;branch=master;protocol=https \ - file://pkg-config-esdk.in \ - file://pkg-config-native.in \ - file://0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch \ - file://0001-Do-not-use-bool-as-a-field-name.patch \ - file://0001-Backport-g-s-size-g-u-intptr-atomics-in-builtin-glib.patch \ - " - -inherit autotools pkgconfig - -# Because of a faulty test, the current auto mode always evaluates to no, -# so just continue that behaviour. -# -EXTRA_OECONF += "--disable-indirect-deps" - -PACKAGECONFIG ??= "glib" -PACKAGECONFIG:class-native = "" - -PACKAGECONFIG[glib] = "--without-internal-glib,--with-internal-glib,glib-2.0" - -BBCLASSEXTEND = "native nativesdk" - -# Set an empty dev package to ensure the base PN package gets -# the pkg.m4 macros, pkgconfig does not deliver any other -dev -# files. -FILES:${PN}-dev = "" -FILES:${PN} += "${datadir}/aclocal/pkg.m4" - -# When using the RPM generated automatic package dependencies, some packages -# will end up requiring 'pkgconfig(pkg-config)'. Allow this behavior by -# specifying an appropriate provide. -RPROVIDES:${PN} += "pkgconfig(pkg-config)" - -do_install:append:class-native () { - # Install a pkg-config-native wrapper that will use the native sysroot instead - # of the MACHINE sysroot, for using pkg-config when building native tools. - sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ - -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \ - < ${UNPACKDIR}/pkg-config-native.in > ${B}/pkg-config-native - install -m755 ${B}/pkg-config-native ${D}${bindir}/pkg-config-native - sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ - -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \ - < ${UNPACKDIR}/pkg-config-esdk.in > ${B}/pkg-config-esdk - install -m755 ${B}/pkg-config-esdk ${D}${bindir}/pkg-config-esdk -} - -do_install:append:class-nativesdk () { - # Install a pkg-config-native wrapper that will use the native sysroot instead - # of the MACHINE sysroot, for using pkg-config when building native tools. - sed -e "s|@PATH_NATIVE@|\$OECORE_NATIVE_SYSROOT|" \ - -e "s|@LIBDIR_NATIVE@|\$OECORE_NATIVE_SYSROOT/usr/lib/pkgconfig|" \ - < ${UNPACKDIR}/pkg-config-native.in > ${B}/pkg-config-native - install -m755 ${B}/pkg-config-native ${D}${bindir}/pkg-config-native -} - -pkgconfig_sstate_fixup_esdk () { - if [ "${BB_CURRENTTASK}" = "populate_sysroot_setscene" -a "${WITHIN_EXT_SDK}" = "1" ] ; then - pkgconfdir="${SSTATE_INSTDIR}/recipe-sysroot-native/${bindir_native}" - mv $pkgconfdir/pkg-config $pkgconfdir/pkg-config.real - ln -rs $pkgconfdir/pkg-config-esdk $pkgconfdir/pkg-config - sed -i -e "s|^pkg-config|pkg-config.real|" $pkgconfdir/pkg-config-native - fi -} - -SSTATEPOSTUNPACKFUNCS:append:class-native = " pkgconfig_sstate_fixup_esdk" From patchwork Fri Mar 20 12:27:31 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 83985 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 A2C7C1075269 for ; Fri, 20 Mar 2026 12:27:50 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.11421.1774009662533936952 for ; Fri, 20 Mar 2026 05:27:42 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1EEDE165C for ; Fri, 20 Mar 2026 05:27:36 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id BC2743F7BD for ; Fri, 20 Mar 2026 05:27:41 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 7/7] layer.conf: update pkgconfig-native exclusions to pkgconf-native Date: Fri, 20 Mar 2026 12:27:31 +0000 Message-ID: <20260320122732.1630715-7-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260320122732.1630715-1-ross.burton@arm.com> References: <20260320122732.1630715-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Mar 2026 12:27:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/233605 Signed-off-by: Ross Burton --- meta/conf/layer.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index a7d44a55912..b097c34c7ba 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -106,7 +106,7 @@ SSTATE_EXCLUDEDEPS_SYSROOT += "\ .*->meson-native \ .*->ninja-native \ .*->patch-native \ - .*->pkgconfig-native \ + .*->pkgconf-native \ .*->quilt-native \ ^(?!gtk-doc-native).*->xmlto-native \ .*->gperf-native \ @@ -121,7 +121,7 @@ SSTATE_EXCLUDEDEPS_SYSROOT += "\ # libgcc-native and the C runtime. Omitting these build dependencies can save # significant disk space and speeds up packaging into signed rpms a little. SSTATE_EXCLUDEDEPS_SYSROOT += "\ - rpm-sequoia-native->(pkgconfig-native|cargo-native|python3-native|rust-native) \ + rpm-sequoia-native->(pkgconf-native|cargo-native|python3-native|rust-native) \ " # Nothing needs to depend on libc-initial # base-passwd/shadow-sysroot don't need their dependencies