From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH 16/28] e2fsprogs: clean up patches
Date: Sun, 30 Oct 2011 23:00:47 +0100 [thread overview]
Message-ID: <1320012059-24971-16-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>
---
.../0001-Fixed-bitops.h-for-Coldfire-V4E.patch | 30 ++++++++++++++++++++
.../0002-fix-linking-problem.patch | 28 ++++++++++++++++++
.../coldfire-v4e-compilefix.patch | 27 ------------------
.../e2fsprogs-1.41.14/fix-libblkid-linking.diff | 24 ----------------
patches/e2fsprogs-1.41.14/series | 2 -
5 files changed, 58 insertions(+), 53 deletions(-)
create mode 100644 patches/e2fsprogs-1.41.14/0001-Fixed-bitops.h-for-Coldfire-V4E.patch
create mode 100644 patches/e2fsprogs-1.41.14/0002-fix-linking-problem.patch
delete mode 100644 patches/e2fsprogs-1.41.14/coldfire-v4e-compilefix.patch
delete mode 100644 patches/e2fsprogs-1.41.14/fix-libblkid-linking.diff
delete mode 100644 patches/e2fsprogs-1.41.14/series
diff --git a/patches/e2fsprogs-1.41.14/0001-Fixed-bitops.h-for-Coldfire-V4E.patch b/patches/e2fsprogs-1.41.14/0001-Fixed-bitops.h-for-Coldfire-V4E.patch
new file mode 100644
index 0000000..d5c938f
--- /dev/null
+++ b/patches/e2fsprogs-1.41.14/0001-Fixed-bitops.h-for-Coldfire-V4E.patch
@@ -0,0 +1,30 @@
+From 164fd99430e3115feed20f727938d66d3905b961 Mon Sep 17 00:00:00 2001
+From: Carsten Schlote <schlote@vahanus.net>
+Date: Tue, 11 Mar 2008 00:32:20 +0100
+Subject: [PATCH 1/2] 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 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lib/ext2fs/bitops.h b/lib/ext2fs/bitops.h
+index ce70539..7e05ec3 100644
+--- a/lib/ext2fs/bitops.h
++++ b/lib/ext2fs/bitops.h
+@@ -244,7 +244,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_
+
+--
+1.7.7
+
diff --git a/patches/e2fsprogs-1.41.14/0002-fix-linking-problem.patch b/patches/e2fsprogs-1.41.14/0002-fix-linking-problem.patch
new file mode 100644
index 0000000..e7dba9b
--- /dev/null
+++ b/patches/e2fsprogs-1.41.14/0002-fix-linking-problem.patch
@@ -0,0 +1,28 @@
+From 43b0f9d24cc6a92286775d6e0a4f09943658a98b Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sat, 29 Oct 2011 19:11:54 +0200
+Subject: [PATCH 2/2] fix linking problem
+
+libblkid gets the wrong linker path. This results in link errors for e2fsck.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ lib/blkid/Makefile.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lib/blkid/Makefile.in b/lib/blkid/Makefile.in
+index e89318e..2e125b3 100644
+--- a/lib/blkid/Makefile.in
++++ b/lib/blkid/Makefile.in
+@@ -36,7 +36,7 @@ ELF_SO_VERSION = 1
+ ELF_IMAGE = libblkid
+ ELF_MYDIR = blkid
+ ELF_INSTALL_DIR = $(root_libdir)
+-ELF_OTHER_LIBS = -L../.. -luuid
++ELF_OTHER_LIBS = ../../libuuid.so
+
+ BSDLIB_VERSION = 2.0
+ BSDLIB_IMAGE = libblkid
+--
+1.7.7
+
diff --git a/patches/e2fsprogs-1.41.14/coldfire-v4e-compilefix.patch b/patches/e2fsprogs-1.41.14/coldfire-v4e-compilefix.patch
deleted file mode 100644
index 3acbd9a..0000000
--- a/patches/e2fsprogs-1.41.14/coldfire-v4e-compilefix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Carsten Schlote <schlote@vahanus.net>
-Date: Tue, 11 Mar 2008 00:32:20 +0100
-Subject: [PATCH] [e2fsprogs-1.40.4] 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.41.12/lib/ext2fs/bitops.h
-===================================================================
---- 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_) && \
-- (defined(__mc68000__)))
-+ (defined(__mc68000__)) && !defined(__mcoldfire__))
-
- #define _EXT2_HAVE_ASM_BITOPS_
-
diff --git a/patches/e2fsprogs-1.41.14/fix-libblkid-linking.diff b/patches/e2fsprogs-1.41.14/fix-libblkid-linking.diff
deleted file mode 100644
index 8fe5d44..0000000
--- a/patches/e2fsprogs-1.41.14/fix-libblkid-linking.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Subject: fix linking problem
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-
-libblkid gets the wrong linker path. This results in link errors for e2fsck.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- lib/blkid/Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: e2fsprogs-1.41.12/lib/blkid/Makefile.in
-===================================================================
---- 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)
--ELF_OTHER_LIBS = -L../.. -luuid
-+ELF_OTHER_LIBS = ../../libuuid.so
-
- BSDLIB_VERSION = 2.0
- BSDLIB_IMAGE = libblkid
diff --git a/patches/e2fsprogs-1.41.14/series b/patches/e2fsprogs-1.41.14/series
deleted file mode 100644
index a5628d6..0000000
--- a/patches/e2fsprogs-1.41.14/series
+++ /dev/null
@@ -1,2 +0,0 @@
-coldfire-v4e-compilefix.patch
-fix-libblkid-linking.diff
--
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 ` [ptxdist] [PATCH 07/28] atop: " Robert Schwebel
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 ` Robert Schwebel [this message]
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-16-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