Signed-off-by: Jan Luebbe <j...@pengutronix.de> --- .../0001-Fixed-bitops.h-for-Coldfire-V4E.patch | 26 ++++++++++++++++++++ patches/e2fsprogs-1.42.2/series | 4 +++ .../0001-Fixed-bitops.h-for-Coldfire-V4E.patch | 26 -------------------- patches/e2fsprogs-1.42/series | 4 --- rules/e2fsprogs.make | 4 +-- 5 files changed, 32 insertions(+), 32 deletions(-) create mode 100644 patches/e2fsprogs-1.42.2/0001-Fixed-bitops.h-for-Coldfire-V4E.patch create mode 100644 patches/e2fsprogs-1.42.2/series delete mode 100644 patches/e2fsprogs-1.42/0001-Fixed-bitops.h-for-Coldfire-V4E.patch delete mode 100644 patches/e2fsprogs-1.42/series
diff --git a/patches/e2fsprogs-1.42.2/0001-Fixed-bitops.h-for-Coldfire-V4E.patch b/patches/e2fsprogs-1.42.2/0001-Fixed-bitops.h-for-Coldfire-V4E.patch new file mode 100644 index 0000000..f1bbd10 --- /dev/null +++ b/patches/e2fsprogs-1.42.2/0001-Fixed-bitops.h-for-Coldfire-V4E.patch @@ -0,0 +1,26 @@ +From: Carsten Schlote <schl...@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 <schl...@vahanus.net> +--- + lib/ext2fs/bitops.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/lib/ext2fs/bitops.h b/lib/ext2fs/bitops.h +index 83a01e4..55c6782 100644 +--- a/lib/ext2fs/bitops.h ++++ b/lib/ext2fs/bitops.h +@@ -336,7 +336,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.2/series b/patches/e2fsprogs-1.42.2/series new file mode 100644 index 0000000..355f846 --- /dev/null +++ b/patches/e2fsprogs-1.42.2/series @@ -0,0 +1,4 @@ +# 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/patches/e2fsprogs-1.42/0001-Fixed-bitops.h-for-Coldfire-V4E.patch b/patches/e2fsprogs-1.42/0001-Fixed-bitops.h-for-Coldfire-V4E.patch deleted file mode 100644 index f1bbd10..0000000 --- a/patches/e2fsprogs-1.42/0001-Fixed-bitops.h-for-Coldfire-V4E.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Carsten Schlote <schl...@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 <schl...@vahanus.net> ---- - lib/ext2fs/bitops.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/lib/ext2fs/bitops.h b/lib/ext2fs/bitops.h -index 83a01e4..55c6782 100644 ---- a/lib/ext2fs/bitops.h -+++ b/lib/ext2fs/bitops.h -@@ -336,7 +336,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/series b/patches/e2fsprogs-1.42/series deleted file mode 100644 index 355f846..0000000 --- a/patches/e2fsprogs-1.42/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 858aeac..57dade2 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_E2FSPROGS) += e2fsprogs # # Paths and names # -E2FSPROGS_VERSION := 1.42 -E2FSPROGS_MD5 := a3c4ffd7352310ab5e9412965d575610 +E2FSPROGS_VERSION := 1.42.2 +E2FSPROGS_MD5 := 04f4561a54ad0419248316a00c016baa E2FSPROGS := e2fsprogs-$(E2FSPROGS_VERSION) E2FSPROGS_SUFFIX := tar.gz E2FSPROGS_URL := $(call ptx/mirror, SF, e2fsprogs/$(E2FSPROGS).$(E2FSPROGS_SUFFIX)) -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de
