diff options
author | Robert Schwebel <r.schwebel@pengutronix.de> | 2007-01-02 11:52:47 +0000 |
---|---|---|
committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2007-01-02 11:52:47 +0000 |
commit | cfec5ab54a66ddea03167e58508465cac26ebd09 (patch) | |
tree | ba3505ad35cdb482270ae52c73f190d4917ee423 /patches | |
parent | 43da0d74cbdcf7df65d2406242a7d897819cb596 (diff) | |
download | ptxdist-cfec5ab54a66ddea03167e58508465cac26ebd09.tar.gz ptxdist-cfec5ab54a66ddea03167e58508465cac26ebd09.tar.xz |
* mtd-utils: moved 'mtd' to new packet 'mtd-utils', which fits
reality better. Merged from branches/ptxdist-trunk-mkl by rsc.
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6594 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches')
-rw-r--r-- | patches/mtd-utils-1.0.0/generic/mtd-cppflags.diff | 22 | ||||
-rw-r--r-- | patches/mtd-utils-1.0.0/generic/series | 1 | ||||
-rw-r--r-- | patches/mtd-utils-1.0.1/generic/mtd-cppflags.diff | 32 | ||||
-rw-r--r-- | patches/mtd-utils-1.0.1/generic/series | 1 |
4 files changed, 53 insertions, 3 deletions
diff --git a/patches/mtd-utils-1.0.0/generic/mtd-cppflags.diff b/patches/mtd-utils-1.0.0/generic/mtd-cppflags.diff index 9c9486bfa..1e3066b89 100644 --- a/patches/mtd-utils-1.0.0/generic/mtd-cppflags.diff +++ b/patches/mtd-utils-1.0.0/generic/mtd-cppflags.diff @@ -17,9 +17,25 @@ # unknown # ---- mtd-utils-1.0.0/Makefile.orig 2006-05-02 16:48:44.316560880 +0200 -+++ mtd-utils-1.0.0/Makefile 2006-05-02 16:48:58.853350952 +0200 -@@ -24,7 +24,7 @@ +Index: mtd-utils-1.0.0/Makefile +=================================================================== +--- mtd-utils-1.0.0.orig/Makefile ++++ mtd-utils-1.0.0/Makefile +@@ -3,9 +3,10 @@ + + # $Id: Makefile,v 1.60 2005/11/07 11:15:09 gleixner Exp $ + +-SBINDIR=/usr/sbin +-MANDIR=/usr/man +-INCLUDEDIR=/usr/include ++PREFIX=/usr ++SBINDIR=$(PREFIX)/sbin ++MANDIR=$(PREFIX)/share/man ++INCLUDEDIR=$(PREFIX)/include + #CROSS=arm-linux- + CC := $(CROSS)gcc + CFLAGS := -I./include -O2 -Wall +@@ -24,7 +25,7 @@ SYMLINKS = $(CC) $(LDFLAGS) -g -o $@ $^ %.o: %.c diff --git a/patches/mtd-utils-1.0.0/generic/series b/patches/mtd-utils-1.0.0/generic/series new file mode 100644 index 000000000..7453d73ab --- /dev/null +++ b/patches/mtd-utils-1.0.0/generic/series @@ -0,0 +1 @@ +mtd-cppflags.diff diff --git a/patches/mtd-utils-1.0.1/generic/mtd-cppflags.diff b/patches/mtd-utils-1.0.1/generic/mtd-cppflags.diff new file mode 100644 index 000000000..90db2f852 --- /dev/null +++ b/patches/mtd-utils-1.0.1/generic/mtd-cppflags.diff @@ -0,0 +1,32 @@ +# +# Submitted-By: Robert Schwebel, 2005-03-13 +# Committed-By: Robert Schwebel +# +# Error: +# +# MTD utilities forget to use the preprocessor flags; as we feed in +# special include directories via -isystem in PTXdist this is not used +# and crashes. +# +# Description: +# +# no public discussion about this topic yet. +# +# State: +# +# unknown +# + +Index: mtd-utils-1.0.1/Makefile +=================================================================== +--- mtd-utils-1.0.1.orig/Makefile ++++ mtd-utils-1.0.1/Makefile +@@ -34,7 +34,7 @@ SYMLINKS = + + $(BUILDDIR)/%.o: %.c + mkdir -p $(BUILDDIR) +- $(CC) $(CFLAGS) -g -c -o $@ $< -g -Wp,-MD,$(BUILDDIR)/.$(<F).dep ++ $(CC) $(CFLAGS) $(CPPFLAGS) -g -c -o $@ $< -g -Wp,-MD,$(BUILDDIR)/.$(<F).dep + + .SUFFIXES: + diff --git a/patches/mtd-utils-1.0.1/generic/series b/patches/mtd-utils-1.0.1/generic/series new file mode 100644 index 000000000..7453d73ab --- /dev/null +++ b/patches/mtd-utils-1.0.1/generic/series @@ -0,0 +1 @@ +mtd-cppflags.diff |