From: Wes Lindauer <wesley.lindauer@gmail.com>
Date: Wed, 14 Nov 2018 21:52:37 +0000 (-0500)
Subject: busybox: Provide /bin/ash when usrmerge is enabled
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~16172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc8d54521aa79c1ca88c801e89c3ade6c17ae7a2;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

busybox: Provide /bin/ash when usrmerge is enabled

When usrmerge is enabled, scripts that were explicitly using #!/bin/ash
will cause a QA Error like the following:

QA Issue: bar.sh contained in package foo requires /bin/ash,
but no providers found in RDEPENDS_foo? [file-rdeps].

It seems perfectly acceptable for scripts to use /bin/ash so provide
it along with /bin/sh.

Signed-off-by: Wes Lindauer <wesley.lindauer@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 09433dd8242..b8d8858e5c0 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -455,4 +455,4 @@ pkg_prerm_${PN}-syslog () {
 	fi
 }
 
-RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh', '', d)}"
+RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh /bin/ash', '', d)}"