diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2013-06-15 12:03:59 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2013-06-15 12:30:08 +0200 |
| commit | 0c95a6603e3e52c2bba8172ba055211f5f12fd1d (patch) | |
| tree | a0f92393ad5a96580f13e361dd40d9227b667605 | |
| parent | 1d422d71122f6b0790b1ca39dabc21fa42b2adb1 (diff) | |
| download | ptxdist-0c95a6603e3e52c2bba8172ba055211f5f12fd1d.tar.gz ptxdist-0c95a6603e3e52c2bba8172ba055211f5f12fd1d.tar.xz | |
e2fsprogs: version bump 1.42.4 -> 1.42.7
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/e2fsprogs-1.42.4/0001-Fixed-bitops.h-for-Coldfire-V4E.patch | 26 | ||||
| -rw-r--r-- | patches/e2fsprogs-1.42.4/series | 4 | ||||
| -rw-r--r-- | rules/e2fsprogs.make | 4 |
3 files changed, 2 insertions, 32 deletions
diff --git a/patches/e2fsprogs-1.42.4/0001-Fixed-bitops.h-for-Coldfire-V4E.patch b/patches/e2fsprogs-1.42.4/0001-Fixed-bitops.h-for-Coldfire-V4E.patch deleted file mode 100644 index ebc5854e4..000000000 --- a/patches/e2fsprogs-1.42.4/0001-Fixed-bitops.h-for-Coldfire-V4E.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Carsten Schlote <schlote@vahanus.net> -Date: Tue, 11 Mar 2008 00:32:20 +0100 -Subject: [PATCH] Fixed bitops.h for Coldfire V4E - -Commented out assembly inline code for mc68020 or higher. -These mnemonics aren't available on Coldfire. Using C routines -now. - -Signed-off-by: Carsten Schlote <schlote@vahanus.net> ---- - lib/ext2fs/bitops.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: e2fsprogs-1.42.4/lib/ext2fs/bitops.h -=================================================================== ---- e2fsprogs-1.42.4.orig/lib/ext2fs/bitops.h -+++ e2fsprogs-1.42.4/lib/ext2fs/bitops.h -@@ -347,7 +347,7 @@ _INLINE_ __u16 ext2fs_swab16(__u16 val) - #endif /* i386 */ - - #if ((defined __GNUC__) && !defined(_EXT2_USE_C_VERSIONS_) && \ -- (defined(__mc68000__))) -+ (defined(__mc68000__)) && !defined(__mcoldfire__)) - - #define _EXT2_HAVE_ASM_BITOPS_ - diff --git a/patches/e2fsprogs-1.42.4/series b/patches/e2fsprogs-1.42.4/series deleted file mode 100644 index 355f84659..000000000 --- a/patches/e2fsprogs-1.42.4/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-Fixed-bitops.h-for-Coldfire-V4E.patch -# 51e935bcb2a32d87daadf80960d144b0 - git-ptx-patches magic diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index 93d10deb8..4ab562cf8 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_E2FSPROGS) += e2fsprogs # # Paths and names # -E2FSPROGS_VERSION := 1.42.4 -E2FSPROGS_MD5 := b6e296f210d642361b7394437ff0f318 +E2FSPROGS_VERSION := 1.42.7 +E2FSPROGS_MD5 := a1ec22ef003688dae9f76c74881b22b9 E2FSPROGS := e2fsprogs-$(E2FSPROGS_VERSION) E2FSPROGS_SUFFIX := tar.gz E2FSPROGS_URL := $(call ptx/mirror, SF, e2fsprogs/$(E2FSPROGS).$(E2FSPROGS_SUFFIX)) |