[busybox] Enable psmisc tools to busybox. Fixes JB#48949

Enable fuser, pidof, killall, pstree tools.
sailfishos · Sep 18, 2020 · e15929e · e15929e
1 parent 767a404
commit e15929e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/rpm/busybox-sailfish.config b/rpm/busybox-sailfish.config
@@ -1010,17 +1010,17 @@ CONFIG_FEATURE_MIME_CHARSET=""
 # Process Utilities
 #
 CONFIG_FREE=y
-# CONFIG_FUSER is not set
+CONFIG_FUSER=y
 # CONFIG_IOSTAT is not set
 # CONFIG_KILL is not set
-# CONFIG_KILLALL is not set
+CONFIG_KILLALL=y
 # CONFIG_KILLALL5 is not set
 # CONFIG_LSOF is not set
 # CONFIG_MPSTAT is not set
 # CONFIG_NMETER is not set
 CONFIG_PGREP=y
 CONFIG_PKILL=y
-# CONFIG_PIDOF is not set
+CONFIG_PIDOF=y
 # CONFIG_FEATURE_PIDOF_SINGLE is not set
 # CONFIG_FEATURE_PIDOF_OMIT is not set
 CONFIG_PMAP=y
@@ -1032,7 +1032,7 @@ CONFIG_FEATURE_PS_LONG=y
 # CONFIG_FEATURE_PS_TIME is not set
 # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
 # CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
-# CONFIG_PSTREE is not set
+CONFIG_PSTREE=y
 CONFIG_PWDX=y
 # CONFIG_SMEMCAP is not set
 CONFIG_BB_SYSCTL=y

diff --git a/rpm/busybox.spec b/rpm/busybox.spec
@@ -180,6 +180,16 @@ Obsoletes: ncurses < 6.1+git2
 %description symlinks-console-tools
 %{summary} as symlinks.
 
+%package symlinks-psmisc
+Requires: %{name} = %{version}-%{release}
+Summary: Busybox replacement for psmisc
+Provides: psmisc = 22.13+git1
+Conflicts: psmisc-tools
+Obsoletes: psmisc < 22.13+git1
+
+%description symlinks-psmisc
+%{summary} as symlinks.
+
 %prep
 %setup -q -n %{name}-%{version}/upstream
 %patch0 -p1
@@ -263,6 +273,9 @@ cat >> busybox.links << EOF
 %{_bindir}/sh
 %{_bindir}/ash
 %{_bindir}/bash
+/sbin/fuser
+/sbin/pidof
+%{_bindir}/pidof
 EOF
 
 %install
@@ -284,6 +297,8 @@ mkdir -p %{buildroot}/%{_docdir}/%{name}-%{version}
 install -m 644 -t %{buildroot}/%{_docdir}/%{name}-%{version} \
         docs/BusyBox.html docs/BusyBox.txt
 
+rm -f %{buildroot}/bin/pidof
+
 %files
 %defattr(-,root,root,-)
 %license LICENSE
@@ -511,3 +526,12 @@ install -m 644 -t %{buildroot}/%{_docdir}/%{name}-%{version} \
 %defattr(-,root,root,-)
 %{_bindir}/clear
 %{_bindir}/reset
+
+%files symlinks-psmisc
+%defattr(-,root,root,-)
+/sbin/fuser
+/sbin/pidof
+%{_bindir}/fuser
+%{_bindir}/pidof
+%{_bindir}/killall
+%{_bindir}/pstree