From patchwork Mon Jan 6 16:09:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 55059 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 54DBBE77188 for ; Mon, 6 Jan 2025 16:09:53 +0000 (UTC) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.groups.io with SMTP id smtpd.web10.63409.1736179791736437224 for ; Mon, 06 Jan 2025 08:09:52 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=R0RrZY1/; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.49, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-43626213fffso90460435e9.1 for ; Mon, 06 Jan 2025 08:09:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1736179790; x=1736784590; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=WfpFgtslRmoUpn2AvI9sHwjX+HNJVpVxD2DEO8TjmOQ=; b=R0RrZY1/osAbUD7RX7xkggHamCVG+EKh0d1yG9O4Puq9u1P6BZveRFT8n+nscW663L 8T3po2NKm7jx+SatrJg5j9riugIVz8iLj+zT2Fjz+mLAyOxH7XnvnM4lCjpFx8KyHRQ2 0Vj6E4Lm6zeqWo3j3Ha0x2PKRsvaF0tR6Fngk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736179790; x=1736784590; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=WfpFgtslRmoUpn2AvI9sHwjX+HNJVpVxD2DEO8TjmOQ=; b=UKvuqRq2RvYOIxO2vAMu1ERVRN2X0L2KH1IgesHbcWbiZdahiGiyyZm9F0F3IiQw6z UB6z1fTCagn9ylXVnvUUCQ64qbM2UX9BH8c5ZXrIQm0kDR61FvbMsOUER+4SXqRk+9y8 pAibFQ787X64aZpdrGEQhloWGkMB757h3P37VdUlzdmBdRTsZq9oUcupU53v++GbDabA 8xfw/pW86Lhce0YT7LYfBL1kPNPR89OipVP42irCmWzkXtUTRVzu2a6zJhMY533O++0E o7DkmKZGjijmc4jMHxZSwUe9AivzqhqOAo71j8WUGJr5ge3r19BZE1xHpRy70UrEfekE lseg== X-Gm-Message-State: AOJu0YyiTc+gpYKe3nrRYG3jv88kErrnHNWioeMtmtj8KSwYxOHcnFJH s81ToSlg+uWGjOcqoim9orsB3Yr2gm7MEtcBpg6OndHHARBdYsht/tZPzel5SlSurP5UyHEEnXc BV44= X-Gm-Gg: ASbGncvWhIACouSBZIybVjU53n42479Y01c1OFaPuOLhUHIGhCPynL7OhOpNBBwiyJA AMfaNmY5hACYYjQYxGi/Jhl8MKsGbK0iBlKJI9X8ioGfeEt3921mwomW5XYXqm28itJt2naBqEz 2LyZMOji0msyP117dk3dDJSV4Mzr90zxJcyugJSHyNSvmAUuYJAy/rDHzDNY2gh0Z3J8EdAzIOD upkh5HXQMY/+9Tn5dbWGwEc9HeIime1JsktzkuSDcIsohgph/RtfFbsrECjmueEtzCB7L6AG4Re MHGndCaMLg== X-Google-Smtp-Source: AGHT+IFiJaGULicQM6x6kowsI1MftNZn8Bpgi9woj2PMRF7FX0ANBiY5tYTuC5lduOfeOGK3lw8/EQ== X-Received: by 2002:a05:600c:6d3:b0:436:199e:8458 with SMTP id 5b1f17b1804b1-4365c79ad57mr511560625e9.14.1736179789607; Mon, 06 Jan 2025 08:09:49 -0800 (PST) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:3607:7267:e27a:36e4]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43656b013e1sm600024525e9.12.2025.01.06.08.09.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2025 08:09:48 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/4] util-linux: Improve PACKAGES_DYNAMIC handling for util-linux-native Date: Mon, 6 Jan 2025 16:09:45 +0000 Message-ID: <20250106160948.803305-1-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 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 ; Mon, 06 Jan 2025 16:09:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209428 DEBUG: Assuming util-linux-swapon-native is a dynamic package, but it may not exist DEBUG: Assuming util-linux-swapon-native is a dynamic package, but it may not exist DEBUG: providers for util-linux-swapon-native are: ['util-linux', 'util-linux-native'] DEBUG: sorted runtime providers for util-linux-swapon-native are: ['recipes-core/util-linux/util-linux_2.40.2.bb', 'virtual:native:recipes-core/util-linux/util-linux_2.40.2.bb'] NOTE: Multiple providers are available for runtime util-linux-swapon-native (util-linux, util-linux-native) The PACKAGES_DYANMIC line could match native and non-native packages so tweak to improve -native handling and avoid the above warnings in world builds. Signed-off-by: Richard Purdie --- meta/recipes-core/util-linux/util-linux_2.40.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/util-linux/util-linux_2.40.2.bb b/meta/recipes-core/util-linux/util-linux_2.40.2.bb index 2c7dd154e19..5be35eabf82 100644 --- a/meta/recipes-core/util-linux/util-linux_2.40.2.bb +++ b/meta/recipes-core/util-linux/util-linux_2.40.2.bb @@ -59,7 +59,8 @@ python util_linux_libpackages() { PACKAGESPLITFUNCS =+ "util_linux_libpackages" -PACKAGES_DYNAMIC = "^${PN}-.*" +PACKAGES_DYNAMIC = "^${MLPREFIX}${BPN}-.*" +PACKAGES_DYNAMIC:class-native = "^${PN}-.*-native" UTIL_LINUX_LIBDIR = "${libdir}" UTIL_LINUX_LIBDIR:class-target = "${base_libdir}" From patchwork Mon Jan 6 16:09:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 55060 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 55B09E77198 for ; Mon, 6 Jan 2025 16:09:53 +0000 (UTC) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.groups.io with SMTP id smtpd.web10.63411.1736179792768587161 for ; Mon, 06 Jan 2025 08:09:53 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=D29h+aYb; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.49, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-436a03197b2so52104885e9.2 for ; Mon, 06 Jan 2025 08:09:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1736179791; x=1736784591; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=3IVT5vfNWfHqhwfga+Lvddf5ygvz03jSQEI1CskkYPg=; b=D29h+aYbteoeQ37PJuytifL+dc3B0Aa7WnKzs/XloQZc9mNW7KrgWVBxj1LPiM7hfO 06rLmJDYljEcxPyvzd1JklZDMSYNVPcr+C0naxHyk5cgdNVZ8wzje3PHKl3L5C1PQdWO SCUARJhX2MayJQOFW1GbQo2XueFL3fotPja+U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736179791; x=1736784591; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3IVT5vfNWfHqhwfga+Lvddf5ygvz03jSQEI1CskkYPg=; b=UjHEHpUlQJ/PUO0istetm4OPNFMBpqjwOMPsz61pHy8V4VSo2mG2EgfBNLRi2Uw+TU YwnYGV2xZC3qqY7xQj73q9q8NqYYE4oX+/9ze5AG/ijgxPc72e6z6WUmM3glxwgUN/iQ FtMgEAYRPqXO25p6ohMr1wuxmMdB8Mm9G6wgM2ZJD2bzhGy8q7Cjlbw6Um1h2GN70tNI 0MDlvcLzE9nGEByykZUP3JRJZJ2GXOv5dQaXzq1OunBnNzBFq07i0R7KRER/uSdElkz2 HyaZUpxmtBdZIUxy6MoG0UP65oU84pSPcg9/F1Hs46EGtkst/pLCRnnhiwvRlcbGjBKb dI+g== X-Gm-Message-State: AOJu0YxsAy7cQhdXqQ5imp6LRzvcuglnMDbcy6sVc+CxrzC/pMlBFYIh qUaZPiM5UjgTKk8a4kXcpYoE9AxD0uH1MACGbTMOT3QompstibhRoawMxs2Juimoo3IlddRWYPc EnRg= X-Gm-Gg: ASbGnctY0kTJsYk4GXgTYYnua9RjRJCGQ7mHolSE/TE7pSEIX7C8r9gOvXsGvOYTV8e 20u11wMThoqFrXsDVKW3nxPh9hdBxqIZzPND/kErZiaZmjobrySUBy2TLKTwWWCZnaAodJ5sGJ1 goxJXU4NT6UDr/ReRTOhsbUsJAuqUk9YbMOZcqU00K8oo9TpxNdHuTDZGg9qqG9y95Cz210gcp0 MrCj+OH/1icqC6U0vdUY8a88WNH57VjszKpSTlWj0DFMTC+aTAUfXD97X5U9tRZrJi8p4BY5Rtl y3UI46+UhA== X-Google-Smtp-Source: AGHT+IFVISouDggoph36Ld7qCDwx7Ndo0afjbsxBHUDyijSrvJS5wAcXurMSy4SJ8bmXWoHMoJn8QQ== X-Received: by 2002:a05:600c:458e:b0:434:ff25:1988 with SMTP id 5b1f17b1804b1-43668b7a3e3mr437018255e9.32.1736179790778; Mon, 06 Jan 2025 08:09:50 -0800 (PST) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:3607:7267:e27a:36e4]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43656b013e1sm600024525e9.12.2025.01.06.08.09.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2025 08:09:49 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/4] coreutils: Improve core-utils-native dependency handling Date: Mon, 6 Jan 2025 16:09:46 +0000 Message-ID: <20250106160948.803305-2-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250106160948.803305-1-richard.purdie@linuxfoundation.org> References: <20250106160948.803305-1-richard.purdie@linuxfoundation.org> 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 ; Mon, 06 Jan 2025 16:09:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209429 bash-dev-native does not exist, nor should it. Tweak the recipe so that if/as/when we fix native ${PN}-XXX handling, this doesn't break. Use variable indirection as the least worse solution as an override directly will get overwritten with variable renaming, resulting in a warning. Signed-off-by: Richard Purdie --- meta/recipes-core/coreutils/coreutils_9.5.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/coreutils/coreutils_9.5.bb b/meta/recipes-core/coreutils/coreutils_9.5.bb index af0fcdcc4cf..ae07cba164a 100644 --- a/meta/recipes-core/coreutils/coreutils_9.5.bb +++ b/meta/recipes-core/coreutils/coreutils_9.5.bb @@ -182,7 +182,9 @@ RDEPENDS:${PN}-ptest += "bash findutils gawk make perl perl-modules python3-core # may need tweaking if DEPENDS changes # Can't use ${PN}-dev here since flags with overrides and key expansion not supported RRECOMMENDS:coreutils-dev[nodeprrecs] = "1" -RRECOMMENDS:${PN}-dev += "acl-dev attr-dev gmp-dev libcap-dev bash-dev findutils-dev gawk-dev shadow-dev" +DEVDEPS = "acl-dev attr-dev gmp-dev libcap-dev bash-dev findutils-dev gawk-dev shadow-dev" +DEVDEPS:class-native = "" +RRECOMMENDS:${PN}-dev += "${DEVDEPS}" do_install_ptest () { install -d ${D}${PTEST_PATH}/tests From patchwork Mon Jan 6 16:09:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 55061 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 3F084E77198 for ; Mon, 6 Jan 2025 16:10:03 +0000 (UTC) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.groups.io with SMTP id smtpd.web11.63212.1736179793822630563 for ; Mon, 06 Jan 2025 08:09:54 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=AxH4fnZd; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.50, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-43635796b48so87943665e9.0 for ; Mon, 06 Jan 2025 08:09:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1736179792; x=1736784592; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=EDRMU4KD5F+qFLjb15QY1G4BZrUGOQO23oCQTOBOzOQ=; b=AxH4fnZdXW0N3+SUOMnN86M7ph0+DgVhOj93laIwMYveGQEGkoKf+JDtK2PXITZOcx HgqXpSB4RtWuypV4aYAq/FIc8CMWI08J0YKsl7/9Lt95gcmV2Y/63WnGByuoCDAzAQ2I 1IGiPUg8SUhaU9/M65Sh8FW8Sd3Jxn0wwUHk4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736179792; x=1736784592; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EDRMU4KD5F+qFLjb15QY1G4BZrUGOQO23oCQTOBOzOQ=; b=aN6m4gUrpVpp5axsij3Sb9DDhHdDwqPCk//KjZlF7TrJ3t2ts4Jv4yJkS6ENNuuO8N F43/tiMc9kqEU5n7MA9Gzyz9c3ll3Dwkbp+k+Leil+bIIpd/s+zeVqVx0v6Bsitp2s+A Ol40xf/MyEBSU6JaXgA9n+2SIr4FDT6/hJUuzoTLsDcNk/HUSTZNkGH7H7ws5GbOwTYx z4teRJ8owq6PJZXNdlB0dMZy+mE4enh5iDZAK9vP3ozoAKH9fvlvWlqnsDd0zsCRyMYS 6FvvVXE9ha3z2NXN3gvg/b2nUDDqE1L4ufae1QVoND5Vl9aQ2I8uGGtDrR9TRTz/5eQ0 Nfsg== X-Gm-Message-State: AOJu0YwnLxF+A/xjRkU5qr9/EP7wHPpMjWtc0rwH/yDap2Jv5ZcTV8SP 6N1xfDdJpUU1wA8jxcWzmHzq096LSXXARriqBDKV9Tp/wZRomz4/G1h34Z+heSq+BwENS6C6AbF 6dfA= X-Gm-Gg: ASbGncvhbCMFv7Z6DQbFEB6S2oCRjDf6M/Wyxg6+HB6LjzrHDJAL4Sm5h6jYfpe+mfa tHgFjh2YZFcFMVhqow/r0rhr4FrOxZNfbjrS/mxi/HQFFybWXelsAT/lPhvMO7NadTr5GII+Uk9 d9CnbBvQC8qQtP8tD9H/NZCHZAII6JVXnRetYfCeyOPtG31cDb1q8Mxlh+eJ5CX2loTcVXjlAf0 mfBL1/0IjRKxnseg6xNcDUEHx4lTt4WrkZsEUPQO78ToK1xKJDdyXflOwkJjKqDj7DgkgxwIqtO KuaoSbhE4A== X-Google-Smtp-Source: AGHT+IF36/VKAdJiQ6LTtXRXkfCmgPHgqdgB4WlcGn3a5K3DJjp14FF+tvAaYPGDBA7/sXfIapIuZg== X-Received: by 2002:a7b:c7cd:0:b0:434:92f8:54a8 with SMTP id 5b1f17b1804b1-4365c51e2a3mr499498325e9.0.1736179791910; Mon, 06 Jan 2025 08:09:51 -0800 (PST) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:3607:7267:e27a:36e4]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43656b013e1sm600024525e9.12.2025.01.06.08.09.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2025 08:09:51 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/4] bitbake.conf: Add bash-completion-native to ASSUME_PROVIDED Date: Mon, 6 Jan 2025 16:09:47 +0000 Message-ID: <20250106160948.803305-3-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250106160948.803305-1-richard.purdie@linuxfoundation.org> References: <20250106160948.803305-1-richard.purdie@linuxfoundation.org> 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 ; Mon, 06 Jan 2025 16:10:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209430 With some native dependency handling fixes under discussion, bash-completiion-native makes it into the dependency chain. Add this to ASSUME_PROVIDED since we don't want to build it rather than trying to remove all references in the native case (it comes from glib-2.0-native). Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 16e4f4429f8..8449b6bdcbe 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -205,6 +205,7 @@ DATETIME = "${DATE}${TIME}" # its own in staging ASSUME_PROVIDED = "\ bash-native \ + bash-completion-native \ bzip2-native \ chrpath-native \ diffstat-native \ From patchwork Mon Jan 6 16:09:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 55062 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 3F050E77188 for ; Mon, 6 Jan 2025 16:10:03 +0000 (UTC) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.groups.io with SMTP id smtpd.web10.63413.1736179795019599277 for ; Mon, 06 Jan 2025 08:09:55 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=IMzanGEI; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.48, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-43622267b2eso152633355e9.0 for ; Mon, 06 Jan 2025 08:09:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1736179793; x=1736784593; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=cgmTIzYvc0My6zqa+W0uL6qgcwSnxOCwiIAWOHIZoLU=; b=IMzanGEIfyMXaWPlJVn8vxJRBeaX+CpKEn4siY5FMMOmAqZSm2jiSxbA82C3/gnoXV sBB9Nr/CoRJj6EtBKH0X8ptjRihGVpls0+ObuJqojczJUPZEVhy85kW4O3nIoluFCC8Q kxksX2G+vnbB1DhhUKADrmZGb1kU8JIkcjAH0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736179793; x=1736784593; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cgmTIzYvc0My6zqa+W0uL6qgcwSnxOCwiIAWOHIZoLU=; b=Jpl3Yc9rBqLQTs8Vxco78IsJf6Nz4g6p+Q013f2d56E5VAzpf0qzGGoKUcCllFyH1w UQd5ruOTG1dTnMkXsPFkcAv8PS0RONj74prVdxfPplbOVq03SqSp+sf4H3S+wVfjmI2A ckub+mx9wBcinlBjGSapVKDL+pdvGyUnF1XwQfwyoVejk4zVLe8DsvPNZy9qtjbCQj8d lHEeqBaq5uJh/ciMriPdo6lkO/bR2cobUSznrmGMojpRGGp1ATJ5ajgEYXqwyLjo45JF TNZNzALAnM+hH5+mBjayoDYy12jXimhyIxRyNBVAi5AbAE/d6bjHtlF9ssBTIc0NJu++ 2d5w== X-Gm-Message-State: AOJu0YzvuhELEte0wdPZEvYiA5gTK+x1GqigMFnnmLxrNWLQ7xVD9QCz PCNqwZJ9yj1a5FpAvp/DcUNkgSquRTLc8d6QJAp1HVRgjirSciecObZZF7I8mOceusHwDYREdoi ct/I= X-Gm-Gg: ASbGncu+7VbJzHXyVSaik/DdaxBN7REqqWI6ezzn5hFdyK2/WVA7yi9mVavw0QWAxY5 w/mfk3eS4LaE167rqEAu+9BJ0QxneowWoycHDShJhBat1b2aVPLLqfOESOGuXbVe6vXpTNJYtVe +Q8nWQWTwY9J+fcSVqLi5/z6J6lFq/Boz+h9tW2acwsynBZu+wD1+ouAmakUG4M1euGcz2gHT9K gzEshjmZ5IogsfK35GsgGrTV8cNQkKZ4fCKLLKxQnstK3osZa6j6yna5mD3iQGCuxgNEhl8nU2Y C/zlPm1l1w== X-Google-Smtp-Source: AGHT+IGUdH5XTt06LYACiEyvFL/vx1aXpIRDroaFRora5eokPkbSEE5mXiA7RWOKgWkXrz/9SHNi8A== X-Received: by 2002:a05:600c:1547:b0:434:fd15:3ac9 with SMTP id 5b1f17b1804b1-4366b2fa09amr469193415e9.22.1736179793042; Mon, 06 Jan 2025 08:09:53 -0800 (PST) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:3607:7267:e27a:36e4]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43656b013e1sm600024525e9.12.2025.01.06.08.09.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2025 08:09:52 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/4] native: Improve ${PN}-XXX package name handling Date: Mon, 6 Jan 2025 16:09:48 +0000 Message-ID: <20250106160948.803305-4-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250106160948.803305-1-richard.purdie@linuxfoundation.org> References: <20250106160948.803305-1-richard.purdie@linuxfoundation.org> 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 ; Mon, 06 Jan 2025 16:10:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209431 If a recipe has something like: RPROVIDES:${PN}-xxx = "yyy" then the current code will turn this into: RPROVIDES:${BPN}-native-xxx = "yyy-native" which can lead to errors. Add in some handling for this special case in the class extension code. The corresponding entry in PACAGES is correctly remapped, the variables aren't remapped to match though. Note that merging this does trigger new dependencies to be exposed, some of which can't be met or are incorrect. These need to be fixed on a case by case basis. Signed-off-by: Richard Purdie --- meta/classes-recipe/native.bbclass | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/classes-recipe/native.bbclass b/meta/classes-recipe/native.bbclass index d9651a7f22d..0fad42a5a45 100644 --- a/meta/classes-recipe/native.bbclass +++ b/meta/classes-recipe/native.bbclass @@ -158,7 +158,12 @@ python native_virtclass_handler () { newdeps.append(dep.replace(pn, bpn) + "-native") else: newdeps.append(dep) - d.setVar(varname, " ".join(newdeps)) + output_varname = varname + # Handle ${PN}-xxx -> ${BPN}-xxx-native + if suffix != "${PN}" and "${PN}" in suffix: + output_varname = varname.replace("${PN}", "${BPN}") + "-native" + d.renameVar(varname, output_varname) + d.setVar(output_varname, " ".join(newdeps)) map_dependencies("DEPENDS", e.data, selfref=False) for pkg in e.data.getVar("PACKAGES", False).split():