summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-support/atop/atop/0001-Redefine-function-prototypes-solves-issue-322.patch1154
-rw-r--r--meta-oe/recipes-support/atop/atop/0001-atop.daily-atop.init-atop-pm.sh-Avoid-using-bash.patch67
-rw-r--r--meta-oe/recipes-support/atop/atop/fix-permissions.patch54
-rw-r--r--meta-oe/recipes-support/atop/atop_2.11.0.bb (renamed from meta-oe/recipes-support/atop/atop_2.4.0.bb)15
4 files changed, 1197 insertions, 93 deletions
diff --git a/meta-oe/recipes-support/atop/atop/0001-Redefine-function-prototypes-solves-issue-322.patch b/meta-oe/recipes-support/atop/atop/0001-Redefine-function-prototypes-solves-issue-322.patch
new file mode 100644
index 0000000000..f55ad5318a
--- /dev/null
+++ b/meta-oe/recipes-support/atop/atop/0001-Redefine-function-prototypes-solves-issue-322.patch
@@ -0,0 +1,1154 @@
1From ece93ebc7b9ebbb73f92b2238a87b78ddbd4ca98 Mon Sep 17 00:00:00 2001
2From: Gerlof Langeveld <gerlof.langeveld@atoptool.nl>
3Date: Fri, 14 Mar 2025 15:39:30 +0100
4Subject: [PATCH] Redefine function prototypes (solves issue #322)
5
6Certain function prototypes did not explicitly define the
7calling argument types, specifically the prototypes for the
8convert functions defined in the 'detail_printdef' structure.
9These incomplete definitions cause a lot of errors when using
10gcc 1.15 which is based on C23.
11
12Upstream-Status: Backport [ece93eb Redefine function prototypes (solves issue #322)]
13---
14 atop.c | 5 ++
15 atopacctd.c | 5 ++
16 atopcat.c | 6 ++
17 atopconvert.c | 1 +
18 atophide.c | 5 ++
19 atopsar.c | 4 ++
20 cgroups.c | 7 +-
21 drawbar.c | 4 ++
22 gpucom.c | 4 ++
23 netatopif.c | 4 ++
24 photoproc.c | 4 ++
25 photosyst.c | 5 ++
26 rawlog.c | 4 ++
27 showgeneric.c | 4 ++
28 showlinux.h | 11 ++-
29 showprocs.c | 188 +++++++++++++++++++++++++-------------------------
30 various.c | 4 ++
31 17 files changed, 168 insertions(+), 97 deletions(-)
32
33diff --git a/atop.c b/atop.c
34index fe037fc..ac6aa6d 100644
35--- a/atop.c
36+++ b/atop.c
37@@ -118,6 +118,10 @@
38 ** can be linked with 'atop'; the one to use can eventually be chosen
39 ** at runtime.
40 */
41+#define _POSIX_C_SOURCE
42+#define _XOPEN_SOURCE
43+#define _GNU_SOURCE
44+#define _DEFAULT_SOURCE
45
46 #include <sys/types.h>
47 #include <sys/param.h>
48@@ -128,6 +132,7 @@
49 #include <errno.h>
50 #include <fcntl.h>
51 #include <unistd.h>
52+#include <getopt.h>
53 #include <stdlib.h>
54 #include <signal.h>
55 #include <sys/utsname.h>
56diff --git a/atopacctd.c b/atopacctd.c
57index b16d6a6..c8816b6 100644
58--- a/atopacctd.c
59+++ b/atopacctd.c
60@@ -36,6 +36,11 @@
61 ** it under the terms of the GNU General Public License version 2 as
62 ** published by the Free Software Foundation.
63 */
64+#define _POSIX_C_SOURCE
65+#define _XOPEN_SOURCE
66+#define _GNU_SOURCE
67+#define _DEFAULT_SOURCE
68+
69 #include <sys/types.h>
70 #include <sys/stat.h>
71 #include <stdio.h>
72diff --git a/atopcat.c b/atopcat.c
73index fb014a0..099a888 100644
74--- a/atopcat.c
75+++ b/atopcat.c
76@@ -28,9 +28,15 @@
77 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
78 ** --------------------------------------------------------------------------
79 */
80+#define _POSIX_C_SOURCE
81+#define _XOPEN_SOURCE
82+#define _GNU_SOURCE
83+#define _DEFAULT_SOURCE
84+
85 #include <sys/types.h>
86 #include <sys/param.h>
87 #include <sys/stat.h>
88+#include <getopt.h>
89 #include <fcntl.h>
90 #include <time.h>
91 #include <stdio.h>
92diff --git a/atopconvert.c b/atopconvert.c
93index fd34a85..9c083a6 100644
94--- a/atopconvert.c
95+++ b/atopconvert.c
96@@ -32,6 +32,7 @@
97 #include <sys/param.h>
98 #include <sys/mman.h>
99 #include <sys/stat.h>
100+#include <getopt.h>
101 #include <time.h>
102 #include <stdio.h>
103 #include <errno.h>
104diff --git a/atophide.c b/atophide.c
105index 0502262..313929e 100644
106--- a/atophide.c
107+++ b/atophide.c
108@@ -31,6 +31,11 @@
109 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
110 ** --------------------------------------------------------------------------
111 */
112+#define _POSIX_C_SOURCE
113+#define _XOPEN_SOURCE
114+#define _GNU_SOURCE
115+#define _DEFAULT_SOURCE
116+
117 #include <sys/types.h>
118 #include <sys/param.h>
119 #include <sys/mman.h>
120diff --git a/atopsar.c b/atopsar.c
121index a3dd121..1cf13e8 100644
122--- a/atopsar.c
123+++ b/atopsar.c
124@@ -28,6 +28,10 @@
125 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
126 ** --------------------------------------------------------------------------
127 */
128+#define _POSIX_C_SOURCE
129+#define _XOPEN_SOURCE
130+#define _GNU_SOURCE
131+#define _DEFAULT_SOURCE
132
133 #include <sys/types.h>
134 #include <sys/param.h>
135diff --git a/cgroups.c b/cgroups.c
136index d617b48..4f1247c 100644
137--- a/cgroups.c
138+++ b/cgroups.c
139@@ -27,6 +27,10 @@
140 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
141 ** --------------------------------------------------------------------------
142 */
143+#define _POSIX_C_SOURCE
144+#define _XOPEN_SOURCE
145+#define _GNU_SOURCE
146+#define _DEFAULT_SOURCE
147
148 #include <sys/types.h>
149 #include <sys/param.h>
150@@ -1189,7 +1193,8 @@ mergecgrouplist(struct cglinesel **cgroupselp, int newdepth,
151 //
152 cgroupsel = malloc(sizeof(struct cglinesel) * (ncgroups+nprocs));
153
154- ptrverify(cgroupsel, "Malloc for cglinesel structs failed (%d)\n",
155+ if (cgroupsel == NULL)
156+ ptrverify(cgroupsel, "Malloc for cglinesel structs failed (%d)\n",
157 ncgroups + nprocs);
158
159 *cgroupselp = cgroupsel;
160diff --git a/drawbar.c b/drawbar.c
161index 0ab3b40..c8539bf 100644
162--- a/drawbar.c
163+++ b/drawbar.c
164@@ -103,6 +103,10 @@
165 // horizontally scaled by the user, atop might switch from one model to
166 // the other.
167 /////////////////////////////////////////////////////////////////////////////
168+#define _POSIX_C_SOURCE
169+#define _XOPEN_SOURCE
170+#define _GNU_SOURCE
171+#define _DEFAULT_SOURCE
172
173 #include <sys/types.h>
174 #include <curses.h>
175diff --git a/gpucom.c b/gpucom.c
176index 1ff3818..25e7637 100644
177--- a/gpucom.c
178+++ b/gpucom.c
179@@ -22,6 +22,10 @@
180 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
181 ** See the GNU General Public License for more details.
182 */
183+#define _POSIX_C_SOURCE
184+#define _XOPEN_SOURCE
185+#define _GNU_SOURCE
186+#define _DEFAULT_SOURCE
187
188 #include <sys/types.h>
189 #include <sys/socket.h>
190diff --git a/netatopif.c b/netatopif.c
191index ea67142..d0e9c29 100644
192--- a/netatopif.c
193+++ b/netatopif.c
194@@ -22,6 +22,10 @@
195 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
196 ** See the GNU General Public License for more details.
197 */
198+#define _POSIX_C_SOURCE
199+#define _XOPEN_SOURCE
200+#define _GNU_SOURCE
201+#define _DEFAULT_SOURCE
202
203 #include <sys/types.h>
204 #include <stdio.h>
205diff --git a/photoproc.c b/photoproc.c
206index 234007b..2b8de20 100644
207--- a/photoproc.c
208+++ b/photoproc.c
209@@ -30,6 +30,10 @@
210 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
211 ** --------------------------------------------------------------------------
212 */
213+#define _POSIX_C_SOURCE
214+#define _XOPEN_SOURCE
215+#define _GNU_SOURCE
216+#define _DEFAULT_SOURCE
217
218 #include <sys/types.h>
219 #include <sys/param.h>
220diff --git a/photosyst.c b/photosyst.c
221index 46fccd8..9012946 100644
222--- a/photosyst.c
223+++ b/photosyst.c
224@@ -29,6 +29,11 @@
225 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
226 ** --------------------------------------------------------------------------
227 */
228+#define _POSIX_C_SOURCE
229+#define _XOPEN_SOURCE
230+#define _GNU_SOURCE
231+#define _DEFAULT_SOURCE
232+
233 #include <sys/types.h>
234 #include <stdio.h>
235 #include <string.h>
236diff --git a/rawlog.c b/rawlog.c
237index f46430d..541b75c 100644
238--- a/rawlog.c
239+++ b/rawlog.c
240@@ -26,6 +26,10 @@
241 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
242 ** --------------------------------------------------------------------------
243 */
244+#define _POSIX_C_SOURCE
245+#define _XOPEN_SOURCE
246+#define _GNU_SOURCE
247+#define _DEFAULT_SOURCE
248
249 #include <sys/types.h>
250 #include <sys/param.h>
251diff --git a/showgeneric.c b/showgeneric.c
252index 0722a64..a472501 100644
253--- a/showgeneric.c
254+++ b/showgeneric.c
255@@ -29,6 +29,10 @@
256 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
257 ** --------------------------------------------------------------------------
258 */
259+#define _POSIX_C_SOURCE
260+#define _XOPEN_SOURCE
261+#define _GNU_SOURCE
262+#define _DEFAULT_SOURCE
263
264 #include <sys/types.h>
265 #include <sys/param.h>
266diff --git a/showlinux.h b/showlinux.h
267index e082c72..72c57b9 100644
268--- a/showlinux.h
269+++ b/showlinux.h
270@@ -102,9 +102,16 @@ typedef struct
271 {
272 char *head; // column header
273 char *configname; // name as used to config print line
274- char *(*doactiveconvert)(); // pointer to conv function
275+
276+ union {
277+ char *(*doactiveconverts)(struct tstat *, int, int);
278+ char *(*doactiveconvertc)(struct cgchainer *, struct tstat *,
279+ int, int, count_t, int, int *);
280+ } ac;
281+ // pointer to conv function
282 // for active process
283- char *(*doexitconvert)(); // pointer to conv function
284+ char *(*doexitconvert)(struct tstat *, int, int);
285+ // pointer to conv function
286 // for exited process
287 char sortcrit; // sort criterion similar to showorder
288 int width; // required width
289diff --git a/showprocs.c b/showprocs.c
290index 0db1e31..020cc85 100644
291--- a/showprocs.c
292+++ b/showprocs.c
293@@ -510,7 +510,7 @@ showprocline(detail_printpair* elemptr, struct tstat *curstat,
294 }
295 else if (curstat->gen.state != 'E') // active process
296 {
297- printg("%s", curelem.pf->doactiveconvert(curstat,
298+ printg("%s", curelem.pf->ac.doactiveconverts(curstat,
299 avgval, nsecs));
300 }
301 else // exited process
302@@ -622,7 +622,7 @@ procprt_TID_ae(struct tstat *curstat, int avgval, int nsecs)
303 }
304
305 detail_printdef procprt_TID =
306- { "TID", "TID", procprt_TID_ae, procprt_TID_ae, ' ', 5}; //DYNAMIC WIDTH!
307+ { "TID", "TID", .ac.doactiveconverts = procprt_TID_ae, procprt_TID_ae, ' ', 5}; //DYNAMIC WIDTH!
308 /***************************************************************/
309 char *
310 procprt_PID_a(struct tstat *curstat, int avgval, int nsecs)
311@@ -646,7 +646,7 @@ procprt_PID_e(struct tstat *curstat, int avgval, int nsecs)
312 }
313
314 detail_printdef procprt_PID =
315- { "PID", "PID", procprt_PID_a, procprt_PID_e, ' ', 5}; //DYNAMIC WIDTH!
316+ { "PID", "PID", .ac.doactiveconverts = procprt_PID_a, procprt_PID_e, ' ', 5}; //DYNAMIC WIDTH!
317 /***************************************************************/
318 char *
319 procprt_PPID_a(struct tstat *curstat, int avgval, int nsecs)
320@@ -670,7 +670,7 @@ procprt_PPID_e(struct tstat *curstat, int avgval, int nsecs)
321 }
322
323 detail_printdef procprt_PPID =
324- { "PPID", "PPID", procprt_PPID_a, procprt_PPID_e, ' ', 5}; //DYNAMIC WIDTH!
325+ { "PPID", "PPID", .ac.doactiveconverts = procprt_PPID_a, procprt_PPID_e, ' ', 5}; //DYNAMIC WIDTH!
326 /***************************************************************/
327 char *
328 procprt_VPID_a(struct tstat *curstat, int avgval, int nsecs)
329@@ -691,7 +691,7 @@ procprt_VPID_e(struct tstat *curstat, int avgval, int nsecs)
330 }
331
332 detail_printdef procprt_VPID =
333- { "VPID", "VPID", procprt_VPID_a, procprt_VPID_e, ' ', 5}; //DYNAMIC WIDTH!
334+ { "VPID", "VPID", .ac.doactiveconverts = procprt_VPID_a, procprt_VPID_e, ' ', 5}; //DYNAMIC WIDTH!
335 /***************************************************************/
336 char *
337 procprt_CTID_a(struct tstat *curstat, int avgval, int nsecs)
338@@ -709,7 +709,7 @@ procprt_CTID_e(struct tstat *curstat, int avgval, int nsecs)
339 }
340
341 detail_printdef procprt_CTID =
342- { " CTID", "CTID", procprt_CTID_a, procprt_CTID_e, ' ', 5};
343+ { " CTID", "CTID", .ac.doactiveconverts = procprt_CTID_a, procprt_CTID_e, ' ', 5};
344 /***************************************************************/
345 char *
346 procprt_CID_a(struct tstat *curstat, int avgval, int nsecs)
347@@ -738,7 +738,7 @@ procprt_CID_e(struct tstat *curstat, int avgval, int nsecs)
348 }
349
350 detail_printdef procprt_CID =
351- { "CID/POD ", "CID", procprt_CID_a, procprt_CID_e, ' ', 15};
352+ { "CID/POD ", "CID", .ac.doactiveconverts = procprt_CID_a, procprt_CID_e, ' ', 15};
353 /***************************************************************/
354 char *
355 procprt_SYSCPU_ae(struct tstat *curstat, int avgval, int nsecs)
356@@ -750,7 +750,7 @@ procprt_SYSCPU_ae(struct tstat *curstat, int avgval, int nsecs)
357 }
358
359 detail_printdef procprt_SYSCPU =
360- { "SYSCPU", "SYSCPU", procprt_SYSCPU_ae, procprt_SYSCPU_ae, ' ', 6};
361+ { "SYSCPU", "SYSCPU", .ac.doactiveconverts = procprt_SYSCPU_ae, procprt_SYSCPU_ae, ' ', 6};
362 /***************************************************************/
363 char *
364 procprt_USRCPU_ae(struct tstat *curstat, int avgval, int nsecs)
365@@ -762,7 +762,7 @@ procprt_USRCPU_ae(struct tstat *curstat, int avgval, int nsecs)
366 }
367
368 detail_printdef procprt_USRCPU =
369- { "USRCPU", "USRCPU", procprt_USRCPU_ae, procprt_USRCPU_ae, ' ', 6};
370+ { "USRCPU", "USRCPU", .ac.doactiveconverts = procprt_USRCPU_ae, procprt_USRCPU_ae, ' ', 6};
371 /***************************************************************/
372 char *
373 procprt_VGROW_a(struct tstat *curstat, int avgval, int nsecs)
374@@ -780,7 +780,7 @@ procprt_VGROW_e(struct tstat *curstat, int avgval, int nsecs)
375 }
376
377 detail_printdef procprt_VGROW =
378- { " VGROW", "VGROW", procprt_VGROW_a, procprt_VGROW_e, ' ', 6};
379+ { " VGROW", "VGROW", .ac.doactiveconverts = procprt_VGROW_a, procprt_VGROW_e, ' ', 6};
380 /***************************************************************/
381 char *
382 procprt_RGROW_a(struct tstat *curstat, int avgval, int nsecs)
383@@ -798,7 +798,7 @@ procprt_RGROW_e(struct tstat *curstat, int avgval, int nsecs)
384 }
385
386 detail_printdef procprt_RGROW =
387- { " RGROW", "RGROW", procprt_RGROW_a, procprt_RGROW_e, ' ', 6};
388+ { " RGROW", "RGROW", .ac.doactiveconverts = procprt_RGROW_a, procprt_RGROW_e, ' ', 6};
389 /***************************************************************/
390 char *
391 procprt_MINFLT_ae(struct tstat *curstat, int avgval, int nsecs)
392@@ -810,7 +810,7 @@ procprt_MINFLT_ae(struct tstat *curstat, int avgval, int nsecs)
393 }
394
395 detail_printdef procprt_MINFLT =
396- { "MINFLT", "MINFLT", procprt_MINFLT_ae, procprt_MINFLT_ae, ' ', 6};
397+ { "MINFLT", "MINFLT", .ac.doactiveconverts = procprt_MINFLT_ae, procprt_MINFLT_ae, ' ', 6};
398 /***************************************************************/
399 char *
400 procprt_MAJFLT_ae(struct tstat *curstat, int avgval, int nsecs)
401@@ -822,7 +822,7 @@ procprt_MAJFLT_ae(struct tstat *curstat, int avgval, int nsecs)
402 }
403
404 detail_printdef procprt_MAJFLT =
405- { "MAJFLT", "MAJFLT", procprt_MAJFLT_ae, procprt_MAJFLT_ae, ' ', 6};
406+ { "MAJFLT", "MAJFLT", .ac.doactiveconverts = procprt_MAJFLT_ae, procprt_MAJFLT_ae, ' ', 6};
407 /***************************************************************/
408 char *
409 procprt_VSTEXT_a(struct tstat *curstat, int avgval, int nsecs)
410@@ -840,7 +840,7 @@ procprt_VSTEXT_e(struct tstat *curstat, int avgval, int nsecs)
411 }
412
413 detail_printdef procprt_VSTEXT =
414- { "VSTEXT", "VSTEXT", procprt_VSTEXT_a, procprt_VSTEXT_e, ' ', 6};
415+ { "VSTEXT", "VSTEXT", .ac.doactiveconverts = procprt_VSTEXT_a, procprt_VSTEXT_e, ' ', 6};
416 /***************************************************************/
417 char *
418 procprt_VSIZE_a(struct tstat *curstat, int avgval, int nsecs)
419@@ -858,7 +858,7 @@ procprt_VSIZE_e(struct tstat *curstat, int avgval, int nsecs)
420 }
421
422 detail_printdef procprt_VSIZE =
423- { " VSIZE", "VSIZE", procprt_VSIZE_a, procprt_VSIZE_e, ' ', 6};
424+ { " VSIZE", "VSIZE", .ac.doactiveconverts = procprt_VSIZE_a, procprt_VSIZE_e, ' ', 6};
425 /***************************************************************/
426 char *
427 procprt_RSIZE_a(struct tstat *curstat, int avgval, int nsecs)
428@@ -876,7 +876,7 @@ procprt_RSIZE_e(struct tstat *curstat, int avgval, int nsecs)
429 }
430
431 detail_printdef procprt_RSIZE =
432- { " RSIZE", "RSIZE", procprt_RSIZE_a, procprt_RSIZE_e, ' ', 6};
433+ { " RSIZE", "RSIZE", .ac.doactiveconverts = procprt_RSIZE_a, procprt_RSIZE_e, ' ', 6};
434 /***************************************************************/
435 char *
436 procprt_PSIZE_a(struct tstat *curstat, int avgval, int nsecs)
437@@ -897,7 +897,7 @@ procprt_PSIZE_e(struct tstat *curstat, int avgval, int nsecs)
438 }
439
440 detail_printdef procprt_PSIZE =
441- { " PSIZE", "PSIZE", procprt_PSIZE_a, procprt_PSIZE_e, ' ', 6};
442+ { " PSIZE", "PSIZE", .ac.doactiveconverts = procprt_PSIZE_a, procprt_PSIZE_e, ' ', 6};
443 /***************************************************************/
444 char *
445 procprt_VSLIBS_a(struct tstat *curstat, int avgval, int nsecs)
446@@ -915,7 +915,7 @@ procprt_VSLIBS_e(struct tstat *curstat, int avgval, int nsecs)
447 }
448
449 detail_printdef procprt_VSLIBS =
450- { "VSLIBS", "VSLIBS", procprt_VSLIBS_a, procprt_VSLIBS_e, ' ', 6};
451+ { "VSLIBS", "VSLIBS", .ac.doactiveconverts = procprt_VSLIBS_a, procprt_VSLIBS_e, ' ', 6};
452 /***************************************************************/
453 char *
454 procprt_VDATA_a(struct tstat *curstat, int avgval, int nsecs)
455@@ -933,7 +933,7 @@ procprt_VDATA_e(struct tstat *curstat, int avgval, int nsecs)
456 }
457
458 detail_printdef procprt_VDATA =
459- { " VDATA", "VDATA", procprt_VDATA_a, procprt_VDATA_e, ' ', 6};
460+ { " VDATA", "VDATA", .ac.doactiveconverts = procprt_VDATA_a, procprt_VDATA_e, ' ', 6};
461 /***************************************************************/
462 char *
463 procprt_VSTACK_a(struct tstat *curstat, int avgval, int nsecs)
464@@ -951,7 +951,7 @@ procprt_VSTACK_e(struct tstat *curstat, int avgval, int nsecs)
465 }
466
467 detail_printdef procprt_VSTACK =
468- { "VSTACK", "VSTACK", procprt_VSTACK_a, procprt_VSTACK_e, ' ', 6};
469+ { "VSTACK", "VSTACK", .ac.doactiveconverts = procprt_VSTACK_a, procprt_VSTACK_e, ' ', 6};
470 /***************************************************************/
471 char *
472 procprt_SWAPSZ_a(struct tstat *curstat, int avgval, int nsecs)
473@@ -969,7 +969,7 @@ procprt_SWAPSZ_e(struct tstat *curstat, int avgval, int nsecs)
474 }
475
476 detail_printdef procprt_SWAPSZ =
477- { "SWAPSZ", "SWAPSZ", procprt_SWAPSZ_a, procprt_SWAPSZ_e, ' ', 6};
478+ { "SWAPSZ", "SWAPSZ", .ac.doactiveconverts = procprt_SWAPSZ_a, procprt_SWAPSZ_e, ' ', 6};
479 /***************************************************************/
480 char *
481 procprt_LOCKSZ_a(struct tstat *curstat, int avgval, int nsecs)
482@@ -987,7 +987,7 @@ procprt_LOCKSZ_e(struct tstat *curstat, int avgval, int nsecs)
483 }
484
485 detail_printdef procprt_LOCKSZ =
486- { "LOCKSZ", "LOCKSZ", procprt_LOCKSZ_a, procprt_LOCKSZ_e, ' ', 6};
487+ { "LOCKSZ", "LOCKSZ", .ac.doactiveconverts = procprt_LOCKSZ_a, procprt_LOCKSZ_e, ' ', 6};
488 /***************************************************************/
489 char *
490 procprt_CMD_a(struct tstat *curstat, int avgval, int nsecs)
491@@ -1010,7 +1010,7 @@ procprt_CMD_e(struct tstat *curstat, int avgval, int nsecs)
492 }
493
494 detail_printdef procprt_CMD =
495- { "CMD ", "CMD", procprt_CMD_a, procprt_CMD_e, ' ', 14};
496+ { "CMD ", "CMD", .ac.doactiveconverts = procprt_CMD_a, procprt_CMD_e, ' ', 14};
497 /***************************************************************/
498 char *
499 procprt_RUID_ae(struct tstat *curstat, int avgval, int nsecs)
500@@ -1023,7 +1023,7 @@ procprt_RUID_ae(struct tstat *curstat, int avgval, int nsecs)
501 }
502
503 detail_printdef procprt_RUID =
504- { "RUID ", "RUID", procprt_RUID_ae, procprt_RUID_ae, ' ', 8};
505+ { "RUID ", "RUID", .ac.doactiveconverts = procprt_RUID_ae, procprt_RUID_ae, ' ', 8};
506 /***************************************************************/
507 char *
508 procprt_EUID_a(struct tstat *curstat, int avgval, int nsecs)
509@@ -1042,7 +1042,7 @@ procprt_EUID_e(struct tstat *curstat, int avgval, int nsecs)
510 }
511
512 detail_printdef procprt_EUID =
513- { "EUID ", "EUID", procprt_EUID_a, procprt_EUID_e, ' ', 8};
514+ { "EUID ", "EUID", .ac.doactiveconverts = procprt_EUID_a, procprt_EUID_e, ' ', 8};
515 /***************************************************************/
516 char *
517 procprt_SUID_a(struct tstat *curstat, int avgval, int nsecs)
518@@ -1061,7 +1061,7 @@ procprt_SUID_e(struct tstat *curstat, int avgval, int nsecs)
519 }
520
521 detail_printdef procprt_SUID =
522- { "SUID ", "SUID", procprt_SUID_a, procprt_SUID_e, ' ', 8};
523+ { "SUID ", "SUID", .ac.doactiveconverts = procprt_SUID_a, procprt_SUID_e, ' ', 8};
524 /***************************************************************/
525 char *
526 procprt_FSUID_a(struct tstat *curstat, int avgval, int nsecs)
527@@ -1080,7 +1080,7 @@ procprt_FSUID_e(struct tstat *curstat, int avgval, int nsecs)
528 }
529
530 detail_printdef procprt_FSUID =
531- { "FSUID ", "FSUID", procprt_FSUID_a, procprt_FSUID_e, ' ', 8};
532+ { "FSUID ", "FSUID", .ac.doactiveconverts = procprt_FSUID_a, procprt_FSUID_e, ' ', 8};
533 /***************************************************************/
534 char *
535 procprt_RGID_ae(struct tstat *curstat, int avgval, int nsecs)
536@@ -1093,7 +1093,7 @@ procprt_RGID_ae(struct tstat *curstat, int avgval, int nsecs)
537 }
538
539 detail_printdef procprt_RGID =
540- { "RGID ", "RGID", procprt_RGID_ae, procprt_RGID_ae, ' ', 8};
541+ { "RGID ", "RGID", .ac.doactiveconverts = procprt_RGID_ae, procprt_RGID_ae, ' ', 8};
542 /***************************************************************/
543 char *
544 procprt_EGID_a(struct tstat *curstat, int avgval, int nsecs)
545@@ -1112,7 +1112,7 @@ procprt_EGID_e(struct tstat *curstat, int avgval, int nsecs)
546 }
547
548 detail_printdef procprt_EGID =
549- { "EGID ", "EGID", procprt_EGID_a, procprt_EGID_e, ' ', 8};
550+ { "EGID ", "EGID", .ac.doactiveconverts = procprt_EGID_a, procprt_EGID_e, ' ', 8};
551 /***************************************************************/
552 char *
553 procprt_SGID_a(struct tstat *curstat, int avgval, int nsecs)
554@@ -1131,7 +1131,7 @@ procprt_SGID_e(struct tstat *curstat, int avgval, int nsecs)
555 }
556
557 detail_printdef procprt_SGID =
558- { "SGID ", "SGID", procprt_SGID_a, procprt_SGID_e, ' ', 8};
559+ { "SGID ", "SGID", .ac.doactiveconverts = procprt_SGID_a, procprt_SGID_e, ' ', 8};
560 /***************************************************************/
561 char *
562 procprt_FSGID_a(struct tstat *curstat, int avgval, int nsecs)
563@@ -1150,7 +1150,7 @@ procprt_FSGID_e(struct tstat *curstat, int avgval, int nsecs)
564 }
565
566 detail_printdef procprt_FSGID =
567- { "FSGID ", "FSGID", procprt_FSGID_a, procprt_FSGID_e, ' ', 8};
568+ { "FSGID ", "FSGID", .ac.doactiveconverts = procprt_FSGID_a, procprt_FSGID_e, ' ', 8};
569 /***************************************************************/
570 char *
571 procprt_STDATE_ae(struct tstat *curstat, int avgval, int nsecs)
572@@ -1162,7 +1162,7 @@ procprt_STDATE_ae(struct tstat *curstat, int avgval, int nsecs)
573 }
574
575 detail_printdef procprt_STDATE =
576- { " STDATE ", "STDATE", procprt_STDATE_ae, procprt_STDATE_ae, ' ', 10};
577+ { " STDATE ", "STDATE", .ac.doactiveconverts = procprt_STDATE_ae, procprt_STDATE_ae, ' ', 10};
578 /***************************************************************/
579 char *
580 procprt_STTIME_ae(struct tstat *curstat, int avgval, int nsecs)
581@@ -1174,7 +1174,7 @@ procprt_STTIME_ae(struct tstat *curstat, int avgval, int nsecs)
582 }
583
584 detail_printdef procprt_STTIME =
585- { " STTIME ", "STTIME", procprt_STTIME_ae, procprt_STTIME_ae, ' ', 8};
586+ { " STTIME ", "STTIME", .ac.doactiveconverts = procprt_STTIME_ae, procprt_STTIME_ae, ' ', 8};
587 /***************************************************************/
588 char *
589 procprt_ENDATE_a(struct tstat *curstat, int avgval, int nsecs)
590@@ -1197,7 +1197,7 @@ procprt_ENDATE_e(struct tstat *curstat, int avgval, int nsecs)
591 }
592
593 detail_printdef procprt_ENDATE =
594- { " ENDATE ", "ENDATE", procprt_ENDATE_a, procprt_ENDATE_e, ' ', 10};
595+ { " ENDATE ", "ENDATE", .ac.doactiveconverts = procprt_ENDATE_a, procprt_ENDATE_e, ' ', 10};
596 /***************************************************************/
597 char *
598 procprt_ENTIME_a(struct tstat *curstat, int avgval, int nsecs)
599@@ -1220,7 +1220,7 @@ procprt_ENTIME_e(struct tstat *curstat, int avgval, int nsecs)
600 }
601
602 detail_printdef procprt_ENTIME =
603- { " ENTIME ", "ENTIME", procprt_ENTIME_a, procprt_ENTIME_e, ' ', 8};
604+ { " ENTIME ", "ENTIME", .ac.doactiveconverts = procprt_ENTIME_a, procprt_ENTIME_e, ' ', 8};
605 /***************************************************************/
606 char *
607 procprt_THR_a(struct tstat *curstat, int avgval, int nsecs)
608@@ -1238,7 +1238,7 @@ procprt_THR_e(struct tstat *curstat, int avgval, int nsecs)
609 }
610
611 detail_printdef procprt_THR =
612- { " THR", "THR", procprt_THR_a, procprt_THR_e, ' ', 4};
613+ { " THR", "THR", .ac.doactiveconverts = procprt_THR_a, procprt_THR_e, ' ', 4};
614 /***************************************************************/
615 char *
616 procprt_TRUN_a(struct tstat *curstat, int avgval, int nsecs)
617@@ -1256,7 +1256,7 @@ procprt_TRUN_e(struct tstat *curstat, int avgval, int nsecs)
618 }
619
620 detail_printdef procprt_TRUN =
621- { "TRUN", "TRUN", procprt_TRUN_a, procprt_TRUN_e, ' ', 4};
622+ { "TRUN", "TRUN", .ac.doactiveconverts = procprt_TRUN_a, procprt_TRUN_e, ' ', 4};
623 /***************************************************************/
624 char *
625 procprt_TSLPI_a(struct tstat *curstat, int avgval, int nsecs)
626@@ -1274,7 +1274,7 @@ procprt_TSLPI_e(struct tstat *curstat, int avgval, int nsecs)
627 }
628
629 detail_printdef procprt_TSLPI =
630- { "TSLPI", "TSLPI", procprt_TSLPI_a, procprt_TSLPI_e, ' ', 5};
631+ { "TSLPI", "TSLPI", .ac.doactiveconverts = procprt_TSLPI_a, procprt_TSLPI_e, ' ', 5};
632 /***************************************************************/
633 char *
634 procprt_TSLPU_a(struct tstat *curstat, int avgval, int nsecs)
635@@ -1292,7 +1292,7 @@ procprt_TSLPU_e(struct tstat *curstat, int avgval, int nsecs)
636 }
637
638 detail_printdef procprt_TSLPU =
639- { "TSLPU", "TSLPU", procprt_TSLPU_a, procprt_TSLPU_e, ' ', 5};
640+ { "TSLPU", "TSLPU", .ac.doactiveconverts = procprt_TSLPU_a, procprt_TSLPU_e, ' ', 5};
641 /***************************************************************/
642 char *
643 procprt_TIDLE_a(struct tstat *curstat, int avgval, int nsecs)
644@@ -1310,7 +1310,7 @@ procprt_TIDLE_e(struct tstat *curstat, int avgval, int nsecs)
645 }
646
647 detail_printdef procprt_TIDLE =
648- { "TIDLE", "TIDLE", procprt_TIDLE_a, procprt_TIDLE_e, ' ', 5};
649+ { "TIDLE", "TIDLE", .ac.doactiveconverts = procprt_TIDLE_a, procprt_TIDLE_e, ' ', 5};
650 /***************************************************************/
651 #define SCHED_NORMAL 0
652 #define SCHED_FIFO 1
653@@ -1357,7 +1357,7 @@ procprt_POLI_e(struct tstat *curstat, int avgval, int nsecs)
654 }
655
656 detail_printdef procprt_POLI =
657- { "POLI", "POLI", procprt_POLI_a, procprt_POLI_e, ' ', 4};
658+ { "POLI", "POLI", .ac.doactiveconverts = procprt_POLI_a, procprt_POLI_e, ' ', 4};
659 /***************************************************************/
660 char *
661 procprt_NICE_a(struct tstat *curstat, int avgval, int nsecs)
662@@ -1375,7 +1375,7 @@ procprt_NICE_e(struct tstat *curstat, int avgval, int nsecs)
663 }
664
665 detail_printdef procprt_NICE =
666- { "NICE", "NICE", procprt_NICE_a, procprt_NICE_e, ' ', 4};
667+ { "NICE", "NICE", .ac.doactiveconverts = procprt_NICE_a, procprt_NICE_e, ' ', 4};
668 /***************************************************************/
669 char *
670 procprt_PRI_a(struct tstat *curstat, int avgval, int nsecs)
671@@ -1393,7 +1393,7 @@ procprt_PRI_e(struct tstat *curstat, int avgval, int nsecs)
672 }
673
674 detail_printdef procprt_PRI =
675- { "PRI", "PRI", procprt_PRI_a, procprt_PRI_e, ' ', 3};
676+ { "PRI", "PRI", .ac.doactiveconverts = procprt_PRI_a, procprt_PRI_e, ' ', 3};
677 /***************************************************************/
678 char *
679 procprt_RTPR_a(struct tstat *curstat, int avgval, int nsecs)
680@@ -1411,7 +1411,7 @@ procprt_RTPR_e(struct tstat *curstat, int avgval, int nsecs)
681 }
682
683 detail_printdef procprt_RTPR =
684- { "RTPR", "RTPR", procprt_RTPR_a, procprt_RTPR_e, ' ', 4};
685+ { "RTPR", "RTPR", .ac.doactiveconverts = procprt_RTPR_a, procprt_RTPR_e, ' ', 4};
686 /***************************************************************/
687 char *
688 procprt_CURCPU_a(struct tstat *curstat, int avgval, int nsecs)
689@@ -1429,7 +1429,7 @@ procprt_CURCPU_e(struct tstat *curstat, int avgval, int nsecs)
690 }
691
692 detail_printdef procprt_CURCPU =
693- { "CPUNR", "CPUNR", procprt_CURCPU_a, procprt_CURCPU_e, ' ', 5};
694+ { "CPUNR", "CPUNR", .ac.doactiveconverts = procprt_CURCPU_a, procprt_CURCPU_e, ' ', 5};
695 /***************************************************************/
696 char *
697 procprt_ST_a(struct tstat *curstat, int avgval, int nsecs)
698@@ -1473,7 +1473,7 @@ procprt_ST_e(struct tstat *curstat, int avgval, int nsecs)
699 }
700
701 detail_printdef procprt_ST =
702- { "ST", "ST", procprt_ST_a, procprt_ST_e, ' ', 2};
703+ { "ST", "ST", .ac.doactiveconverts = procprt_ST_a, procprt_ST_e, ' ', 2};
704 /***************************************************************/
705 char *
706 procprt_EXC_a(struct tstat *curstat, int avgval, int nsecs)
707@@ -1496,7 +1496,7 @@ procprt_EXC_e(struct tstat *curstat, int avgval, int nsecs)
708
709
710 detail_printdef procprt_EXC =
711- { "EXC", "EXC", procprt_EXC_a, procprt_EXC_e, ' ', 3};
712+ { "EXC", "EXC", .ac.doactiveconverts = procprt_EXC_a, procprt_EXC_e, ' ', 3};
713 /***************************************************************/
714 char *
715 procprt_S_a(struct tstat *curstat, int avgval, int nsecs)
716@@ -1515,7 +1515,7 @@ procprt_S_e(struct tstat *curstat, int avgval, int nsecs)
717 }
718
719 detail_printdef procprt_S =
720- { "S", "S", procprt_S_a, procprt_S_e, ' ', 1};
721+ { "S", "S", .ac.doactiveconverts = procprt_S_a, procprt_S_e, ' ', 1};
722
723 /***************************************************************/
724 char *
725@@ -1546,7 +1546,7 @@ procprt_COMMAND_LINE_ae(struct tstat *curstat, int avgval, int nsecs)
726 detail_printdef procprt_COMMAND_LINE =
727 { "COMMAND-LINE (horizontal scroll with <- and -> keys)",
728 "COMMAND-LINE",
729- procprt_COMMAND_LINE_ae, procprt_COMMAND_LINE_ae, ' ', 0, 1};
730+ .ac.doactiveconverts = procprt_COMMAND_LINE_ae, procprt_COMMAND_LINE_ae, ' ', 0, 1};
731 /***************************************************************/
732 char *
733 procprt_NPROCS_ae(struct tstat *curstat, int avgval, int nsecs)
734@@ -1558,7 +1558,7 @@ procprt_NPROCS_ae(struct tstat *curstat, int avgval, int nsecs)
735 }
736
737 detail_printdef procprt_NPROCS =
738- { "NPROCS", "NPROCS", procprt_NPROCS_ae, procprt_NPROCS_ae, ' ', 6};
739+ { "NPROCS", "NPROCS", .ac.doactiveconverts = procprt_NPROCS_ae, procprt_NPROCS_ae, ' ', 6};
740 /***************************************************************/
741 char *
742 procprt_RDDSK_a(struct tstat *curstat, int avgval, int nsecs)
743@@ -1580,7 +1580,7 @@ procprt_RDDSK_e(struct tstat *curstat, int avgval, int nsecs)
744 }
745
746 detail_printdef procprt_RDDSK =
747- { " RDDSK", "RDDSK", procprt_RDDSK_a, procprt_RDDSK_e, ' ', 6};
748+ { " RDDSK", "RDDSK", .ac.doactiveconverts = procprt_RDDSK_a, procprt_RDDSK_e, ' ', 6};
749 /***************************************************************/
750 char *
751 procprt_WRDSK_a(struct tstat *curstat, int avgval, int nsecs)
752@@ -1602,7 +1602,7 @@ procprt_WRDSK_e(struct tstat *curstat, int avgval, int nsecs)
753 }
754
755 detail_printdef procprt_WRDSK =
756- { " WRDSK", "WRDSK", procprt_WRDSK_a, procprt_WRDSK_e, ' ', 6};
757+ { " WRDSK", "WRDSK", .ac.doactiveconverts = procprt_WRDSK_a, procprt_WRDSK_e, ' ', 6};
758 /***************************************************************/
759 char *
760 procprt_CWRDSK_a(struct tstat *curstat, int avgval, int nsecs)
761@@ -1621,7 +1621,7 @@ procprt_CWRDSK_a(struct tstat *curstat, int avgval, int nsecs)
762 }
763
764 detail_printdef procprt_CWRDSK =
765- {" WRDSK", "CWRDSK", procprt_CWRDSK_a, procprt_WRDSK_e, ' ', 6};
766+ {" WRDSK", "CWRDSK", .ac.doactiveconverts = procprt_CWRDSK_a, procprt_WRDSK_e, ' ', 6};
767 /***************************************************************/
768 char *
769 procprt_WCANCEL_a(struct tstat *curstat, int avgval, int nsecs)
770@@ -1643,7 +1643,7 @@ procprt_WCANCEL_e(struct tstat *curstat, int avgval, int nsecs)
771 }
772
773 detail_printdef procprt_WCANCEL =
774- {"WCANCL", "WCANCL", procprt_WCANCEL_a, procprt_WCANCEL_e, ' ', 6};
775+ {"WCANCL", "WCANCL", .ac.doactiveconverts = procprt_WCANCEL_a, procprt_WCANCEL_e, ' ', 6};
776 /***************************************************************/
777 char *
778 procprt_TCPRCV_a(struct tstat *curstat, int avgval, int nsecs)
779@@ -1672,7 +1672,7 @@ procprt_TCPRCV_e(struct tstat *curstat, int avgval, int nsecs)
780
781
782 detail_printdef procprt_TCPRCV =
783- { "TCPRCV", "TCPRCV", procprt_TCPRCV_a, procprt_TCPRCV_e, ' ', 6};
784+ { "TCPRCV", "TCPRCV", .ac.doactiveconverts = procprt_TCPRCV_a, procprt_TCPRCV_e, ' ', 6};
785 /***************************************************************/
786 char *
787 procprt_TCPRASZ_a(struct tstat *curstat, int avgval, int nsecs)
788@@ -1704,7 +1704,7 @@ procprt_TCPRASZ_e(struct tstat *curstat, int avgval, int nsecs)
789 }
790
791 detail_printdef procprt_TCPRASZ =
792- { "TCPRASZ", "TCPRASZ", procprt_TCPRASZ_a, procprt_TCPRASZ_e, ' ', 7};
793+ { "TCPRASZ", "TCPRASZ", .ac.doactiveconverts = procprt_TCPRASZ_a, procprt_TCPRASZ_e, ' ', 7};
794 /***************************************************************/
795 char *
796 procprt_TCPSND_a(struct tstat *curstat, int avgval, int nsecs)
797@@ -1732,7 +1732,7 @@ procprt_TCPSND_e(struct tstat *curstat, int avgval, int nsecs)
798 }
799
800 detail_printdef procprt_TCPSND =
801- { "TCPSND", "TCPSND", procprt_TCPSND_a, procprt_TCPSND_e, ' ', 6};
802+ { "TCPSND", "TCPSND", .ac.doactiveconverts = procprt_TCPSND_a, procprt_TCPSND_e, ' ', 6};
803 /***************************************************************/
804 char *
805 procprt_TCPSASZ_a(struct tstat *curstat, int avgval, int nsecs)
806@@ -1764,7 +1764,7 @@ procprt_TCPSASZ_e(struct tstat *curstat, int avgval, int nsecs)
807 }
808
809 detail_printdef procprt_TCPSASZ =
810- { "TCPSASZ", "TCPSASZ", procprt_TCPSASZ_a, procprt_TCPSASZ_e, ' ', 7};
811+ { "TCPSASZ", "TCPSASZ", .ac.doactiveconverts = procprt_TCPSASZ_a, procprt_TCPSASZ_e, ' ', 7};
812 /***************************************************************/
813 char *
814 procprt_UDPRCV_a(struct tstat *curstat, int avgval, int nsecs)
815@@ -1793,7 +1793,7 @@ procprt_UDPRCV_e(struct tstat *curstat, int avgval, int nsecs)
816
817
818 detail_printdef procprt_UDPRCV =
819- { "UDPRCV", "UDPRCV", procprt_UDPRCV_a, procprt_UDPRCV_e, ' ', 6};
820+ { "UDPRCV", "UDPRCV", .ac.doactiveconverts = procprt_UDPRCV_a, procprt_UDPRCV_e, ' ', 6};
821 /***************************************************************/
822 char *
823 procprt_UDPRASZ_a(struct tstat *curstat, int avgval, int nsecs)
824@@ -1826,7 +1826,7 @@ procprt_UDPRASZ_e(struct tstat *curstat, int avgval, int nsecs)
825
826
827 detail_printdef procprt_UDPRASZ =
828- { "UDPRASZ", "UDPRASZ", procprt_UDPRASZ_a, procprt_UDPRASZ_e, ' ', 7};
829+ { "UDPRASZ", "UDPRASZ", .ac.doactiveconverts = procprt_UDPRASZ_a, procprt_UDPRASZ_e, ' ', 7};
830 /***************************************************************/
831 char *
832 procprt_UDPSND_a(struct tstat *curstat, int avgval, int nsecs)
833@@ -1854,7 +1854,7 @@ procprt_UDPSND_e(struct tstat *curstat, int avgval, int nsecs)
834 }
835
836 detail_printdef procprt_UDPSND =
837- { "UDPSND", "UDPSND", procprt_UDPSND_a, procprt_UDPSND_e, ' ', 6};
838+ { "UDPSND", "UDPSND", .ac.doactiveconverts = procprt_UDPSND_a, procprt_UDPSND_e, ' ', 6};
839 /***************************************************************/
840 char *
841 procprt_UDPSASZ_a(struct tstat *curstat, int avgval, int nsecs)
842@@ -1887,7 +1887,7 @@ procprt_UDPSASZ_e(struct tstat *curstat, int avgval, int nsecs)
843
844
845 detail_printdef procprt_UDPSASZ =
846- { "UDPSASZ", "UDPSASZ", procprt_UDPSASZ_a, procprt_UDPSASZ_e, ' ', 7};
847+ { "UDPSASZ", "UDPSASZ", .ac.doactiveconverts = procprt_UDPSASZ_a, procprt_UDPSASZ_e, ' ', 7};
848 /***************************************************************/
849 char *
850 procprt_RNET_a(struct tstat *curstat, int avgval, int nsecs)
851@@ -1917,7 +1917,7 @@ procprt_RNET_e(struct tstat *curstat, int avgval, int nsecs)
852 }
853
854 detail_printdef procprt_RNET =
855- { " RNET", "RNET", procprt_RNET_a, procprt_RNET_e, ' ', 5};
856+ { " RNET", "RNET", .ac.doactiveconverts = procprt_RNET_a, procprt_RNET_e, ' ', 5};
857 /***************************************************************/
858 char *
859 procprt_SNET_a(struct tstat *curstat, int avgval, int nsecs)
860@@ -1945,7 +1945,7 @@ procprt_SNET_e(struct tstat *curstat, int avgval, int nsecs)
861 }
862
863 detail_printdef procprt_SNET =
864- { " SNET", "SNET", procprt_SNET_a, procprt_SNET_e, ' ', 5};
865+ { " SNET", "SNET", .ac.doactiveconverts = procprt_SNET_a, procprt_SNET_e, ' ', 5};
866 /***************************************************************/
867 char *
868 procprt_BANDWI_a(struct tstat *curstat, int avgval, int nsecs)
869@@ -1974,7 +1974,7 @@ procprt_BANDWI_e(struct tstat *curstat, int avgval, int nsecs)
870 }
871
872 detail_printdef procprt_BANDWI =
873- { " BANDWI", "BANDWI", procprt_BANDWI_a, procprt_BANDWI_e, ' ', 9};
874+ { " BANDWI", "BANDWI", .ac.doactiveconverts = procprt_BANDWI_a, procprt_BANDWI_e, ' ', 9};
875 /***************************************************************/
876 char *
877 procprt_BANDWO_a(struct tstat *curstat, int avgval, int nsecs)
878@@ -2003,7 +2003,7 @@ procprt_BANDWO_e(struct tstat *curstat, int avgval, int nsecs)
879 }
880
881 detail_printdef procprt_BANDWO =
882- { " BANDWO", "BANDWO", procprt_BANDWO_a, procprt_BANDWO_e, ' ', 9};
883+ { " BANDWO", "BANDWO", .ac.doactiveconverts = procprt_BANDWO_a, procprt_BANDWO_e, ' ', 9};
884 /***************************************************************/
885 static void
886 format_bandw(char *buf, count_t kbps)
887@@ -2069,7 +2069,7 @@ procprt_GPULIST_ae(struct tstat *curstat, int avgval, int nsecs)
888 }
889
890 detail_printdef procprt_GPULIST =
891- { " GPUNUMS", "GPULIST", procprt_GPULIST_ae, procprt_GPULIST_ae, ' ', 8};
892+ { " GPUNUMS", "GPULIST", .ac.doactiveconverts = procprt_GPULIST_ae, procprt_GPULIST_ae, ' ', 8};
893 /***************************************************************/
894 char *
895 procprt_GPUMEMNOW_ae(struct tstat *curstat, int avgval, int nsecs)
896@@ -2084,7 +2084,7 @@ procprt_GPUMEMNOW_ae(struct tstat *curstat, int avgval, int nsecs)
897 }
898
899 detail_printdef procprt_GPUMEMNOW =
900- { "MEMNOW", "GPUMEM", procprt_GPUMEMNOW_ae, procprt_GPUMEMNOW_ae, ' ', 6};
901+ { "MEMNOW", "GPUMEM", .ac.doactiveconverts = procprt_GPUMEMNOW_ae, procprt_GPUMEMNOW_ae, ' ', 6};
902 /***************************************************************/
903 char *
904 procprt_GPUMEMAVG_ae(struct tstat *curstat, int avgval, int nsecs)
905@@ -2103,7 +2103,7 @@ procprt_GPUMEMAVG_ae(struct tstat *curstat, int avgval, int nsecs)
906 }
907
908 detail_printdef procprt_GPUMEMAVG =
909- { "MEMAVG", "GPUMEMAVG", procprt_GPUMEMAVG_ae, procprt_GPUMEMAVG_ae, ' ', 6};
910+ { "MEMAVG", "GPUMEMAVG", .ac.doactiveconverts = procprt_GPUMEMAVG_ae, procprt_GPUMEMAVG_ae, ' ', 6};
911 /***************************************************************/
912 char *
913 procprt_GPUGPUBUSY_ae(struct tstat *curstat, int avgval, int nsecs)
914@@ -2121,7 +2121,7 @@ procprt_GPUGPUBUSY_ae(struct tstat *curstat, int avgval, int nsecs)
915 }
916
917 detail_printdef procprt_GPUGPUBUSY =
918- { "GPUBUSY", "GPUGPUBUSY", procprt_GPUGPUBUSY_ae, procprt_GPUGPUBUSY_ae, ' ', 7};
919+ { "GPUBUSY", "GPUGPUBUSY", .ac.doactiveconverts = procprt_GPUGPUBUSY_ae, procprt_GPUGPUBUSY_ae, ' ', 7};
920 /***************************************************************/
921 char *
922 procprt_GPUMEMBUSY_ae(struct tstat *curstat, int avgval, int nsecs)
923@@ -2139,7 +2139,7 @@ procprt_GPUMEMBUSY_ae(struct tstat *curstat, int avgval, int nsecs)
924 }
925
926 detail_printdef procprt_GPUMEMBUSY =
927- { "MEMBUSY", "GPUMEMBUSY", procprt_GPUMEMBUSY_ae, procprt_GPUMEMBUSY_ae, ' ', 7};
928+ { "MEMBUSY", "GPUMEMBUSY", .ac.doactiveconverts = procprt_GPUMEMBUSY_ae, procprt_GPUMEMBUSY_ae, ' ', 7};
929 /***************************************************************/
930 char *
931 procprt_WCHAN_a(struct tstat *curstat, int avgval, int nsecs)
932@@ -2164,7 +2164,7 @@ procprt_WCHAN_e(struct tstat *curstat, int avgval, int nsecs)
933 }
934
935 detail_printdef procprt_WCHAN =
936- { "WCHAN ", "WCHAN", procprt_WCHAN_a, procprt_WCHAN_e, ' ', 15};
937+ { "WCHAN ", "WCHAN", .ac.doactiveconverts = procprt_WCHAN_a, procprt_WCHAN_e, ' ', 15};
938 /***************************************************************/
939 char *
940 procprt_RUNDELAY_a(struct tstat *curstat, int avgval, int nsecs)
941@@ -2185,7 +2185,7 @@ procprt_RUNDELAY_e(struct tstat *curstat, int avgval, int nsecs)
942 }
943
944 detail_printdef procprt_RUNDELAY =
945- { "RDELAY", "RDELAY", procprt_RUNDELAY_a, procprt_RUNDELAY_e, ' ', 6};
946+ { "RDELAY", "RDELAY", .ac.doactiveconverts = procprt_RUNDELAY_a, procprt_RUNDELAY_e, ' ', 6};
947 /***************************************************************/
948 char *
949 procprt_BLKDELAY_a(struct tstat *curstat, int avgval, int nsecs)
950@@ -2206,7 +2206,7 @@ procprt_BLKDELAY_e(struct tstat *curstat, int avgval, int nsecs)
951 }
952
953 detail_printdef procprt_BLKDELAY =
954- { "BDELAY", "BDELAY", procprt_BLKDELAY_a, procprt_BLKDELAY_e, ' ', 6};
955+ { "BDELAY", "BDELAY", .ac.doactiveconverts = procprt_BLKDELAY_a, procprt_BLKDELAY_e, ' ', 6};
956 /***************************************************************/
957 char *
958 procprt_NVCSW_a(struct tstat *curstat, int avgval, int nsecs)
959@@ -2224,7 +2224,7 @@ procprt_NVCSW_e(struct tstat *curstat, int avgval, int nsecs)
960 }
961
962 detail_printdef procprt_NVCSW =
963- { " NVCSW", "NVCSW", procprt_NVCSW_a, procprt_NVCSW_e, ' ', 6};
964+ { " NVCSW", "NVCSW", .ac.doactiveconverts = procprt_NVCSW_a, procprt_NVCSW_e, ' ', 6};
965 /***************************************************************/
966 char *
967 procprt_NIVCSW_a(struct tstat *curstat, int avgval, int nsecs)
968@@ -2242,7 +2242,7 @@ procprt_NIVCSW_e(struct tstat *curstat, int avgval, int nsecs)
969 }
970
971 detail_printdef procprt_NIVCSW =
972- { "NIVCSW", "NIVCSW", procprt_NIVCSW_a, procprt_NIVCSW_e, ' ', 6};
973+ { "NIVCSW", "NIVCSW", .ac.doactiveconverts = procprt_NIVCSW_a, procprt_NIVCSW_e, ' ', 6};
974 /***************************************************************/
975 char *
976 procprt_SORTITEM_ae(struct tstat *curstat, int avgval, int nsecs)
977@@ -2251,7 +2251,7 @@ procprt_SORTITEM_ae(struct tstat *curstat, int avgval, int nsecs)
978 }
979
980 detail_printdef procprt_SORTITEM = // width is dynamically defined!
981- { 0, "SORTITEM", procprt_SORTITEM_ae, procprt_SORTITEM_ae, ' ', 4};
982+ { 0, "SORTITEM", .ac.doactiveconverts = procprt_SORTITEM_ae, procprt_SORTITEM_ae, ' ', 4};
983
984
985 /***************************************************************/
986@@ -2382,7 +2382,7 @@ showcgroupline(detail_printpair* elemptr,
987
988 color = 0;
989
990- buf = curelem.pf->doactiveconvert(cgchain, tstat,
991+ buf = curelem.pf->ac.doactiveconvertc(cgchain, tstat,
992 avgval, nsecs, cputicks, nrcpu, &color);
993
994 if (screen)
995@@ -2513,7 +2513,7 @@ cgroup_CGROUP_PATH(struct cgchainer *cgchain, struct tstat *tstat,
996
997 detail_printdef cgroupprt_CGROUP_PATH =
998 {"CGROUP (scroll: <- ->) ", "CGRPATH",
999- cgroup_CGROUP_PATH, NULL, ' ', 26, 0};
1000+ .ac.doactiveconvertc = cgroup_CGROUP_PATH, NULL, ' ', 26, 0};
1001 /***************************************************************/
1002 char *
1003 cgroup_CGRNPROCS(struct cgchainer *cgchain, struct tstat *tstat,
1004@@ -2530,7 +2530,7 @@ cgroup_CGRNPROCS(struct cgchainer *cgchain, struct tstat *tstat,
1005 }
1006
1007 detail_printdef cgroupprt_CGRNPROCS =
1008- { "NPROCS", "CGRNPROCS", cgroup_CGRNPROCS, NULL, ' ', 6};
1009+ { "NPROCS", "CGRNPROCS", .ac.doactiveconvertc = cgroup_CGRNPROCS, NULL, ' ', 6};
1010 /***************************************************************/
1011 char *
1012 cgroup_CGRNPROCSB(struct cgchainer *cgchain, struct tstat *tstat,
1013@@ -2547,7 +2547,7 @@ cgroup_CGRNPROCSB(struct cgchainer *cgchain, struct tstat *tstat,
1014 }
1015
1016 detail_printdef cgroupprt_CGRNPROCSB =
1017- { "PBELOW", "CGRNPROCSB", cgroup_CGRNPROCSB, NULL, ' ', 6};
1018+ { "PBELOW", "CGRNPROCSB", .ac.doactiveconvertc = cgroup_CGRNPROCSB, NULL, ' ', 6};
1019 /***************************************************************/
1020 char *
1021 cgroup_CGRCPUBUSY(struct cgchainer *cgchain, struct tstat *tstat,
1022@@ -2599,7 +2599,7 @@ cgroup_CGRCPUBUSY(struct cgchainer *cgchain, struct tstat *tstat,
1023 }
1024
1025 detail_printdef cgroupprt_CGRCPUBUSY =
1026- { "CPUBUSY", "CGRCPUBUSY", cgroup_CGRCPUBUSY, NULL, 'C', 7};
1027+ { "CPUBUSY", "CGRCPUBUSY", .ac.doactiveconvertc = cgroup_CGRCPUBUSY, NULL, 'C', 7};
1028 /***************************************************************/
1029 char *
1030 cgroup_CGRCPUPSI(struct cgchainer *cgchain, struct tstat *tstat,
1031@@ -2629,7 +2629,7 @@ cgroup_CGRCPUPSI(struct cgchainer *cgchain, struct tstat *tstat,
1032 }
1033
1034 detail_printdef cgroupprt_CGRCPUPSI =
1035- { "CPUPS", "CGRCPUPSI", cgroup_CGRCPUPSI, NULL, ' ', 5};
1036+ { "CPUPS", "CGRCPUPSI", .ac.doactiveconvertc = cgroup_CGRCPUPSI, NULL, ' ', 5};
1037 /***************************************************************/
1038 char *
1039 cgroup_CGRCPUMAX(struct cgchainer *cgchain, struct tstat *tstat,
1040@@ -2672,7 +2672,7 @@ cgroup_CGRCPUMAX(struct cgchainer *cgchain, struct tstat *tstat,
1041 }
1042
1043 detail_printdef cgroupprt_CGRCPUMAX =
1044- { "CPUMAX", "CGRCPUMAX", cgroup_CGRCPUMAX, NULL, ' ', 6};
1045+ { "CPUMAX", "CGRCPUMAX", .ac.doactiveconvertc = cgroup_CGRCPUMAX, NULL, ' ', 6};
1046 /***************************************************************/
1047 char *
1048 cgroup_CGRCPUWGT(struct cgchainer *cgchain, struct tstat *tstat,
1049@@ -2695,7 +2695,7 @@ cgroup_CGRCPUWGT(struct cgchainer *cgchain, struct tstat *tstat,
1050 }
1051
1052 detail_printdef cgroupprt_CGRCPUWGT =
1053- { "CPUWGT", "CGRCPUWGT", cgroup_CGRCPUWGT, NULL, ' ', 6};
1054+ { "CPUWGT", "CGRCPUWGT", .ac.doactiveconvertc = cgroup_CGRCPUWGT, NULL, ' ', 6};
1055 /***************************************************************/
1056 char *
1057 cgroup_CGRMEMORY(struct cgchainer *cgchain, struct tstat *tstat,
1058@@ -2740,7 +2740,7 @@ cgroup_CGRMEMORY(struct cgchainer *cgchain, struct tstat *tstat,
1059 }
1060
1061 detail_printdef cgroupprt_CGRMEMORY =
1062- { "MEMORY", "CGRMEMORY", cgroup_CGRMEMORY, NULL, 'M', 6};
1063+ { "MEMORY", "CGRMEMORY", .ac.doactiveconvertc = cgroup_CGRMEMORY, NULL, 'M', 6};
1064 /***************************************************************/
1065 char *
1066 cgroup_CGRMEMPSI(struct cgchainer *cgchain, struct tstat *tstat,
1067@@ -2770,7 +2770,7 @@ cgroup_CGRMEMPSI(struct cgchainer *cgchain, struct tstat *tstat,
1068 }
1069
1070 detail_printdef cgroupprt_CGRMEMPSI =
1071- { "MEMPS", "CGRMEMPSI", cgroup_CGRMEMPSI, NULL, ' ', 5};
1072+ { "MEMPS", "CGRMEMPSI", .ac.doactiveconvertc = cgroup_CGRMEMPSI, NULL, ' ', 5};
1073 /***************************************************************/
1074 char *
1075 cgroup_CGRMEMMAX(struct cgchainer *cgchain, struct tstat *tstat,
1076@@ -2810,7 +2810,7 @@ cgroup_CGRMEMMAX(struct cgchainer *cgchain, struct tstat *tstat,
1077 }
1078
1079 detail_printdef cgroupprt_CGRMEMMAX =
1080- { "MEMMAX", "CGRMEMMAX", cgroup_CGRMEMMAX, NULL, ' ', 6};
1081+ { "MEMMAX", "CGRMEMMAX", .ac.doactiveconvertc = cgroup_CGRMEMMAX, NULL, ' ', 6};
1082 /***************************************************************/
1083 char *
1084 cgroup_CGRSWPMAX(struct cgchainer *cgchain, struct tstat *tstat,
1085@@ -2835,7 +2835,7 @@ cgroup_CGRSWPMAX(struct cgchainer *cgchain, struct tstat *tstat,
1086 }
1087
1088 detail_printdef cgroupprt_CGRSWPMAX =
1089- { "SWPMAX", "CGRSWPMAX", cgroup_CGRSWPMAX, NULL, ' ', 6};
1090+ { "SWPMAX", "CGRSWPMAX", .ac.doactiveconvertc = cgroup_CGRSWPMAX, NULL, ' ', 6};
1091 /***************************************************************/
1092 char *
1093 cgroup_CGRDISKIO(struct cgchainer *cgchain, struct tstat *tstat,
1094@@ -2864,7 +2864,7 @@ cgroup_CGRDISKIO(struct cgchainer *cgchain, struct tstat *tstat,
1095 }
1096
1097 detail_printdef cgroupprt_CGRDISKIO =
1098- { "DISKIO", "CGRDISKIO", cgroup_CGRDISKIO, NULL, 'D', 6};
1099+ { "DISKIO", "CGRDISKIO", .ac.doactiveconvertc = cgroup_CGRDISKIO, NULL, 'D', 6};
1100 /***************************************************************/
1101 char *
1102 cgroup_CGRDSKPSI(struct cgchainer *cgchain, struct tstat *tstat,
1103@@ -2894,7 +2894,7 @@ cgroup_CGRDSKPSI(struct cgchainer *cgchain, struct tstat *tstat,
1104 }
1105
1106 detail_printdef cgroupprt_CGRDSKPSI =
1107- { "DSKPS", "CGRDSKPSI", cgroup_CGRDSKPSI, NULL, ' ', 5};
1108+ { "DSKPS", "CGRDSKPSI", .ac.doactiveconvertc = cgroup_CGRDSKPSI, NULL, ' ', 5};
1109 /***************************************************************/
1110 char *
1111 cgroup_CGRDSKWGT(struct cgchainer *cgchain, struct tstat *tstat,
1112@@ -2917,7 +2917,7 @@ cgroup_CGRDSKWGT(struct cgchainer *cgchain, struct tstat *tstat,
1113 }
1114
1115 detail_printdef cgroupprt_CGRDSKWGT =
1116- { "IOWGT", "CGRDSKWGT", cgroup_CGRDSKWGT, NULL, ' ', 5};
1117+ { "IOWGT", "CGRDSKWGT", .ac.doactiveconvertc = cgroup_CGRDSKWGT, NULL, ' ', 5};
1118 /***************************************************************/
1119 char *
1120 cgroup_CGRPID(struct cgchainer *cgchain, struct tstat *tstat,
1121@@ -2934,7 +2934,7 @@ cgroup_CGRPID(struct cgchainer *cgchain, struct tstat *tstat,
1122 }
1123
1124 detail_printdef cgroupprt_CGRPID =
1125- { "PID", "CGRPID", cgroup_CGRPID, NULL, ' ', 5}; //DYNAMIC WIDTH!
1126+ { "PID", "CGRPID", .ac.doactiveconvertc = cgroup_CGRPID, NULL, ' ', 5}; //DYNAMIC WIDTH!
1127 /***************************************************************/
1128 char *
1129 cgroup_CGRCMD(struct cgchainer *cgchain, struct tstat *tstat,
1130@@ -2963,5 +2963,5 @@ cgroup_CGRCMD(struct cgchainer *cgchain, struct tstat *tstat,
1131 }
1132
1133 detail_printdef cgroupprt_CGRCMD =
1134- { "CMD ", "CGRCMD", cgroup_CGRCMD, NULL, ' ', 14};
1135+ { "CMD ", "CGRCMD", .ac.doactiveconvertc = cgroup_CGRCMD, NULL, ' ', 14};
1136 /***************************************************************/
1137diff --git a/various.c b/various.c
1138index c175c10..906a529 100644
1139--- a/various.c
1140+++ b/various.c
1141@@ -29,6 +29,10 @@
1142 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1143 ** --------------------------------------------------------------------------
1144 */
1145+#define _POSIX_C_SOURCE
1146+#define _XOPEN_SOURCE
1147+#define _GNU_SOURCE
1148+#define _DEFAULT_SOURCE
1149
1150 #include <sys/types.h>
1151 #include <sys/param.h>
1152--
11532.34.1
1154
diff --git a/meta-oe/recipes-support/atop/atop/0001-atop.daily-atop.init-atop-pm.sh-Avoid-using-bash.patch b/meta-oe/recipes-support/atop/atop/0001-atop.daily-atop.init-atop-pm.sh-Avoid-using-bash.patch
deleted file mode 100644
index facb257be6..0000000000
--- a/meta-oe/recipes-support/atop/atop/0001-atop.daily-atop.init-atop-pm.sh-Avoid-using-bash.patch
+++ /dev/null
@@ -1,67 +0,0 @@
1From ffc8ba8d324243a923abe48e9758adecb03d24a4 Mon Sep 17 00:00:00 2001
2From: Peter Kjellerstedt <pkj@axis.com>
3Date: Tue, 12 Feb 2019 21:25:23 +0100
4Subject: [PATCH] atop.daily, atop.init, atop-pm.sh: Avoid using bash
5
6Avoid using bash and bashisms when not necesary. On some systems,
7e.g., embedded products, bash may not be available by default.
8
9Upstream-Status: Submitted [https://github.com/Atoptool/atop/pull/50]
10Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
11---
12 atop-pm.sh | 2 +-
13 atop.daily | 4 ++--
14 atop.init | 4 ++--
15 3 files changed, 5 insertions(+), 5 deletions(-)
16
17diff --git a/atop-pm.sh b/atop-pm.sh
18index 7f41a86..3ff4ab5 100755
19--- a/atop-pm.sh
20+++ b/atop-pm.sh
21@@ -1,4 +1,4 @@
22-#!/bin/bash
23+#!/bin/sh
24
25 case "$1" in
26 pre) /usr/bin/systemctl stop atop
27diff --git a/atop.daily b/atop.daily
28index 57a9507..fe5a11b 100755
29--- a/atop.daily
30+++ b/atop.daily
31@@ -1,4 +1,4 @@
32-#!/bin/bash
33+#!/bin/sh
34
35 LOGOPTS="-R" # default options
36 LOGINTERVAL=600 # default interval in seconds
37@@ -38,7 +38,7 @@ then
38
39 while ps -p `cat "$PIDFILE"` > /dev/null
40 do
41- let CNT+=1
42+ CNT=$((CNT + 1))
43
44 if [ $CNT -gt 5 ]
45 then
46diff --git a/atop.init b/atop.init
47index e6e11dc..03c3f02 100755
48--- a/atop.init
49+++ b/atop.init
50@@ -1,4 +1,4 @@
51-#!/bin/bash
52+#!/bin/sh
53 #
54 # atop Startup script for the Atop process logging in background
55 #
56@@ -47,7 +47,7 @@ case "$1" in
57
58 while ps -p `cat $PIDFILE` > /dev/null
59 do
60- let CNT+=1
61+ CNT=$((CNT + 1))
62
63 if [ $CNT -gt 5 ]
64 then
65--
662.12.0
67
diff --git a/meta-oe/recipes-support/atop/atop/fix-permissions.patch b/meta-oe/recipes-support/atop/atop/fix-permissions.patch
index 8488b38000..10f504b472 100644
--- a/meta-oe/recipes-support/atop/atop/fix-permissions.patch
+++ b/meta-oe/recipes-support/atop/atop/fix-permissions.patch
@@ -8,24 +8,32 @@ everyone could read.
8 8
9Upstream-Status: Inappropriate [embedded specific] 9Upstream-Status: Inappropriate [embedded specific]
10Signed-off-by: Kai Kang <kai.kang@windriver.com> 10Signed-off-by: Kai Kang <kai.kang@windriver.com>
11Signed-off-by: Tho Dat Nguyen <tho3.nguyen@lge.com>
11--- 12---
12 Makefile | 10 +++++----- 13 Makefile | 16 ++++++++--------
13 1 file changed, 5 insertions(+), 5 deletions(-) 14 1 file changed, 8 insertions(+), 8 deletions(-)
14 15
15diff --git a/Makefile b/Makefile 16diff --git a/Makefile b/Makefile
16index 3bf5929..1221ee4 100644 17index a6f196b..7786f93 100644
17--- a/Makefile 18--- a/Makefile
18+++ b/Makefile 19+++ b/Makefile
19@@ -72,7 +72,7 @@ systemdinstall: genericinstall 20@@ -77,7 +77,7 @@ install: genericinstall
20 chmod 0644 $(DESTDIR)$(SYSDPATH)/atopacct.service 21 cp atopacct.service $(DESTDIR)$(SYSDPATH)
21 cp atop.cronsystemd $(DESTDIR)$(CRNPATH)/atop 22 chmod 0644 $(DESTDIR)$(SYSDPATH)/atopacct.service
22 cp atop-pm.sh $(DESTDIR)$(PMPATHD) 23 cp atop-pm.sh $(DESTDIR)$(PMPATHD)
23- chmod 0711 $(DESTDIR)$(PMPATHD)/atop-pm.sh 24- chmod 0711 $(DESTDIR)$(PMPATHD)/atop-pm.sh
24+ chmod 0755 $(DESTDIR)$(PMPATHD)/atop-pm.sh 25+ chmod 0755 $(DESTDIR)$(PMPATHD)/atop-pm.sh
25 # 26 #
26 # only when making on target system: 27 # only when making on target system:
27 # 28 #
28@@ -97,11 +97,11 @@ sysvinstall: genericinstall 29@@ -107,17 +107,17 @@ sysvinstall: genericinstall
30 cp atopacct.init $(DESTDIR)$(INIPATH)/atopacct
31 cp atop.cronsysv $(DESTDIR)$(CRNPATH)/atop
32 cp atop.daily $(DESTDIR)$(SCRPATH)
33- chmod 0711 $(DESTDIR)$(SCRPATH)/atop.daily
34+ chmod 0755 $(DESTDIR)$(SCRPATH)/atop.daily
35 touch $(DESTDIR)$(LOGPATH)/dummy_before
36 touch $(DESTDIR)$(LOGPATH)/dummy_after
29 # 37 #
30 if [ -d $(DESTDIR)$(PMPATH1) ]; \ 38 if [ -d $(DESTDIR)$(PMPATH1) ]; \
31 then cp 45atoppm $(DESTDIR)$(PMPATH1); \ 39 then cp 45atoppm $(DESTDIR)$(PMPATH1); \
@@ -39,21 +47,27 @@ index 3bf5929..1221ee4 100644
39 fi 47 fi
40 # 48 #
41 # 49 #
42@@ -145,7 +145,7 @@ genericinstall: atop atopacctd atopconvert 50@@ -160,7 +160,7 @@ genericinstall: atop atopacctd atopconvert atopcat atophide
51 chmod 644 $(DESTDIR)$(DEFPATH)/atop
43 # 52 #
44 cp atop $(DESTDIR)$(BINPATH)/atop 53 cp atop $(DESTDIR)$(BINPATH)/atop
45 chown root $(DESTDIR)$(BINPATH)/atop 54- chmod 0711 $(DESTDIR)$(BINPATH)/atop
46- chmod 04711 $(DESTDIR)$(BINPATH)/atop
47+ chmod 0755 $(DESTDIR)$(BINPATH)/atop 55+ chmod 0755 $(DESTDIR)$(BINPATH)/atop
48 ln -sf atop $(DESTDIR)$(BINPATH)/atopsar 56 ln -sf atop $(DESTDIR)$(BINPATH)/atopsar
49 cp atopacctd $(DESTDIR)$(SBINPATH)/atopacctd 57 cp atopacctd $(DESTDIR)$(SBINPATH)/atopacctd
50 chown root $(DESTDIR)$(SBINPATH)/atopacctd 58 chmod 0700 $(DESTDIR)$(SBINPATH)/atopacctd
51@@ -159,7 +159,7 @@ genericinstall: atop atopacctd atopconvert 59@@ -169,11 +169,11 @@ genericinstall: atop atopacctd atopconvert atopcat atophide
52 chown root $(DESTDIR)$(BINPATH)/atopconvert 60 cp atop $(DESTDIR)$(BINPATH)/atop-$(VERS)
53 chmod 0711 $(DESTDIR)$(BINPATH)/atopconvert 61 ln -sf atop-$(VERS) $(DESTDIR)$(BINPATH)/atopsar-$(VERS)
54 cp atop.daily $(DESTDIR)$(SCRPATH) 62 cp atopconvert $(DESTDIR)$(BINPATH)/atopconvert
55- chmod 0711 $(DESTDIR)$(SCRPATH)/atop.daily 63- chmod 0711 $(DESTDIR)$(BINPATH)/atopconvert
56+ chmod 0755 $(DESTDIR)$(SCRPATH)/atop.daily 64+ chmod 0755 $(DESTDIR)$(BINPATH)/atopconvert
65 cp atopcat $(DESTDIR)$(BINPATH)/atopcat
66- chmod 0711 $(DESTDIR)$(BINPATH)/atopcat
67+ chmod 0755 $(DESTDIR)$(BINPATH)/atopcat
68 cp atophide $(DESTDIR)$(BINPATH)/atophide
69- chmod 0711 $(DESTDIR)$(BINPATH)/atophide
70+ chmod 0755 $(DESTDIR)$(BINPATH)/atophide
57 cp man/atop.1 $(DESTDIR)$(MAN1PATH) 71 cp man/atop.1 $(DESTDIR)$(MAN1PATH)
58 cp man/atopsar.1 $(DESTDIR)$(MAN1PATH) 72 cp man/atopsar.1 $(DESTDIR)$(MAN1PATH)
59 cp man/atopconvert.1 $(DESTDIR)$(MAN1PATH) 73 cp man/atopconvert.1 $(DESTDIR)$(MAN1PATH)
diff --git a/meta-oe/recipes-support/atop/atop_2.4.0.bb b/meta-oe/recipes-support/atop/atop_2.11.0.bb
index 2ff5a4d74b..8eb8cd6b06 100644
--- a/meta-oe/recipes-support/atop/atop_2.4.0.bb
+++ b/meta-oe/recipes-support/atop/atop_2.11.0.bb
@@ -13,20 +13,23 @@ SECTION = "console/utils"
13LICENSE = "GPL-2.0-only" 13LICENSE = "GPL-2.0-only"
14LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" 14LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
15 15
16DEPENDS = "ncurses zlib" 16inherit pkgconfig
17
18DEPENDS = "ncurses zlib glib-2.0"
17 19
18SRC_URI = "http://www.atoptool.nl/download/${BP}.tar.gz \ 20SRC_URI = "http://www.atoptool.nl/download/${BP}.tar.gz \
19 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'file://volatiles.atop.conf', 'file://volatiles.99_atop', d)} \ 21 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'file://volatiles.atop.conf', 'file://volatiles.99_atop', d)} \
20 file://fix-permissions.patch \ 22 file://fix-permissions.patch \
21 file://sysvinit-implement-status.patch \ 23 file://sysvinit-implement-status.patch \
22 file://0001-atop.daily-atop.init-atop-pm.sh-Avoid-using-bash.patch \ 24 file://0001-Redefine-function-prototypes-solves-issue-322.patch \
23 " 25 "
24SRC_URI[sha256sum] = "be1c010a77086b7d98376fce96514afcd73c3f20a8d1fe01520899ff69a73d69" 26SRC_URI[sha256sum] = "9b94c666602efff7bf402ecce706c347f38c39cb63498f9d39626861e5646e20"
25 27
26UPSTREAM_CHECK_URI = "https://atoptool.nl/downloadatop.php" 28UPSTREAM_CHECK_URI = "https://atoptool.nl/downloadatop.php"
27UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+).tar" 29UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+).tar"
28 30
29CVE_STATUS[CVE-2011-3618] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." 31CVE_STATUS[CVE-2011-3618] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
32TARGET_CC_ARCH += "${LDFLAGS}"
30 33
31do_compile() { 34do_compile() {
32 oe_runmake all 35 oe_runmake all
@@ -35,7 +38,7 @@ do_compile() {
35do_install() { 38do_install() {
36 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 39 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
37 make DESTDIR=${D} VERS=${PV} SYSDPATH=${systemd_system_unitdir} \ 40 make DESTDIR=${D} VERS=${PV} SYSDPATH=${systemd_system_unitdir} \
38 PMPATHD=${systemd_unitdir}/system-sleep systemdinstall 41 PMPATHD=${systemd_unitdir}/system-sleep install
39 install -d ${D}${sysconfdir}/tmpfiles.d 42 install -d ${D}${sysconfdir}/tmpfiles.d
40 install -m 644 ${UNPACKDIR}/volatiles.atop.conf ${D}${sysconfdir}/tmpfiles.d/atop.conf 43 install -m 644 ${UNPACKDIR}/volatiles.atop.conf ${D}${sysconfdir}/tmpfiles.d/atop.conf
41 rm -f ${D}${systemd_system_unitdir}/atopacct.service 44 rm -f ${D}${systemd_system_unitdir}/atopacct.service
@@ -56,9 +59,9 @@ do_install() {
56 59
57inherit systemd 60inherit systemd
58 61
59SYSTEMD_SERVICE:${PN} = "atop.service atopgpu.service" 62SYSTEMD_SERVICE:${PN} = "atop.service atopgpu.service atop-rotate.service"
60SYSTEMD_AUTO_ENABLE = "disable" 63SYSTEMD_AUTO_ENABLE = "disable"
61 64
62FILES:${PN} += "${systemd_unitdir}/system-sleep" 65FILES:${PN} += "${systemd_unitdir}/system-sleep ${systemd_system_unitdir}/atop-rotate.timer"
63 66
64RDEPENDS:${PN} = "procps" 67RDEPENDS:${PN} = "procps"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-06-01 11:03:31 +0000