From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 16 Jul 2024 14:34:38 +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 1sThOA-005RaR-1w for lore@lore.pengutronix.de; Tue, 16 Jul 2024 14:34:38 +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 1sThOA-00055m-7w; Tue, 16 Jul 2024 14:34:38 +0200 Received: from mail.ela-soft.com ([213.23.49.162]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sThNo-00055c-TS for ptxdist@pengutronix.de; Tue, 16 Jul 2024 14:34:17 +0200 Received: from tupai.ela-bln.local (tupai.ela-bln.local [10.0.1.140]) by mail.ela-soft.com (mailsystem) with ESMTP id 1807112D88 for ; Tue, 16 Jul 2024 14:34:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ela-soft.com; s=2021; t=1721133256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zr0PslogaSrmortkaGFShUaf2gb0SHinmD2UgfmfRak=; b=nNtP/kfGqSEye1lPtfTmIgi5rAVtvmcn7a6pO0EQnOT/IMiupct/HGpxka/eyHhZyLLcTc kzu6rrgHJxKoWesxIadMHnGdmjUJLpcn6PLBjh4GYnu4dFCMy5tzevMryjD5niZ13LYs1K WBJxlJvLS61CH81IbW9XE6qATaEvdqdhD+NRzasjXUEnkzxpveHxHqRUSSIVySZ5a2jrXN zSYBW1YdBHwYObC39kA+I4k4HWlo9idjgDy1EljuShQ627A920e7vTFp+9Hr6eTBqYrIuV CK1HcIggoJ/UkaS0OnOSRXXdAnP3jixwM81E6CSH74C8jmm7DZ8HYU1STsYUKQ== Received: by tupai.ela-bln.local (Postfix, from userid 1000) id 16B48340475; Tue, 16 Jul 2024 14:34:16 +0200 (CEST) From: Andreas Helmcke To: ptxdist@pengutronix.de Date: Tue, 16 Jul 2024 14:34:01 +0200 Message-ID: <20240716123405.59362-1-ahelmcke@ela-soft.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-102.2 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, USER_IN_WELCOMELIST,USER_IN_WHITELIST autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] 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 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 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 --- ...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 -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 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