aboutsummaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-03-26 23:43:40 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-03-29 23:28:58 +0200
commitfc91501e6b32ef1b015ac9b0fbf6d64aa1ce0162 (patch)
tree7ec7b1997402492527d7c80fb7ebfabac5ac39d2 /system
parentbf2f6f49ff106a80dce8c973f4869a0c7947d298 (diff)
downloadbuildroot-fc91501e6b32ef1b015ac9b0fbf6d64aa1ce0162.tar.gz
buildroot-fc91501e6b32ef1b015ac9b0fbf6d64aa1ce0162.tar.bz2
system: do not overwrite /bin/sh Busybox symlink
The BR2_SYSTEM_BIN_SH hidden option defines to what binary the /bin/sh symlinks should point to. If busybox is chosen, then /bin/sh is created to point to /bin/busybox. This works fine with the default installation mode of Busybox, but it fails with the upcoming "individual binaries" mode, in which each applet is installed as its own binary, and /bin/busybox doesn't exist: we get /bin/sh as a broken symlink to /bin/busybox. Since Busybox already installs its own /bin/sh symlink, properly pointing to /bin/ash or /bin/hush depending on the selected shell, it doesn't make sense for the BR2_SYSTEM_BIN_SH logic to override this. Just let Busybox install its own /bin/sh by making BR2_SYSTEM_BIN_SH empty when Busybox shell is selected as /bin/sh. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: Matthew Weber <matthew.weber@rockwellcollins.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'system')
-rw-r--r--system/Config.in1
1 files changed, 0 insertions, 1 deletions
diff --git a/system/Config.in b/system/Config.in
index 3ddf8433d4..b47ae43844 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -298,7 +298,6 @@ endchoice # /bin/sh
config BR2_SYSTEM_BIN_SH
string
- default "busybox" if BR2_SYSTEM_BIN_SH_BUSYBOX
default "bash" if BR2_SYSTEM_BIN_SH_BASH
default "dash" if BR2_SYSTEM_BIN_SH_DASH
default "mksh" if BR2_SYSTEM_BIN_SH_MKSH