summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorMaanya Goenka <maanyagoenka@microsoft.com>2024-02-01 02:56:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-02-15 15:14:45 +0000
commit4362867cc21a0b8ec6a780258859ce8b7c13ae02 (patch)
tree6d92c2ae43c3c458798e9c991fa69a4f5b438555 /meta/recipes-extended
parent7eea4ef84d74e618fb00fa73c773acdf775d052a (diff)
downloadopenembedded-core-4362867cc21a0b8ec6a780258859ce8b7c13ae02.tar.gz
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>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/bash/bash.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index 18874a0e24..2c3e605511 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)}"