summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-06-20 09:35:51 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-06-20 10:42:38 +0000
commit91b432dc3a183e6b2cbe825d3eec69302a61ea5f (patch)
treefed5add782609a71e7a7934603a38e3b81f40888
parentb34e86b4ee13d53f09d558e613d5b66c845edde6 (diff)
downloadopenembedded-core-contrib-91b432dc3a183e6b2cbe825d3eec69302a61ea5f.tar.gz
openembedded-core-contrib-91b432dc3a183e6b2cbe825d3eec69302a61ea5f.tar.bz2
openembedded-core-contrib-91b432dc3a183e6b2cbe825d3eec69302a61ea5f.zip
busybox: provide bash to demonstrate [YOCTO #9217]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta/conf/distro/include/default-providers.inc2
-rw-r--r--meta/recipes-core/busybox/busybox.inc1
-rw-r--r--meta/recipes-core/busybox/busybox/defconfig2
3 files changed, 4 insertions, 1 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index 779b03d50c..ddeff6ca45 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -53,3 +53,5 @@ PREFERRED_PROVIDER_pkgconfig ?= "pkgconfig"
PREFERRED_PROVIDER_nativesdk-pkgconfig ?= "nativesdk-pkgconfig"
PREFERRED_PROVIDER_pkgconfig-native ?= "pkgconfig-native"
PREFERRED_RPROVIDER_initd-functions ?= "initscripts"
+#PREFERRED_PROVIDER_bash ?= "busybox"
+PREFERRED_RPROVIDER_bash ?= "busybox"
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index d1675c37aa..0d3a71512a 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -445,3 +445,4 @@ pkg_prerm_${PN}-syslog () {
}
RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh', '', d)}"
+RPROVIDES_${PN} += "bash stat"
diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig
index fbb5fd852c..7884e13548 100644
--- a/meta/recipes-core/busybox/busybox/defconfig
+++ b/meta/recipes-core/busybox/busybox/defconfig
@@ -1068,7 +1068,7 @@ CONFIG_SV_DEFAULT_SERVICE_DIR=""
CONFIG_SH_IS_ASH=y
# CONFIG_SH_IS_HUSH is not set
# CONFIG_SH_IS_NONE is not set
-# CONFIG_BASH_IS_ASH is not set
+CONFIG_BASH_IS_ASH=y
# CONFIG_BASH_IS_HUSH is not set
CONFIG_BASH_IS_NONE=y
CONFIG_ASH=y