diff options
| author | Ladislav Michl <ladis@linux-mips.org> | 2018-02-28 08:02:39 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-02-28 08:10:22 +0100 |
| commit | fd9efc2c9e9487c5d47841d5dfc267192e19e00a (patch) | |
| tree | 794967c84308911c876969f4b4134e1b5c0a961f | |
| parent | 74ffd1f57d0d68a89183ea2bf47c0cd67a989520 (diff) | |
| download | ptxdist-fd9efc2c9e9487c5d47841d5dfc267192e19e00a.tar.gz ptxdist-fd9efc2c9e9487c5d47841d5dfc267192e19e00a.tar.xz | |
atop: version bump 1.24 -> 2.3.0
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/atop-1.24/0001-Fix-crosscompilation.patch | 40 | ||||
| -rw-r--r-- | patches/atop-1.24/series | 4 | ||||
| -rw-r--r-- | 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 |