All of lore.kernel.org
 help / color / mirror / Atom feed
From: Waldemar Brodkorb <wbx@openadk.org>
To: buildroot@buildroot.org
Subject: [Buildroot] [PATCH] package/atop: update to 2.11.0
Date: Sat, 10 Aug 2024 08:14:18 +0200	[thread overview]
Message-ID: <ZrcFOqAT600add79@waldemar-brodkorb.de> (raw)

See here for a changelog:
https://atoptool.nl/downloadatop.php

Fixes:
 - http://autobuild.buildroot.net/results/4f2/4f256c96c8b7c34c1f1be378ad3a535d3150e44d

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
 ...he-user-to-pass-additional-CFLAGS-an.patch | 21 +++++++++----------
 package/atop/atop.hash                        |  2 +-
 package/atop/atop.mk                          |  4 +++-
 3 files changed, 14 insertions(+), 13 deletions(-)

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
index c4ec67ca24..0fc8f142b1 100644
--- 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
@@ -8,26 +8,25 @@ 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 a6f196b..dae5cda 100644
+index 3a63f69..ab44eaa 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -20,8 +20,8 @@ PMPATH1  = /usr/lib/pm-utils/sleep.d
- PMPATH2  = /usr/lib64/pm-utils/sleep.d
+@@ -21,8 +21,8 @@ PMPATH2  = /usr/lib64/pm-utils/sleep.d
  PMPATHD  = /usr/lib/systemd/system-sleep
  
--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 $(CFLAGS) # -DNOPERFEVENT   # -DHTTPSTATS
-+override LDFLAGS  := $(shell pkg-config --libs glib-2.0) $(LDFLAGS)
+ 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  rawlog.o ifprop.o parseable.o
--- 
-2.45.2
-
+ 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 a6539e6211..8774fb577d 100644
--- a/package/atop/atop.hash
+++ b/package/atop/atop.hash
@@ -1,5 +1,5 @@
 # Locally computed:
-sha256  e7a673cf2c82578e7dd82ecb0dec83fd9ecb30828b2561c28a9fa5aaf75d5f93  atop-2.10.0.tar.gz
+sha256  9b94c666602efff7bf402ecce706c347f38c39cb63498f9d39626861e5646e20  atop-2.11.0.tar.gz
 
 # Hash for license file:
 sha256  204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994  COPYING
diff --git a/package/atop/atop.mk b/package/atop/atop.mk
index b383932e8d..f72aa90908 100644
--- a/package/atop/atop.mk
+++ b/package/atop/atop.mk
@@ -4,13 +4,15 @@
 #
 ################################################################################
 
-ATOP_VERSION = 2.10.0
+ATOP_VERSION = 2.11.0
 ATOP_SITE = http://www.atoptool.nl/download
 ATOP_LICENSE = GPL-2.0+
 ATOP_LICENSE_FILES = COPYING
 ATOP_CPE_ID_VALID = YES
 ATOP_DEPENDENCIES = ncurses zlib libglib2 host-pkgconf
 
+ATOP_MAKE_FLAGS = PKG_CONFIG=$(PKG_CONFIG_HOST_BINARY)
+
 ATOP_CFLAGS = $(TARGET_CFLAGS)
 
 ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

             reply	other threads:[~2024-08-10  6:14 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-10  6:14 Waldemar Brodkorb [this message]
2024-08-12 20:52 ` [Buildroot] [PATCH] package/atop: update to 2.11.0 Thomas Petazzoni via buildroot

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=ZrcFOqAT600add79@waldemar-brodkorb.de \
    --to=wbx@openadk.org \
    --cc=buildroot@buildroot.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.