From 9382d731bdcbdbd029813a5b46d13b0c0ff18706 Mon Sep 17 00:00:00 2001 From: Maanya Goenka Date: Thu, 1 Feb 2024 02:56:20 +0000 Subject: [PATCH] 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] (From OE-Core rev: 4362867cc21a0b8ec6a780258859ce8b7c13ae02) Signed-off-by: Maanya Goenka Signed-off-by : Alejandro Hernandez Samaniego Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-extended/bash/bash.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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)}"