From: Maanya Goenka <maanyagoenka@microsoft.com>
Date: Thu, 1 Feb 2024 02:56:20 +0000 (+0000)
Subject: bash: nativesdk-bash does not provide /bin/bash so don't claim to
X-Git-Tag: uninative-4.4~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4362867cc21a0b8ec6a780258859ce8b7c13ae02;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

bash: nativesdk-bash does not provide /bin/bash so don't claim to

The package nativesdk-sdk-provides-dummy already provides /bin/sh and /bin/bash and
nativesdk-bash does not provide them, it provides them in ${nativesdk_bindir}. Tweak
the definition to class-target only to avoid this.

[RP: Tweaked wording to clarify]

Signed-off-by: Maanya Goenka <maanyagoenka@microsoft.com>
Signed-off-by : Alejandro Hernandez Samaniego <alhe@linux.microsoft.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---

diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index 18874a0e24d..2c3e6055113 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -128,4 +128,6 @@ PACKAGE_BEFORE_PN += "${PN}-loadable"
 RDEPENDS:${PN}-loadable += "${PN}"
 FILES:${PN}-loadable += "${libdir}/bash/*"
 
-RPROVIDES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh /bin/bash', '', d)}"
+# Limit the RPROVIDES here to class target so that if usrmerge is enabled for nativesdk, it does not
+# include host system paths in /bin/
+RPROVIDES:${PN}:append:class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh /bin/bash', '', d)}"