]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
bash: nativesdk-bash does not provide /bin/bash so don't claim to
authorMaanya Goenka <maanyagoenka@microsoft.com>
Thu, 1 Feb 2024 02:56:20 +0000 (02:56 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 15 Feb 2024 15:14:45 +0000 (15:14 +0000)
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>
meta/recipes-extended/bash/bash.inc

index 18874a0e24dcfea1373c830ec5f7acf59ef5910a..2c3e60551136c935242ad496a6785162aab0a913 100644 (file)
@@ -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)}"