From 84da2a677a7133426829a05954af64dd533bf7a5 Mon Sep 17 00:00:00 2001 From: Magnus Kroken Date: Sun, 15 Jan 2017 02:21:41 +0100 Subject: busybox: update to 1.26.2 Refresh patches, delete patches that have been applied upstream. Signed-off-by: Magnus Kroken Tested-by: Koen Vandeputte Signed-off-by: Felix Fietkau [fix defaults] --- .../utils/busybox/config/console-tools/Config.in | 103 +++++++++------------ 1 file changed, 44 insertions(+), 59 deletions(-) (limited to 'package/utils/busybox/config/console-tools/Config.in') diff --git a/package/utils/busybox/config/console-tools/Config.in b/package/utils/busybox/config/console-tools/Config.in index 53937d2b5c..e5a4bfbeaf 100644 --- a/package/utils/busybox/config/console-tools/Config.in +++ b/package/utils/busybox/config/console-tools/Config.in @@ -6,7 +6,6 @@ menu "Console Utilities" - config BUSYBOX_CONFIG_CHVT bool "chvt" default BUSYBOX_DEFAULT_CHVT @@ -14,27 +13,17 @@ config BUSYBOX_CONFIG_CHVT help This program is used to change to another terminal. Example: chvt 4 (change to terminal /dev/tty4) - -config BUSYBOX_CONFIG_FGCONSOLE - bool "fgconsole" - default BUSYBOX_DEFAULT_FGCONSOLE - select BUSYBOX_CONFIG_PLATFORM_LINUX - help - This program prints active (foreground) console number. - config BUSYBOX_CONFIG_CLEAR bool "clear" default BUSYBOX_DEFAULT_CLEAR help This program clears the terminal screen. - config BUSYBOX_CONFIG_DEALLOCVT bool "deallocvt" default BUSYBOX_DEFAULT_DEALLOCVT select BUSYBOX_CONFIG_PLATFORM_LINUX help This program deallocates unused virtual consoles. - config BUSYBOX_CONFIG_DUMPKMAP bool "dumpkmap" default BUSYBOX_DEFAULT_DUMPKMAP @@ -42,14 +31,18 @@ config BUSYBOX_CONFIG_DUMPKMAP help This program dumps the kernel's keyboard translation table to stdout, in binary format. You can then use loadkmap to load it. - +config BUSYBOX_CONFIG_FGCONSOLE + bool "fgconsole" + default BUSYBOX_DEFAULT_FGCONSOLE + select BUSYBOX_CONFIG_PLATFORM_LINUX + help + This program prints active (foreground) console number. config BUSYBOX_CONFIG_KBD_MODE bool "kbd_mode" default BUSYBOX_DEFAULT_KBD_MODE select BUSYBOX_CONFIG_PLATFORM_LINUX help This program reports and sets keyboard mode. - config BUSYBOX_CONFIG_LOADFONT bool "loadfont" default BUSYBOX_DEFAULT_LOADFONT @@ -57,6 +50,44 @@ config BUSYBOX_CONFIG_LOADFONT help This program loads a console font from standard input. +config BUSYBOX_CONFIG_SETFONT + bool "setfont" + default BUSYBOX_DEFAULT_SETFONT + select BUSYBOX_CONFIG_PLATFORM_LINUX + help + Allows to load console screen map. Useful for i18n. + +config BUSYBOX_CONFIG_FEATURE_SETFONT_TEXTUAL_MAP + bool "Support reading textual screen maps" + default BUSYBOX_DEFAULT_FEATURE_SETFONT_TEXTUAL_MAP + depends on BUSYBOX_CONFIG_SETFONT + help + Support reading textual screen maps. + +config BUSYBOX_CONFIG_DEFAULT_SETFONT_DIR + string "Default directory for console-tools files" + default BUSYBOX_DEFAULT_DEFAULT_SETFONT_DIR + depends on BUSYBOX_CONFIG_SETFONT + help + Directory to use if setfont's params are simple filenames + (not /path/to/file or ./file). Default is "" (no default directory). + +comment "Common options for loadfont and setfont" + depends on BUSYBOX_CONFIG_LOADFONT || BUSYBOX_CONFIG_SETFONT + +config BUSYBOX_CONFIG_FEATURE_LOADFONT_PSF2 + bool "Support for PSF2 console fonts" + default BUSYBOX_DEFAULT_FEATURE_LOADFONT_PSF2 + depends on BUSYBOX_CONFIG_LOADFONT || BUSYBOX_CONFIG_SETFONT + help + Support PSF2 console fonts. + +config BUSYBOX_CONFIG_FEATURE_LOADFONT_RAW + bool "Support for old (raw) console fonts" + default BUSYBOX_DEFAULT_FEATURE_LOADFONT_RAW + depends on BUSYBOX_CONFIG_LOADFONT || BUSYBOX_CONFIG_SETFONT + help + Support old (raw) console fonts. config BUSYBOX_CONFIG_LOADKMAP bool "loadkmap" default BUSYBOX_DEFAULT_LOADKMAP @@ -64,7 +95,6 @@ config BUSYBOX_CONFIG_LOADKMAP help This program loads a keyboard translation table from standard input. - config BUSYBOX_CONFIG_OPENVT bool "openvt" default BUSYBOX_DEFAULT_OPENVT @@ -72,14 +102,12 @@ config BUSYBOX_CONFIG_OPENVT help This program is used to start a command on an unused virtual terminal. - config BUSYBOX_CONFIG_RESET bool "reset" default BUSYBOX_DEFAULT_RESET help This program is used to reset the terminal screen, if it gets messed up. - config BUSYBOX_CONFIG_RESIZE bool "resize" default BUSYBOX_DEFAULT_RESIZE @@ -96,7 +124,6 @@ config BUSYBOX_CONFIG_FEATURE_RESIZE_PRINT the terminal. E.g.: COLUMNS=80;LINES=44;export COLUMNS LINES; - config BUSYBOX_CONFIG_SETCONSOLE bool "setconsole" default BUSYBOX_DEFAULT_SETCONSOLE @@ -111,29 +138,6 @@ config BUSYBOX_CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS depends on BUSYBOX_CONFIG_SETCONSOLE && BUSYBOX_CONFIG_LONG_OPTS help Support long options for the setconsole applet. - -config BUSYBOX_CONFIG_SETFONT - bool "setfont" - default BUSYBOX_DEFAULT_SETFONT - select BUSYBOX_CONFIG_PLATFORM_LINUX - help - Allows to load console screen map. Useful for i18n. - -config BUSYBOX_CONFIG_FEATURE_SETFONT_TEXTUAL_MAP - bool "Support reading textual screen maps" - default BUSYBOX_DEFAULT_FEATURE_SETFONT_TEXTUAL_MAP - depends on BUSYBOX_CONFIG_SETFONT - help - Support reading textual screen maps. - -config BUSYBOX_CONFIG_DEFAULT_SETFONT_DIR - string "Default directory for console-tools files" - default BUSYBOX_DEFAULT_DEFAULT_SETFONT_DIR - depends on BUSYBOX_CONFIG_SETFONT - help - Directory to use if setfont's params are simple filenames - (not /path/to/file or ./file). Default is "" (no default directory). - config BUSYBOX_CONFIG_SETKEYCODES bool "setkeycodes" default BUSYBOX_DEFAULT_SETKEYCODES @@ -141,14 +145,12 @@ config BUSYBOX_CONFIG_SETKEYCODES help This program loads entries into the kernel's scancode-to-keycode map, allowing unusual keyboards to generate usable keycodes. - config BUSYBOX_CONFIG_SETLOGCONS bool "setlogcons" default BUSYBOX_DEFAULT_SETLOGCONS select BUSYBOX_CONFIG_PLATFORM_LINUX help This program redirects the output console of kernel messages. - config BUSYBOX_CONFIG_SHOWKEY bool "showkey" default BUSYBOX_DEFAULT_SHOWKEY @@ -156,21 +158,4 @@ config BUSYBOX_CONFIG_SHOWKEY help Shows keys pressed. -comment "Common options for loadfont and setfont" - depends on BUSYBOX_CONFIG_LOADFONT || BUSYBOX_CONFIG_SETFONT - -config BUSYBOX_CONFIG_FEATURE_LOADFONT_PSF2 - bool "Support for PSF2 console fonts" - default BUSYBOX_DEFAULT_FEATURE_LOADFONT_PSF2 - depends on BUSYBOX_CONFIG_LOADFONT || BUSYBOX_CONFIG_SETFONT - help - Support PSF2 console fonts. - -config BUSYBOX_CONFIG_FEATURE_LOADFONT_RAW - bool "Support for old (raw) console fonts" - default BUSYBOX_DEFAULT_FEATURE_LOADFONT_RAW - depends on BUSYBOX_CONFIG_LOADFONT || BUSYBOX_CONFIG_SETFONT - help - Support old (raw) console fonts. - endmenu -- cgit v1.2.3