From: Andreas Helmcke <ahelmcke@ela-soft.com>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] atop: version bump 2.3.0 -> 2.10.0
Date: Tue, 16 Jul 2024 14:34:01 +0200 [thread overview]
Message-ID: <20240716123405.59362-1-ahelmcke@ela-soft.com> (raw)
Various bug fixes and changes.
link: https://www.atoptool.nl/downloadatop.php
* added dependency on glib
* patch removed, not needed for gcc-13
Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>
---
...ysmacros.h-to-compile-with-newer-gcc.patch | 46 -------------------
patches/atop-2.3.0/series | 4 --
rules/atop.in | 1 +
rules/atop.make | 4 +-
4 files changed, 3 insertions(+), 52 deletions(-)
delete mode 100644 patches/atop-2.3.0/0001-Include-sysmacros.h-to-compile-with-newer-gcc.patch
delete mode 100644 patches/atop-2.3.0/series
diff --git a/patches/atop-2.3.0/0001-Include-sysmacros.h-to-compile-with-newer-gcc.patch b/patches/atop-2.3.0/0001-Include-sysmacros.h-to-compile-with-newer-gcc.patch
deleted file mode 100644
index 0d47cdd4e..000000000
--- a/patches/atop-2.3.0/0001-Include-sysmacros.h-to-compile-with-newer-gcc.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: SjonHortensius <SjonHortensius@users.noreply.github.com>
-Date: Fri, 24 Aug 2018 18:26:58 +0200
-Subject: [PATCH] Include sysmacros.h to compile with newer gcc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Older gcc throws a warning
-```
-photosyst.c: In function 'lvmmapname':
-photosyst.c:1465:13: warning: In the GNU C Library, "major" is defined
- by <sys/sysmacros.h>. For historical compatibility, it is
- currently defined by <sys/types.h> as well, but we plan to
- remove this soon. To use "major", include <sys/sysmacros.h>
- directly. If you did not intend to use a system-defined macro
- "major", you should undefine it after including <sys/types.h>.
- dmp->major = major(statbuf.st_rdev);
-```
-
-Newer gcc throws an error:
-
-```
-photosyst.c: In function ‘lvmmapname’:
-photosyst.c:1482:19: error: called object ‘major’ is not a function or function pointer
- dmp->major = major(statbuf.st_rdev);
- ^~~~~
-photosyst.c:1437:25: note: declared here
- lvmmapname(unsigned int major, unsigned int minor,
- ~~~~~~~~~~~~~^~~~~
-```
----
- photosyst.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/photosyst.c b/photosyst.c
-index 38828ec498a5..caed3529ae27 100644
---- a/photosyst.c
-+++ b/photosyst.c
-@@ -152,6 +152,7 @@
- static const char rcsid[] = "$Id: photosyst.c,v 1.38 2010/11/19 07:40:40 gerlof Exp $";
-
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <stdio.h>
- #include <string.h>
- #include <unistd.h>
diff --git a/patches/atop-2.3.0/series b/patches/atop-2.3.0/series
deleted file mode 100644
index 95bd83266..000000000
--- a/patches/atop-2.3.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Include-sysmacros.h-to-compile-with-newer-gcc.patch
-# 7ac7bb46bb4801fb2be3b7d3f950bbd3 - git-ptx-patches magic
diff --git a/rules/atop.in b/rules/atop.in
index 3bdeb47b9..cffc1356c 100644
--- a/rules/atop.in
+++ b/rules/atop.in
@@ -5,6 +5,7 @@ config ATOP
select ZLIB
select NCURSES
select LIBC_M
+ select GLIB
help
Monitor for system resources and process activity
diff --git a/rules/atop.make b/rules/atop.make
index 5a6c57385..193ced1fc 100644
--- a/rules/atop.make
+++ b/rules/atop.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_ATOP) += atop
#
# Paths and names
#
-ATOP_VERSION := 2.3.0
-ATOP_MD5 := 48e1dbef8c7d826e68829a8d5fc920fc
+ATOP_VERSION := 2.10.0
+ATOP_MD5 := 6d14559b59e25d15dbcfa978ed0ec50e
ATOP := atop-$(ATOP_VERSION)
ATOP_URL := http://www.atoptool.nl/download/$(ATOP).tar.gz
ATOP_SOURCE := $(SRCDIR)/$(ATOP).tar.gz
--
2.43.0
next reply other threads:[~2024-07-16 12:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-16 12:34 Andreas Helmcke [this message]
2024-08-05 6:49 ` [ptxdist] [APPLIED] " Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240716123405.59362-1-ahelmcke@ela-soft.com \
--to=ahelmcke@ela-soft.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox