From: Ladislav Michl <ladis@linux-mips.org>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH v2 3/3] atop: version bump 1.24 -> 2.3.0
Date: Wed, 28 Feb 2018 08:02:39 +0100 [thread overview]
Message-ID: <20180228070239.GC7737@lenoch> (raw)
In-Reply-To: <20180228065715.GA7737@lenoch>
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
Changes:
-v2: Dropped unneccessary changes
Notes: I'm not sure if this one is really needed for ncurses update
anymore, but I tested it with that :)
patches/atop-1.24/0001-Fix-crosscompilation.patch | 40 -----------------------
patches/atop-1.24/series | 4 ---
rules/atop.make | 10 ++++--
3 files changed, 7 insertions(+), 47 deletions(-)
diff --git a/patches/atop-1.24/0001-Fix-crosscompilation.patch b/patches/atop-1.24/0001-Fix-crosscompilation.patch
deleted file mode 100644
index ab31a57bf..000000000
--- a/patches/atop-1.24/0001-Fix-crosscompilation.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Sat, 29 Oct 2011 18:53:38 +0200
-Subject: [PATCH] Fix crosscompilation
-
-This patch fixes cross compilation, of another handcrafted
-Makefile.
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
-#20081125: wsa: Mailed to upstream.
-#20081127: wsa: Accepted upstream. Wait for next release.
-#20100317: mkl: Mailed to upstream again.
-
- Makefile | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 669cbcd..f4c4868 100644
---- a/Makefile
-+++ b/Makefile
-@@ -15,8 +15,8 @@ CRNPATH = /etc/cron.d
- ROTPATH = /etc/logrotate.d
-
- # CFLAGS = -g -I. -Wall # -DHTTPSTATS
--CFLAGS = -O -I. -Wall # -DHTTPSTATS
--LDFLAGS = -lncurses -lm -lz
-+CFLAGS += -O2 -I. -Wall # -DHTTPSTATS
-+LDFLAGS += -lncurses -lm -lz
- OBJMOD0 = version.o
- OBJMOD1 = various.o deviate.o procdbase.o
- OBJMOD2 = acctproc.o photoproc.o photosyst.o rawlog.o ifprop.o parseable.o
-@@ -27,7 +27,7 @@ ALLMODS = $(OBJMOD0) $(OBJMOD1) $(OBJMOD2) $(OBJMOD3) $(OBJMOD4)
- all: atop
-
- atop: atop.o $(ALLMODS) Makefile
-- cc atop.o $(ALLMODS) -o atop $(LDFLAGS)
-+ $(CC) atop.o $(ALLMODS) -o atop $(LDFLAGS)
-
- clean:
- rm -f *.o
diff --git a/patches/atop-1.24/series b/patches/atop-1.24/series
deleted file mode 100644
index d9e13463c..000000000
--- a/patches/atop-1.24/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Fix-crosscompilation.patch
-# e9d85414939b4130efe10afdc936e035 - git-ptx-patches magic
diff --git a/rules/atop.make b/rules/atop.make
index bd9b326d0..84f049180 100644
--- a/rules/atop.make
+++ b/rules/atop.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_ATOP) += atop
#
# Paths and names
#
-ATOP_VERSION := 1.24
-ATOP_MD5 := 46522f7da28460e810e193ab46907af9
+ATOP_VERSION := 2.3.0
+ATOP_MD5 := 48e1dbef8c7d826e68829a8d5fc920fc
ATOP := atop-$(ATOP_VERSION)
ATOP_URL := http://www.atoptool.nl/download/$(ATOP).tar.gz
ATOP_SOURCE := $(SRCDIR)/$(ATOP).tar.gz
@@ -31,7 +31,11 @@ ATOP_LICENSE_FILES := file://COPYING;md5=393a5ca445f6965873eca0259a17f833
# ----------------------------------------------------------------------------
ATOP_CONF_TOOL := NO
-ATOP_COMPILE_ENV := $(CROSS_ENV)
+ATOP_MAKE_OPT := $(CROSS_ENV)
+ATOP_INSTALL_OPT := \
+ $(ATOP_MAKE_OPT) \
+ DESTDIR=$(ATOP_PKGDIR) \
+ genericinstall
# ----------------------------------------------------------------------------
# Target-Install
--
2.16.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
prev parent reply other threads:[~2018-02-28 7:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-28 6:57 [ptxdist] [PATCH v2 1/3] ncurses: version bump 5.9 -> 6.1 Ladislav Michl
2018-02-28 7:00 ` [ptxdist] [PATCH 2/3] htop: fix configure to discover ncurses6 Ladislav Michl
2018-02-28 7:02 ` Ladislav Michl [this message]
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=20180228070239.GC7737@lenoch \
--to=ladis@linux-mips.org \
--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