From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 05 Aug 2024 08:52:40 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1saraC-006P62-0I for lore@lore.pengutronix.de; Mon, 05 Aug 2024 08:52:40 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1saraB-0006ZQ-MV; Mon, 05 Aug 2024 08:52:39 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sarXA-0003hb-QZ; Mon, 05 Aug 2024 08:49:32 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sarXA-004eAZ-Dq; Mon, 05 Aug 2024 08:49:32 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1sarXA-003jV3-1E; Mon, 05 Aug 2024 08:49:32 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 5 Aug 2024 08:49:32 +0200 Message-Id: <20240805064932.889878-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240716123405.59362-1-ahelmcke@ela-soft.com> References: <20240716123405.59362-1-ahelmcke@ela-soft.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] atop: version bump 2.3.0 -> 2.10.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Andreas Helmcke Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 7a607c14507dd1a3d010f77640f1d6eda713e2b3. Michael [sent from post-receive hook] On Mon, 05 Aug 2024 08:49:32 +0200, Andreas Helmcke wrote: > 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 > Message-Id: <20240716123405.59362-1-ahelmcke@ela-soft.com> > Signed-off-by: Michael Olbrich > > 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 0d47cdd4ebab..000000000000 > --- a/patches/atop-2.3.0/0001-Include-sysmacros.h-to-compile-with-newer-gcc.patch > +++ /dev/null > @@ -1,46 +0,0 @@ > -From: SjonHortensius > -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 . For historical compatibility, it is > - currently defined by as well, but we plan to > - remove this soon. To use "major", include > - directly. If you did not intend to use a system-defined macro > - "major", you should undefine it after including . > - 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 > -+#include > - #include > - #include > - #include > diff --git a/patches/atop-2.3.0/series b/patches/atop-2.3.0/series > deleted file mode 100644 > index 95bd83266e79..000000000000 > --- 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 3bdeb47b92a8..cffc1356cfc1 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 5a6c573859f9..193ced1fc2b9 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