From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH 07/28] atop: clean up patches
Date: Sun, 30 Oct 2011 23:00:38 +0100 [thread overview]
Message-ID: <1320012059-24971-7-git-send-email-r.schwebel@pengutronix.de> (raw)
In-Reply-To: <1320012059-24971-1-git-send-email-r.schwebel@pengutronix.de>
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
patches/atop-1.24/0001-Fix-crosscompilation.patch | 40 +++++++++++++++++++++
patches/atop-1.24/fix-cross-compile.patch | 38 -------------------
patches/atop-1.24/series | 1 -
3 files changed, 40 insertions(+), 39 deletions(-)
create mode 100644 patches/atop-1.24/0001-Fix-crosscompilation.patch
delete mode 100644 patches/atop-1.24/fix-cross-compile.patch
delete mode 100644 patches/atop-1.24/series
diff --git a/patches/atop-1.24/0001-Fix-crosscompilation.patch b/patches/atop-1.24/0001-Fix-crosscompilation.patch
new file mode 100644
index 0000000..952916f
--- /dev/null
+++ b/patches/atop-1.24/0001-Fix-crosscompilation.patch
@@ -0,0 +1,40 @@
+From 63f4c95124e237b0dac0ca4d3cf65d0ae7079daf Mon Sep 17 00:00:00 2001
+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>
+---
+ 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
+--
+1.7.7
+
diff --git a/patches/atop-1.24/fix-cross-compile.patch b/patches/atop-1.24/fix-cross-compile.patch
deleted file mode 100644
index e325c7a..0000000
--- a/patches/atop-1.24/fix-cross-compile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Subject: Fix crosscompilation
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-
-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 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
deleted file mode 100644
index 0190994..0000000
--- a/patches/atop-1.24/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-cross-compile.patch
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2011-10-30 22:00 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-30 22:00 [ptxdist] Patch cleanup Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 02/28] devicekit-disks: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 03/28] mplayer: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 04/28] policykit: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 05/28] sdl: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 06/28] sdl-mixer: " Robert Schwebel
2011-10-30 22:00 ` Robert Schwebel [this message]
2011-10-30 22:00 ` [ptxdist] [PATCH 08/28] bing: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 09/28] bridge-utils: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 10/28] bzip2: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 11/28] cbmbasic: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 12/28] cpufrequtils: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 13/28] cvs: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 14/28] daemonize: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 15/28] dibbler: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 16/28] e2fsprogs: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 17/28] efax: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 18/28] eggdbus: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 19/28] elektra: remove orphaned package Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 20/28] etherwake: clean up patches Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 21/28] fakeroot: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 22/28] fbtest: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 23/28] font-alias: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 24/28] freetype: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 25/28] glademm: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 26/28] gpsd: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 27/28] gst-plugins-gl: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 28/28] gtk: " Robert Schwebel
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=1320012059-24971-7-git-send-email-r.schwebel@pengutronix.de \
--to=r.schwebel@pengutronix.de \
--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