summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2010-05-21 19:11:34 +0200
committerRobert Schwebel <r.schwebel@pengutronix.de>2010-05-25 12:45:04 +0200
commit4624ce47c804e4c84e8490dd91bf7842875483ed (patch)
tree3f664f2e3885aa4cf67e3004be11122b0bf7eae8 /patches
parente39ab9ab93eb706f892b06eb41c6926a2a931d7a (diff)
downloadptxdist-4624ce47c804e4c84e8490dd91bf7842875483ed.tar.gz
ptxdist-4624ce47c804e4c84e8490dd91bf7842875483ed.tar.xz
[e2fsprogs] version bump 1.41.9 -> 1.41.12
Diffstat (limited to 'patches')
-rw-r--r--patches/e2fsprogs-1.41.12/coldfire-v4e-compilefix.patch (renamed from patches/e2fsprogs-1.41.9/coldfire-v4e-compilefix.patch)12
-rw-r--r--patches/e2fsprogs-1.41.12/fix-libblkid-linking.diff (renamed from patches/e2fsprogs-1.41.9/fix-libblkid-linking.diff)8
-rw-r--r--patches/e2fsprogs-1.41.12/series (renamed from patches/e2fsprogs-1.41.9/series)0
3 files changed, 12 insertions, 8 deletions
diff --git a/patches/e2fsprogs-1.41.9/coldfire-v4e-compilefix.patch b/patches/e2fsprogs-1.41.12/coldfire-v4e-compilefix.patch
index a8ad45703..3acbd9a15 100644
--- a/patches/e2fsprogs-1.41.9/coldfire-v4e-compilefix.patch
+++ b/patches/e2fsprogs-1.41.12/coldfire-v4e-compilefix.patch
@@ -8,11 +8,15 @@ now.
Signed-off-by: Carsten Schlote <schlote@vahanus.net>
-Index: e2fsprogs-1.40.4/lib/ext2fs/bitops.h
+---
+ lib/ext2fs/bitops.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: e2fsprogs-1.41.12/lib/ext2fs/bitops.h
===================================================================
---- e2fsprogs-1.40.4.orig/lib/ext2fs/bitops.h 2008-03-11 00:25:58.620287376 +0100
-+++ e2fsprogs-1.40.4/lib/ext2fs/bitops.h 2008-03-11 00:28:15.628095006 +0100
-@@ -302,7 +302,7 @@
+--- e2fsprogs-1.41.12.orig/lib/ext2fs/bitops.h
++++ e2fsprogs-1.41.12/lib/ext2fs/bitops.h
+@@ -244,7 +244,7 @@ _INLINE_ __u16 ext2fs_swab16(__u16 val)
#endif /* i386 */
#if ((defined __GNUC__) && !defined(_EXT2_USE_C_VERSIONS_) && \
diff --git a/patches/e2fsprogs-1.41.9/fix-libblkid-linking.diff b/patches/e2fsprogs-1.41.12/fix-libblkid-linking.diff
index dee7aec74..8fe5d441c 100644
--- a/patches/e2fsprogs-1.41.9/fix-libblkid-linking.diff
+++ b/patches/e2fsprogs-1.41.12/fix-libblkid-linking.diff
@@ -9,11 +9,11 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
lib/blkid/Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-Index: b/lib/blkid/Makefile.in
+Index: e2fsprogs-1.41.12/lib/blkid/Makefile.in
===================================================================
---- a/lib/blkid/Makefile.in
-+++ b/lib/blkid/Makefile.in
-@@ -37,7 +37,7 @@ ELF_SO_VERSION = 1
+--- e2fsprogs-1.41.12.orig/lib/blkid/Makefile.in
++++ e2fsprogs-1.41.12/lib/blkid/Makefile.in
+@@ -36,7 +36,7 @@ ELF_SO_VERSION = 1
ELF_IMAGE = libblkid
ELF_MYDIR = blkid
ELF_INSTALL_DIR = $(root_libdir)
diff --git a/patches/e2fsprogs-1.41.9/series b/patches/e2fsprogs-1.41.12/series
index a5628d602..a5628d602 100644
--- a/patches/e2fsprogs-1.41.9/series
+++ b/patches/e2fsprogs-1.41.12/series