diff options
| author | Robert Schuster <thebohemian@gmx.net> | 2008-08-21 15:44:29 +0000 |
|---|---|---|
| committer | Robert Schuster <thebohemian@gmx.net> | 2008-08-21 15:44:29 +0000 |
| commit | 1a29e9f0e4f2b31e0c668b7a4daa6ca436119a10 (patch) | |
| tree | 2ac29c58a1d67ac30fe3aa3786f14d62d177d9ed /packages/busybox | |
| parent | dd5d2d7643d4dab3b88d2fdf85df726c37af0982 (diff) | |
| parent | e295c6669417f74e0127fcce8a80627a1c042ef3 (diff) | |
merge of '7ba62c1bc5f5f44c638e1e5f4805429a188ca3a6'
and 'a211067fbce0623d7710d98f40f12ce3a2247ecf'
Diffstat (limited to 'packages/busybox')
| -rw-r--r-- | packages/busybox/busybox-1.9.2/topmem.patch | 28 | ||||
| -rw-r--r-- | packages/busybox/busybox_1.9.2.bb | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/packages/busybox/busybox-1.9.2/topmem.patch b/packages/busybox/busybox-1.9.2/topmem.patch new file mode 100644 index 0000000000..d49bf58103 --- /dev/null +++ b/packages/busybox/busybox-1.9.2/topmem.patch @@ -0,0 +1,28 @@ +Index: busybox-1.9.2/procps/top.c +=================================================================== +--- busybox-1.9.2.orig/procps/top.c 2008-08-21 16:19:31.004137057 +0200 ++++ busybox-1.9.2/procps/top.c 2008-08-21 16:21:46.066805448 +0200 +@@ -909,17 +909,22 @@ + #else + qsort(top, ntop, sizeof(top_status_t), (void*)(sort_function[0])); + #endif /* FEATURE_TOP_CPU_USAGE_PERCENTAGE */ +- } else { /* TOPMEM */ ++ } ++#if ENABLE_FEATURE_TOPMEM ++ else { /* TOPMEM */ + qsort(topmem, ntop, sizeof(topmem_status_t), (void*)topmem_sort); + } ++#endif + count = lines; + if (OPT_BATCH_MODE || count > ntop) { + count = ntop; + } + if (scan_mask == TOP_MASK) + display_process_list(count, col); ++#if ENABLE_FEATURE_TOPMEM + else + display_topmem_process_list(count, col); ++#endif + clearmems(); + if (iterations >= 0 && !--iterations) + break; diff --git a/packages/busybox/busybox_1.9.2.bb b/packages/busybox/busybox_1.9.2.bb index 37cd2a86be..e5c0f2473c 100644 --- a/packages/busybox/busybox_1.9.2.bb +++ b/packages/busybox/busybox_1.9.2.bb @@ -5,6 +5,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://udhcpscript.patch;patch=1 \ file://adduser-longops.patch;patch=1 \ file://sort-z-nul.patch;patch=1;status=upstream \ + file://topmem.patch;patch=1 \ file://busybox-cron \ file://busybox-httpd \ file://busybox-udhcpd \ |