diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-03-17 21:06:51 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-03-17 21:07:32 +0100 |
| commit | 890709bfe776deada60f25d0b45e8a32e8d7adc9 (patch) | |
| tree | 13efc0d6f8b44503f47b460e7af6cac4e67ffd53 | |
| parent | 0d43762dad46287984fa908e3264bcb746acf605 (diff) | |
| download | ptxdist-890709bfe776deada60f25d0b45e8a32e8d7adc9.tar.gz ptxdist-890709bfe776deada60f25d0b45e8a32e8d7adc9.tar.xz | |
[atop] version bump to 1.24
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | patches/atop-1.24/fix-cross-compile.patch (renamed from patches/atop-1.23/fix-cross-compile.patch) | 13 | ||||
| -rw-r--r-- | patches/atop-1.24/series (renamed from patches/atop-1.23/series) | 0 | ||||
| -rw-r--r-- | rules/atop.make | 6 |
3 files changed, 9 insertions, 10 deletions
diff --git a/patches/atop-1.23/fix-cross-compile.patch b/patches/atop-1.24/fix-cross-compile.patch index bbb2942ad..e325c7a1e 100644 --- a/patches/atop-1.23/fix-cross-compile.patch +++ b/patches/atop-1.24/fix-cross-compile.patch @@ -9,18 +9,17 @@ 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 file changed, 3 insertions(+), 3 deletions(-) -Index: atop-1.23/Makefile -=================================================================== ---- atop-1.23.orig/Makefile -+++ atop-1.23/Makefile -@@ -13,8 +13,8 @@ INIPATH = /etc/rc.d/init.d - CRNPATH = /etc/cron.d +--- 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 @@ -28,7 +27,7 @@ Index: atop-1.23/Makefile OBJMOD0 = version.o OBJMOD1 = various.o deviate.o procdbase.o OBJMOD2 = acctproc.o photoproc.o photosyst.o rawlog.o ifprop.o parseable.o -@@ -25,7 +25,7 @@ ALLMODS = $(OBJMOD0) $(OBJMOD1) $(OBJMOD +@@ -27,7 +27,7 @@ ALLMODS = $(OBJMOD0) $(OBJMOD1) $(OBJMOD all: atop atop: atop.o $(ALLMODS) Makefile diff --git a/patches/atop-1.23/series b/patches/atop-1.24/series index 0190994f9..0190994f9 100644 --- a/patches/atop-1.23/series +++ b/patches/atop-1.24/series diff --git a/rules/atop.make b/rules/atop.make index 14c5d20c9..9fb433ecd 100644 --- a/rules/atop.make +++ b/rules/atop.make @@ -1,6 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2008 by Remy Bohmer, Netherlands +# 2010 by Marc Kleine-Budde <mkl@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -16,9 +17,9 @@ PACKAGES-$(PTXCONF_ATOP) += atop # # Paths and names # -ATOP_VERSION := 1.23 +ATOP_VERSION := 1.24 ATOP := atop-$(ATOP_VERSION) -ATOP_URL := http://www.atcomputing.nl/Tools/atop/packages/$(ATOP).tar.gz +ATOP_URL := http://www.atoptool.nl/download/$(ATOP).tar.gz ATOP_SOURCE := $(SRCDIR)/$(ATOP).tar.gz ATOP_DIR := $(BUILDDIR)/$(ATOP) @@ -35,7 +36,6 @@ $(ATOP_SOURCE): # Prepare # ---------------------------------------------------------------------------- -ATOP_PATH := PATH=$(CROSS_PATH) ATOP_COMPILE_ENV := $(CROSS_ENV) $(STATEDIR)/atop.prepare: |