Browse Source

busybox: fix ash/hush selection

Waldemar Brodkorb 8 years ago
parent
commit
a86ca6b0fa
1 changed files with 3 additions and 3 deletions
  1. 3 3
      target/config/Config.in.runtime

+ 3 - 3
target/config/Config.in.runtime

@@ -384,7 +384,7 @@ default ADK_ROOTSH_MKSH
 
 
 config ADK_ROOTSH_MKSH
 config ADK_ROOTSH_MKSH
 	bool "mksh (MirBSD Korn Shell)"
 	bool "mksh (MirBSD Korn Shell)"
-	select ADK_PACKAGE_MKSH if !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_ARCH_OR1K
+	select ADK_PACKAGE_MKSH if !ADK_APPLIANCE_TOOLCHAIN
 	help
 	help
 	  Use mksh (a Korn Shell variant) as standard login shell
 	  Use mksh (a Korn Shell variant) as standard login shell
 	  for the superuser.
 	  for the superuser.
@@ -392,7 +392,7 @@ config ADK_ROOTSH_MKSH
 config ADK_ROOTSH_HUSH
 config ADK_ROOTSH_HUSH
 	bool "hush (busybox shell compatible with non-MMU systems)"
 	bool "hush (busybox shell compatible with non-MMU systems)"
 	select BUSYBOX_HUSH if !ADK_APPLIANCE_TOOLCHAIN
 	select BUSYBOX_HUSH if !ADK_APPLIANCE_TOOLCHAIN
-	select BUSYBOX_FEATURE_SH_IS_HUSH if !ADK_APPLIANCE_TOOLCHAIN
+	select BUSYBOX_SH_IS_HUSH if !ADK_APPLIANCE_TOOLCHAIN
 	help
 	help
 	  hush shell from busybox.
 	  hush shell from busybox.
 
 
@@ -405,7 +405,7 @@ config ADK_ROOTSH_SASH
 config ADK_ROOTSH_ASH
 config ADK_ROOTSH_ASH
 	bool "ash (busybox shell)"
 	bool "ash (busybox shell)"
 	select BUSYBOX_ASH
 	select BUSYBOX_ASH
-	select BUSYBOX_FEATURE_SH_IS_ASH
+	select BUSYBOX_SH_IS_ASH
 	help
 	help
 	  Use the minimalistic ash variant that is part of busybox
 	  Use the minimalistic ash variant that is part of busybox
 	  as standard login shell for the superuser. This is the
 	  as standard login shell for the superuser. This is the