Merge pull request #215 from lrusak/procps

use top from procps-ng
This commit is contained in:
Christian Hewitt 2016-04-23 09:20:09 +04:00
commit f1aef79fdb
4 changed files with 75 additions and 10 deletions

View File

@ -1,7 +1,7 @@
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Busybox version: 1.24.0 # Busybox version: 1.24.2
# Tue Oct 13 14:36:02 2015 # Fri Apr 22 12:32:06 2016
# #
CONFIG_HAVE_DOT_CONFIG=y CONFIG_HAVE_DOT_CONFIG=y
@ -933,13 +933,13 @@ CONFIG_PMAP=y
CONFIG_PSTREE=y CONFIG_PSTREE=y
CONFIG_PWDX=y CONFIG_PWDX=y
CONFIG_SMEMCAP=y CONFIG_SMEMCAP=y
CONFIG_TOP=y # CONFIG_TOP is not set
CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y # CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y # CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
CONFIG_FEATURE_TOP_SMP_CPU=y # CONFIG_FEATURE_TOP_SMP_CPU is not set
CONFIG_FEATURE_TOP_DECIMALS=y # CONFIG_FEATURE_TOP_DECIMALS is not set
CONFIG_FEATURE_TOP_SMP_PROCESS=y # CONFIG_FEATURE_TOP_SMP_PROCESS is not set
CONFIG_FEATURE_TOPMEM=y # CONFIG_FEATURE_TOPMEM is not set
CONFIG_UPTIME=y CONFIG_UPTIME=y
# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
CONFIG_FREE=y CONFIG_FREE=y

View File

@ -24,7 +24,7 @@ PKG_LICENSE="GPL"
PKG_SITE="http://www.busybox.net" PKG_SITE="http://www.busybox.net"
PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS_HOST="" 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_DEPENDS_INIT="toolchain"
PKG_PRIORITY="required" PKG_PRIORITY="required"
PKG_SECTION="system" PKG_SECTION="system"

View File

@ -0,0 +1,41 @@
################################################################################
# This file is part of LibreELEC - http://www.libreelec.tv
# Copyright (C) 2016 Team LibreELEC
#
# LibreELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# LibreELEC is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with LibreELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
PKG_NAME="procps-ng"
PKG_VERSION="3.3.11"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://gitlab.com/procps-ng/procps"
PKG_URL="$SOURCEFORGE_SRC/$PKG_NAME/Production/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS_TARGET="toolchain netbsd-curses"
PKG_PRIORITY="optional"
PKG_SECTION="tools"
PKG_SHORTDESC="Command line and full screen utilities for browsing procfs"
PKG_LONGDESC="Command line and full screen utilities for browsing procfs, a "pseudo" file system dynamically generated by the kernel to provide information about the status of entries in its process table."
PKG_AUTORECONF="yes"
PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes \
--disable-shared \
--enable-static"
makeinstall_target() {
mkdir -p $INSTALL/usr/bin
cp -P $ROOT/$PKG_BUILD/.$TARGET_NAME/top/top $INSTALL/usr/bin
}

View File

@ -0,0 +1,24 @@
diff -Naur a/top/top.c b/top/top.c
--- a/top/top.c 2015-08-08 22:54:54.310117082 -0700
+++ b/top/top.c 2016-04-22 12:17:49.833157898 -0700
@@ -715,15 +715,15 @@
the job's done until he/she/it has a change-of-heart */
STRLCPY(q->cap_bold, CHKw(q, View_NOBOLD) ? Cap_norm : tIF(enter_bold_mode))
if (CHKw(q, Show_COLORS) && max_colors > 0) {
- STRLCPY(q->capclr_sum, tparm(set_a_foreground, q->rc.summclr))
+ STRLCPY(q->capclr_sum, tiparm(set_a_foreground, q->rc.summclr))
snprintf(q->capclr_msg, sizeof(q->capclr_msg), "%s%s"
- , tparm(set_a_foreground, q->rc.msgsclr), Cap_reverse);
+ , tiparm(set_a_foreground, q->rc.msgsclr), Cap_reverse);
snprintf(q->capclr_pmt, sizeof(q->capclr_pmt), "%s%s"
- , tparm(set_a_foreground, q->rc.msgsclr), q->cap_bold);
+ , tiparm(set_a_foreground, q->rc.msgsclr), q->cap_bold);
snprintf(q->capclr_hdr, sizeof(q->capclr_hdr), "%s%s"
- , tparm(set_a_foreground, q->rc.headclr), Cap_reverse);
+ , tiparm(set_a_foreground, q->rc.headclr), Cap_reverse);
snprintf(q->capclr_rownorm, sizeof(q->capclr_rownorm), "%s%s"
- , Caps_off, tparm(set_a_foreground, q->rc.taskclr));
+ , Caps_off, tiparm(set_a_foreground, q->rc.taskclr));
} else {
q->capclr_sum[0] = '\0';
#ifdef USE_X_COLHDR