From 890709bfe776deada60f25d0b45e8a32e8d7adc9 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Wed, 17 Mar 2010 21:06:51 +0100 Subject: [atop] version bump to 1.24 Signed-off-by: Marc Kleine-Budde --- patches/atop-1.23/fix-cross-compile.patch | 39 ------------------------------- patches/atop-1.23/series | 1 - patches/atop-1.24/fix-cross-compile.patch | 38 ++++++++++++++++++++++++++++++ patches/atop-1.24/series | 1 + rules/atop.make | 6 ++--- 5 files changed, 42 insertions(+), 43 deletions(-) delete mode 100644 patches/atop-1.23/fix-cross-compile.patch delete mode 100644 patches/atop-1.23/series create mode 100644 patches/atop-1.24/fix-cross-compile.patch create mode 100644 patches/atop-1.24/series diff --git a/patches/atop-1.23/fix-cross-compile.patch b/patches/atop-1.23/fix-cross-compile.patch deleted file mode 100644 index bbb2942ad..000000000 --- a/patches/atop-1.23/fix-cross-compile.patch +++ /dev/null @@ -1,39 +0,0 @@ -Subject: Fix crosscompilation -From: Marc Kleine-Budde - -This patch fixes cross compilation, of another handcrafted -Makefile. - -Signed-off-by: Marc Kleine-Budde - ---- -#20081125: wsa: Mailed to upstream. -#20081127: wsa: Accepted upstream. Wait for next release. - - 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 - ROTPATH = /etc/logrotate.d - --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 -@@ -25,7 +25,7 @@ ALLMODS = $(OBJMOD0) $(OBJMOD1) $(OBJMOD - 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.23/series b/patches/atop-1.23/series deleted file mode 100644 index 0190994f9..000000000 --- a/patches/atop-1.23/series +++ /dev/null @@ -1 +0,0 @@ -fix-cross-compile.patch diff --git a/patches/atop-1.24/fix-cross-compile.patch b/patches/atop-1.24/fix-cross-compile.patch new file mode 100644 index 000000000..e325c7a1e --- /dev/null +++ b/patches/atop-1.24/fix-cross-compile.patch @@ -0,0 +1,38 @@ +Subject: Fix crosscompilation +From: Marc Kleine-Budde + +This patch fixes cross compilation, of another handcrafted +Makefile. + +Signed-off-by: Marc Kleine-Budde + +--- +#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(-) + +--- 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) $(OBJMOD + 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 new file mode 100644 index 000000000..0190994f9 --- /dev/null +++ b/patches/atop-1.24/series @@ -0,0 +1 @@ +fix-cross-compile.patch 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 # # 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: -- cgit v1.2.3