From 16c9545319354f559cf7395ee163bef30e47f292 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 22 Apr 2016 12:38:10 -0700 Subject: [PATCH] busybox: use top from procps-ng --- .../busybox/config/busybox-target.conf | 18 +++++++++--------- packages/sysutils/busybox/package.mk | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/sysutils/busybox/config/busybox-target.conf b/packages/sysutils/busybox/config/busybox-target.conf index 1a07262da0..5948996241 100644 --- a/packages/sysutils/busybox/config/busybox-target.conf +++ b/packages/sysutils/busybox/config/busybox-target.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.24.0 -# Tue Oct 13 14:36:02 2015 +# Busybox version: 1.24.2 +# Fri Apr 22 12:32:06 2016 # CONFIG_HAVE_DOT_CONFIG=y @@ -933,13 +933,13 @@ CONFIG_PMAP=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_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=y # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set CONFIG_FREE=y diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk index b487e6e5f3..ead4e5bb99 100644 --- a/packages/sysutils/busybox/package.mk +++ b/packages/sysutils/busybox/package.mk @@ -24,7 +24,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.busybox.net" PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS_HOST="" -PKG_DEPENDS_TARGET="toolchain busybox:host hdparm dosfstools e2fsprogs zip unzip pciutils usbutils parted" +PKG_DEPENDS_TARGET="toolchain busybox:host hdparm dosfstools e2fsprogs zip unzip pciutils usbutils parted procps-ng" PKG_DEPENDS_INIT="toolchain" PKG_PRIORITY="required" PKG_SECTION="system"