jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

base-system-busybox: disable procps utils; depend on procps-ng instead.

Browse source 
busybox pgrep/pkill does not support -s0,1.
busybox sysctl does not support --system.
This commit is contained in:
Juan RP 2014-09-21 10:58:19 +02:00
parent da757b0736
commit 813bb4951a
2 changed files with 31 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
srcpkgs/base-system-busybox/files/dotconfig
View file

@ -898,40 +898,40 @@ CONFIG_IOSTAT=y
CONFIG_LSOF=y
CONFIG_MPSTAT=y
CONFIG_NMETER=y
CONFIG_PMAP=y
# CONFIG_PMAP is not set
CONFIG_POWERTOP=y
CONFIG_PSTREE=y
CONFIG_PWDX=y
CONFIG_SMEMCAP=y
CONFIG_TOP=y
CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
CONFIG_FEATURE_TOP_SMP_CPU=y
CONFIG_FEATURE_TOP_DECIMALS=y
CONFIG_FEATURE_TOP_SMP_PROCESS=y
CONFIG_FEATURE_TOPMEM=y
CONFIG_UPTIME=y
CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y
CONFIG_FREE=y
# CONFIG_TOP is not set
# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
# CONFIG_FEATURE_TOP_SMP_CPU is not set
# CONFIG_FEATURE_TOP_DECIMALS is not set
# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
# CONFIG_FEATURE_TOPMEM is not set
# CONFIG_UPTIME is not set
# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
# CONFIG_FREE is not set
CONFIG_FUSER=y
CONFIG_KILL=y
CONFIG_KILLALL=y
CONFIG_KILLALL5=y
CONFIG_PGREP=y
CONFIG_PIDOF=y
# CONFIG_PGREP is not set
# CONFIG_PIDOF is not set
CONFIG_FEATURE_PIDOF_SINGLE=y
CONFIG_FEATURE_PIDOF_OMIT=y
CONFIG_PKILL=y
CONFIG_PS=y
CONFIG_FEATURE_PS_WIDE=y
CONFIG_FEATURE_PS_LONG=y
CONFIG_FEATURE_PS_TIME=y
CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
# CONFIG_PKILL is not set
# CONFIG_PS is not set
# CONFIG_FEATURE_PS_WIDE is not set
# CONFIG_FEATURE_PS_LONG is not set
# CONFIG_FEATURE_PS_TIME is not set
# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
CONFIG_RENICE=y
CONFIG_BB_SYSCTL=y
# CONFIG_BB_SYSCTL is not set
CONFIG_FEATURE_SHOW_THREADS=y
CONFIG_WATCH=y
# CONFIG_WATCH is not set
#
# Runit Utilities

13
srcpkgs/base-system-busybox/template
View file

@ -1,7 +1,7 @@
# Build template for 'base-system-busybox'.
pkgname=base-system-busybox
version=1.22.1
revision=14
revision=15
wrksrc="busybox-${version}"
homepage="http://www.busybox.net"
hostmakedepends="perl"
@ -18,16 +18,23 @@ conflicts="base-system>=0"
# Keep this list updated with ${FILESDIR}/dotconfig.
#
# XXX bzip2 provides libbz2, split it into libbz2 pkg.
# XXX pgrep/pkill do not support -s0,1 required by runit-void.
# XXX sysctl --system unsupported
#
_FEATURES="acpid coreutils cpio dash diffutils dosfstools findutils awk
grep gzip hdparm ifenslave iproute2 iputils less lsof netcat nvi
patch powertop procps-ng psmisc rfkill run-parts sed tar
patch powertop psmisc rfkill run-parts sed tar
traceroute util-linux wget which whois xz ncurses"
for f in ${_FEATURES}; do
provides+="${f}-${version}_${revision} "
conflicts+="${f}>=0 "
done
depends="base-files runit-void xbps kbd eudev shadow kmod ncurses-base"
depends="base-files runit-void xbps kbd eudev shadow kmod ncurses-base procps-ng"
case "$XBPS_TARGET_MACHINE" in
*-musl) depends+=" musl";;
esac
pre_build() {
cp -f ${FILESDIR}/dotconfig .config