Skip to content

Commit

Permalink
[busybox] Add console tools clean and reset to busybox. Fixes JB#48948
Browse files Browse the repository at this point in the history
  • Loading branch information
markolemmetty authored and mkosola committed Aug 11, 2020
1 parent 20e9db1 commit 0d31ff6
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
4 changes: 2 additions & 2 deletions rpm/busybox-sailfish.config
Expand Up @@ -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
Expand All @@ -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
Expand Down
16 changes: 16 additions & 0 deletions rpm/busybox.spec
Expand Up @@ -144,6 +144,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
Expand Down Expand Up @@ -219,6 +229,8 @@ cat >> busybox.links << EOF
%{_bindir}/touch
%{_bindir}/true
%{_bindir}/uname
%{_bindir}/clear
%{_bindir}/reset
EOF

%install
Expand Down Expand Up @@ -435,3 +447,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

0 comments on commit 0d31ff6

Please sign in to comment.