[oe-commits] [openembedded-core] 02/04: busybox: Provide /bin/ash when usrmerge is enabled

git at git.openembedded.org git at git.openembedded.org
Thu Nov 15 09:33:54 UTC 2018


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 7e8396aa886f3b36bfffb6eeb7e335c50bd2560f
Author: Wes Lindauer <wesley.lindauer at gmail.com>
AuthorDate: Wed Nov 14 16:52:37 2018 -0500

    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 at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-core/busybox/busybox.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 09433dd..b8d8858 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)}"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list