Merge branch 'jb48948' into 'master'

Enable console tools clean and reset to busybox.

See merge request mer-core/busybox!20

rpm/busybox-sailfish.config

@@ -347,7 +347,7 @@ CONFIG_FEATURE_HUMAN_READABLE=y
 # Console Utilities
 #
 # CONFIG_CHVT is not set
-# CONFIG_CLEAR is not set
+# CONFIG_CLEAR=y
 # CONFIG_DEALLOCVT is not set
 # CONFIG_DUMPKMAP is not set
 # CONFIG_FGCONSOLE is not set
@@ -360,7 +360,7 @@ CONFIG_DEFAULT_SETFONT_DIR=""
 # CONFIG_FEATURE_LOADFONT_RAW is not set
 # CONFIG_LOADKMAP is not set
 # CONFIG_OPENVT is not set
-# CONFIG_RESET is not set
+# CONFIG_RESET=y
 # CONFIG_RESIZE is not set
 # CONFIG_FEATURE_RESIZE_PRINT is not set
 # CONFIG_SETCONSOLE is not set

rpm/busybox.spec

@@ -145,6 +145,16 @@ Conflicts: util-linux <= 2.33+git1
 %description symlinks-which
 %{summary} as symlinks.
 
+%package symlinks-console-tools
+Requires: %{name} = %{version}-%{release}
+Summary: Busybox replacement for console tools
+Provides: console-tools
+Conflicts: ncurses
+Obsoletes: ncurses < 6.1+git2
+
+%description symlinks-console-tools
+%{summary} as symlinks.
+
 %prep
 %setup -q -n %{name}-%{version}/upstream
 %patch0 -p1
@@ -220,6 +230,8 @@ cat >> busybox.links << EOF
 %{_bindir}/touch
 %{_bindir}/true
 %{_bindir}/uname
+%{_bindir}/clear
+%{_bindir}/reset
 EOF
 
 %install
@@ -436,3 +448,7 @@ install -m 644 -t %{buildroot}/%{_docdir}/%{name}-%{version} \
 %defattr(-,root,root,-)
 %{_bindir}/which
 
+%files symlinks-console-tools
+%defattr(-,root,root,-)
+%{_bindir}/clear
+%{_bindir}/reset