board/httpd: enable usage texts and default shell

Signed-off-by: Joachim Wiberg <[email protected]>
kernelkit · Feb 6, 2024 · 133a446 · 133a446
1 parent 7b5178d
commit 133a446
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/board/httpd/busybox_defconfig b/board/httpd/busybox_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.36.0
-# Tue Feb  6 17:37:31 2024
+# Tue Feb  6 18:01:20 2024
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -13,9 +13,9 @@ CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_FEDORA_COMPAT is not set
 CONFIG_INCLUDE_SUSv2=y
 CONFIG_LONG_OPTS=y
-# CONFIG_SHOW_USAGE is not set
-# CONFIG_FEATURE_VERBOSE_USAGE is not set
-# CONFIG_FEATURE_COMPRESS_USAGE is not set
+CONFIG_SHOW_USAGE=y
+CONFIG_FEATURE_VERBOSE_USAGE=y
+CONFIG_FEATURE_COMPRESS_USAGE=y
 CONFIG_LFS=y
 # CONFIG_PAM is not set
 CONFIG_FEATURE_DEVPTS=y
@@ -1128,12 +1128,12 @@ CONFIG_ASH_ECHO=y
 CONFIG_ASH_PRINTF=y
 CONFIG_ASH_TEST=y
 CONFIG_ASH_SLEEP=y
-CONFIG_ASH_HELP=y
+# CONFIG_ASH_HELP is not set
 CONFIG_ASH_GETOPTS=y
 CONFIG_ASH_CMDCMD=y
 # CONFIG_CTTYHACK is not set
 # CONFIG_HUSH is not set
-CONFIG_SHELL_HUSH=y
+# CONFIG_SHELL_HUSH is not set
 # CONFIG_HUSH_BASH_COMPAT is not set
 # CONFIG_HUSH_BRACE_EXPANSION is not set
 # CONFIG_HUSH_BASH_SOURCE_CURDIR is not set
@@ -1176,7 +1176,7 @@ CONFIG_SHELL_HUSH=y
 # CONFIG_FEATURE_SH_MATH is not set
 # CONFIG_FEATURE_SH_MATH_64 is not set
 # CONFIG_FEATURE_SH_MATH_BASE is not set
-# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
 # CONFIG_FEATURE_SH_STANDALONE is not set
 # CONFIG_FEATURE_SH_NOFORK is not set
 # CONFIG_FEATURE_SH_READ_FRAC is not set

diff --git a/configs/curios-httpd_amd64_defconfig b/configs/curios-httpd_amd64_defconfig
@@ -8,7 +8,6 @@ BR2_STATIC_LIBS=y
 BR2_TARGET_GENERIC_HOSTNAME="curiOS"
 BR2_TARGET_GENERIC_ISSUE="Welcome to curiOS"
 BR2_INIT_NONE=y
-BR2_SYSTEM_BIN_SH_NONE=y
 # BR2_TARGET_GENERIC_GETTY is not set
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
 BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_CURIOS_PATH)/board/httpd/rootfs"

diff --git a/configs/curios-httpd_arm64_defconfig b/configs/curios-httpd_arm64_defconfig
@@ -9,7 +9,6 @@ BR2_STATIC_LIBS=y
 BR2_TARGET_GENERIC_HOSTNAME="curiOS"
 BR2_TARGET_GENERIC_ISSUE="Welcome to curiOS"
 BR2_INIT_NONE=y
-BR2_SYSTEM_BIN_SH_NONE=y
 # BR2_TARGET_GENERIC_GETTY is not set
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
 BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_CURIOS_PATH)/board/httpd/rootfs"