summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schuster <thebohemian@gmx.net>2008-08-21 14:27:43 +0000
committerRobert Schuster <thebohemian@gmx.net>2008-08-21 14:27:43 +0000
commitadfe4811373e4e31012d004d53c6c58b78c1c05d (patch)
treeb26ed1b43b7a6f61ad8b9f9a4db89f9b844ae20c
parent5629fa09121c4588e74387cc496d699130ffe53a (diff)
Fixes compilation error. Details: http://www.mail-archive.com/busybox@busybox.net/msg04184.html
busybox 1.9.2: Added topmem patch.
-rw-r--r--packages/busybox/busybox-1.9.2/topmem.patch28
-rw-r--r--packages/busybox/busybox_1.9.2.bb1
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 \