summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-support/atop/atop/0001-add-sys-sysmacros.h-for-major-minor-macros.patch26
-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.patch29
-rw-r--r--meta-oe/recipes-support/atop/atop/remove-bashisms.patch33
-rw-r--r--meta-oe/recipes-support/atop/atop/sysvinit-implement-status.patch11
-rw-r--r--meta-oe/recipes-support/atop/atop_2.4.0.bb (renamed from meta-oe/recipes-support/atop/atop_2.3.0.bb)9
6 files changed, 98 insertions, 77 deletions
diff --git a/meta-oe/recipes-support/atop/atop/0001-add-sys-sysmacros.h-for-major-minor-macros.patch b/meta-oe/recipes-support/atop/atop/0001-add-sys-sysmacros.h-for-major-minor-macros.patch
deleted file mode 100644
index 5646061971..0000000000
--- a/meta-oe/recipes-support/atop/atop/0001-add-sys-sysmacros.h-for-major-minor-macros.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From 13f3771655f859d5e0332dd65b9c43f572f6359d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 11 Aug 2018 16:02:06 -0700
4Subject: [PATCH] add sys/sysmacros.h for major/minor macros
5
6photosyst.c:1465:19: error: called object 'major' is not a function or function pointer
7 dmp->major = major(statbuf.st_rdev);
8
9Upstream-Status: Pending
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 photosyst.c | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/photosyst.c b/photosyst.c
16index 38828ec..caed352 100644
17--- a/photosyst.c
18+++ b/photosyst.c
19@@ -152,6 +152,7 @@
20 static const char rcsid[] = "$Id: photosyst.c,v 1.38 2010/11/19 07:40:40 gerlof Exp $";
21
22 #include <sys/types.h>
23+#include <sys/sysmacros.h>
24 #include <stdio.h>
25 #include <string.h>
26 #include <unistd.h>
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
new file mode 100644
index 0000000000..facb257be6
--- /dev/null
+++ b/meta-oe/recipes-support/atop/atop/0001-atop.daily-atop.init-atop-pm.sh-Avoid-using-bash.patch
@@ -0,0 +1,67 @@
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 ee74199939..8488b38000 100644
--- a/meta-oe/recipes-support/atop/atop/fix-permissions.patch
+++ b/meta-oe/recipes-support/atop/atop/fix-permissions.patch
@@ -1,15 +1,22 @@
1Update permissions of executable files that remove setuid bit and make everyone 1From d9498d10d0e8241749835dbc9fa229465d4fdfd7 Mon Sep 17 00:00:00 2001
2could read. 2From: Kai Kang <kai.kang@windriver.com>
3Date: Wed, 6 Feb 2019 13:58:04 +0000
4Subject: [PATCH] Fix permissions
3 5
4Upstream-Status: Inappropriate [embedded specific] 6Update permissions of executable files that remove setuid bit and make
7everyone could read.
5 8
9Upstream-Status: Inappropriate [embedded specific]
6Signed-off-by: Kai Kang <kai.kang@windriver.com> 10Signed-off-by: Kai Kang <kai.kang@windriver.com>
7--- 11---
12 Makefile | 10 +++++-----
13 1 file changed, 5 insertions(+), 5 deletions(-)
14
8diff --git a/Makefile b/Makefile 15diff --git a/Makefile b/Makefile
9index a65b9b6..21d9828 100644 16index 3bf5929..1221ee4 100644
10--- a/Makefile 17--- a/Makefile
11+++ b/Makefile 18+++ b/Makefile
12@@ -66,7 +66,7 @@ systemdinstall: genericinstall 19@@ -72,7 +72,7 @@ systemdinstall: genericinstall
13 chmod 0644 $(DESTDIR)$(SYSDPATH)/atopacct.service 20 chmod 0644 $(DESTDIR)$(SYSDPATH)/atopacct.service
14 cp atop.cronsystemd $(DESTDIR)$(CRNPATH)/atop 21 cp atop.cronsystemd $(DESTDIR)$(CRNPATH)/atop
15 cp atop-pm.sh $(DESTDIR)$(PMPATHD) 22 cp atop-pm.sh $(DESTDIR)$(PMPATHD)
@@ -18,7 +25,7 @@ index a65b9b6..21d9828 100644
18 # 25 #
19 # only when making on target system: 26 # only when making on target system:
20 # 27 #
21@@ -91,11 +91,11 @@ sysvinstall: genericinstall 28@@ -97,11 +97,11 @@ sysvinstall: genericinstall
22 # 29 #
23 if [ -d $(DESTDIR)$(PMPATH1) ]; \ 30 if [ -d $(DESTDIR)$(PMPATH1) ]; \
24 then cp 45atoppm $(DESTDIR)$(PMPATH1); \ 31 then cp 45atoppm $(DESTDIR)$(PMPATH1); \
@@ -32,7 +39,7 @@ index a65b9b6..21d9828 100644
32 fi 39 fi
33 # 40 #
34 # 41 #
35@@ -139,7 +139,7 @@ genericinstall: atop atopacctd 42@@ -145,7 +145,7 @@ genericinstall: atop atopacctd atopconvert
36 # 43 #
37 cp atop $(DESTDIR)$(BINPATH)/atop 44 cp atop $(DESTDIR)$(BINPATH)/atop
38 chown root $(DESTDIR)$(BINPATH)/atop 45 chown root $(DESTDIR)$(BINPATH)/atop
@@ -41,12 +48,12 @@ index a65b9b6..21d9828 100644
41 ln -sf atop $(DESTDIR)$(BINPATH)/atopsar 48 ln -sf atop $(DESTDIR)$(BINPATH)/atopsar
42 cp atopacctd $(DESTDIR)$(SBINPATH)/atopacctd 49 cp atopacctd $(DESTDIR)$(SBINPATH)/atopacctd
43 chown root $(DESTDIR)$(SBINPATH)/atopacctd 50 chown root $(DESTDIR)$(SBINPATH)/atopacctd
44@@ -147,7 +147,7 @@ genericinstall: atop atopacctd 51@@ -159,7 +159,7 @@ genericinstall: atop atopacctd atopconvert
45 cp atop $(DESTDIR)$(BINPATH)/atop-$(VERS) 52 chown root $(DESTDIR)$(BINPATH)/atopconvert
46 ln -sf atop-$(VERS) $(DESTDIR)$(BINPATH)/atopsar-$(VERS) 53 chmod 0711 $(DESTDIR)$(BINPATH)/atopconvert
47 cp atop.daily $(DESTDIR)$(SCRPATH) 54 cp atop.daily $(DESTDIR)$(SCRPATH)
48- chmod 0711 $(DESTDIR)$(SCRPATH)/atop.daily 55- chmod 0711 $(DESTDIR)$(SCRPATH)/atop.daily
49+ chmod 0755 $(DESTDIR)$(SCRPATH)/atop.daily 56+ chmod 0755 $(DESTDIR)$(SCRPATH)/atop.daily
50 cp man/atop.1 $(DESTDIR)$(MAN1PATH) 57 cp man/atop.1 $(DESTDIR)$(MAN1PATH)
51 cp man/atopsar.1 $(DESTDIR)$(MAN1PATH) 58 cp man/atopsar.1 $(DESTDIR)$(MAN1PATH)
52 cp man/atoprc.5 $(DESTDIR)$(MAN5PATH) 59 cp man/atopconvert.1 $(DESTDIR)$(MAN1PATH)
diff --git a/meta-oe/recipes-support/atop/atop/remove-bashisms.patch b/meta-oe/recipes-support/atop/atop/remove-bashisms.patch
deleted file mode 100644
index f1fcbfed76..0000000000
--- a/meta-oe/recipes-support/atop/atop/remove-bashisms.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Signed-off-by: Kai Kang <kai.kang@windriver.com>
4---
5diff --git a/atop-pm.sh b/atop-pm.sh
6index 7f41a86..3ff4ab5 100755
7--- a/atop-pm.sh
8+++ b/atop-pm.sh
9@@ -1,4 +1,4 @@
10-#!/bin/bash
11+#!/bin/sh
12
13 case "$1" in
14 pre) /usr/bin/systemctl stop atop
15diff --git a/atop.daily b/atop.daily
16index 24d33bd..f29bd94 100755
17--- a/atop.daily
18+++ b/atop.daily
19@@ -1,4 +1,4 @@
20-#!/bin/bash
21+#!/bin/sh
22
23 CURDAY=`date +%Y%m%d`
24 LOGPATH=/var/log/atop
25@@ -16,7 +16,7 @@ then
26
27 while ps -p `cat $PIDFILE` > /dev/null
28 do
29- let CNT+=1
30+ CNT=$((CNT+1))
31
32 if [ $CNT -gt 5 ]
33 then
diff --git a/meta-oe/recipes-support/atop/atop/sysvinit-implement-status.patch b/meta-oe/recipes-support/atop/atop/sysvinit-implement-status.patch
index 5994d3e08e..1145a24934 100644
--- a/meta-oe/recipes-support/atop/atop/sysvinit-implement-status.patch
+++ b/meta-oe/recipes-support/atop/atop/sysvinit-implement-status.patch
@@ -1,11 +1,18 @@
1From bdd068873ed0979027c21773939bdb18046a8756 Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com>
3Date: Wed, 6 Feb 2019 13:58:04 +0000
4Subject: [PATCH] sysvinit: Implement status
5
1Implement the sub-command status. 6Implement the sub-command status.
2 7
3Upstream-Status: Pending 8Upstream-Status: Pending
4
5Signed-off-by: Kai Kang <kai.kang@windriver.com> 9Signed-off-by: Kai Kang <kai.kang@windriver.com>
6--- 10---
11 atop.init | 3 +++
12 1 file changed, 3 insertions(+)
13
7diff --git a/atop.init b/atop.init 14diff --git a/atop.init b/atop.init
8index 108bdc5..9f89fad 100755 15index e6e11dc..e7b226d 100755
9--- a/atop.init 16--- a/atop.init
10+++ b/atop.init 17+++ b/atop.init
11@@ -18,6 +18,8 @@ 18@@ -18,6 +18,8 @@
diff --git a/meta-oe/recipes-support/atop/atop_2.3.0.bb b/meta-oe/recipes-support/atop/atop_2.4.0.bb
index 302813c2ea..5bde965196 100644
--- a/meta-oe/recipes-support/atop/atop_2.3.0.bb
+++ b/meta-oe/recipes-support/atop/atop_2.4.0.bb
@@ -17,13 +17,12 @@ DEPENDS = "ncurses zlib"
17 17
18SRC_URI = "http://www.atoptool.nl/download/${BP}.tar.gz \ 18SRC_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)} \ 19 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'file://volatiles.atop.conf', 'file://volatiles.99_atop', d)} \
20 file://remove-bashisms.patch \
21 file://fix-permissions.patch \ 20 file://fix-permissions.patch \
22 file://sysvinit-implement-status.patch \ 21 file://sysvinit-implement-status.patch \
23 file://0001-add-sys-sysmacros.h-for-major-minor-macros.patch \ 22 file://0001-atop.daily-atop.init-atop-pm.sh-Avoid-using-bash.patch \
24 " 23 "
25SRC_URI[md5sum] = "48e1dbef8c7d826e68829a8d5fc920fc" 24SRC_URI[md5sum] = "1077da884ed94f2bc3c81ac3ab970436"
26SRC_URI[sha256sum] = "73e4725de0bafac8c63b032e8479e2305e3962afbe977ec1abd45f9e104eb264" 25SRC_URI[sha256sum] = "be1c010a77086b7d98376fce96514afcd73c3f20a8d1fe01520899ff69a73d69"
27 26
28do_compile() { 27do_compile() {
29 oe_runmake all 28 oe_runmake all
@@ -49,7 +48,7 @@ do_install() {
49 48
50inherit systemd 49inherit systemd
51 50
52SYSTEMD_SERVICE_${PN} = "atop.service" 51SYSTEMD_SERVICE_${PN} = "atop.service atopgpu.service"
53SYSTEMD_AUTO_ENABLE = "disable" 52SYSTEMD_AUTO_ENABLE = "disable"
54 53
55FILES_${PN} += "${systemd_unitdir}/system-sleep" 54FILES_${PN} += "${systemd_unitdir}/system-sleep"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-10-24 23:40:03 +0000