[v2,2/2] package/atop: bump to version 2.12.0
diff mbox series

Message ID 20250921100352.2620720-2-dario.binacchi@amarulasolutions.com
State New
Headers show
Series
  • [v2,1/2] package/atop: bump to version 2.11.1
Related show

Commit Message

Dario Binacchi Sept. 21, 2025, 10:03 a.m. UTC 
Patch 0001-Makefile-allow-the-user-to-pass-additional-CFLAGS-an.patch
was removed because it has been integrated with commit
631defdd22e3b6872c440d368d7acf459150eea5.

Release notes:
https://www.atoptool.nl/downloadatop.php

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

---

Changes v1 -> v2:
- Bump from 2.11.1 instead of 2.11.0

 ...he-user-to-pass-additional-CFLAGS-an.patch | 32 -------------------
 package/atop/atop.hash                        |  2 +-
 package/atop/atop.mk                          |  2 +-
 3 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 package/atop/0001-Makefile-allow-the-user-to-pass-additional-CFLAGS-an.patch

Patch
diff mbox series 

diff --git a/package/atop/0001-Makefile-allow-the-user-to-pass-additional-CFLAGS-an.patch b/package/atop/0001-Makefile-allow-the-user-to-pass-additional-CFLAGS-an.patch
deleted file mode 100644
index 0fc8f142b14a..000000000000
--- a/package/atop/0001-Makefile-allow-the-user-to-pass-additional-CFLAGS-an.patch
+++ /dev/null
@@ -1,32 +0,0 @@ 
-From c8e9d2b885deca065bd7955019a6aa071974042d Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Date: Mon, 5 Aug 2024 23:38:08 +0200
-Subject: [PATCH] Makefile: allow the user to pass additional CFLAGS and
- LDFLAGS
-
-This is needed for some build systems. For example, Buildroot needs to
-disable optimizations on some CPU architectures.
-
-Upstream: https://github.com/Atoptool/atop/pull/314
-[Waldemar: rebase on top of 2.11.0]
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 3a63f69..ab44eaa 100644
---- a/Makefile
-+++ b/Makefile
-@@ -21,8 +21,8 @@ PMPATH2  = /usr/lib64/pm-utils/sleep.d
- PMPATHD  = /usr/lib/systemd/system-sleep
- 
- PKG_CONFIG ?= pkg-config
--CFLAGS  += -O2 -I. -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
--LDFLAGS += $(shell $(PKG_CONFIG) --libs glib-2.0)
-+override CFLAGS  += -O2 -I. -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
-+override LDFLAGS += $(shell $(PKG_CONFIG) --libs glib-2.0)
- OBJMOD0  = version.o
- OBJMOD1  = various.o  deviate.o   procdbase.o
- OBJMOD2  = acctproc.o photoproc.o photosyst.o cgroups.o rawlog.o ifprop.o parseable.o
diff --git a/package/atop/atop.hash b/package/atop/atop.hash
index 8f0cb695814b..aeb9a469d7d3 100644
--- a/package/atop/atop.hash
+++ b/package/atop/atop.hash
@@ -1,5 +1,5 @@ 
 # Locally computed:
-sha256  77650f79f9e388b6f5666dc113849894575a29bb4de21b8cd58767bf8a905154  atop-2.11.1.tar.gz
+sha256  0d09ecc90c14e6ef41c22e3c57c142c3e4fb9cf3c94379077a33c961d5343086  atop-2.12.0.tar.gz
 
 # Hash for license file:
 sha256  204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994  COPYING
diff --git a/package/atop/atop.mk b/package/atop/atop.mk
index 155dec617747..b4a5bda52e40 100644
--- a/package/atop/atop.mk
+++ b/package/atop/atop.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-ATOP_VERSION = 2.11.1
+ATOP_VERSION = 2.12.0
 ATOP_SITE = http://www.atoptool.nl/download
 ATOP_LICENSE = GPL-2.0+
 ATOP_LICENSE_FILES = COPYING