| 1 |
commit: fe5f95c9315c23429cac9807671e13da34f57414 |
| 2 |
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org> |
| 3 |
AuthorDate: Tue Aug 30 12:44:06 2011 +0000 |
| 4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 30 12:45:18 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=fe5f95c9 |
| 7 |
|
| 8 |
Enable patch application for mdadm, add patch to fix compilation (bug #381089) |
| 9 |
|
| 10 |
--- |
| 11 |
ChangeLog | 5 +++++ |
| 12 |
gen_compile.sh | 1 + |
| 13 |
patches/mdadm/3.1.4/mdadm-3.1.4-z-now.patch | 26 ++++++++++++++++++++++++++ |
| 14 |
3 files changed, 32 insertions(+), 0 deletions(-) |
| 15 |
|
| 16 |
diff --git a/ChangeLog b/ChangeLog |
| 17 |
index 0f04500..6b00bda 100644 |
| 18 |
--- a/ChangeLog |
| 19 |
+++ b/ChangeLog |
| 20 |
@@ -5,6 +5,11 @@ |
| 21 |
# Distributed under the GPL v2 |
| 22 |
# $Id$ |
| 23 |
|
| 24 |
+ 30 Aug 2011; Sebastian Pipping <sping@g.o> |
| 25 |
+ +patches/mdadm/3.1.4/mdadm-3.1.4-z-now.patch, gen_compile.sh: |
| 26 |
+ Enable patch application for mdadm, add patch to fix compilation (bug |
| 27 |
+ #381089) |
| 28 |
+ |
| 29 |
28 Aug 2011; Fabio Erculiani <lxnay@g.o> defaults/initrd.scripts, |
| 30 |
defaults/linuxrc, doc/genkernel.8.txt: |
| 31 |
Add basic support to AUFS2, requires kernel with aufs module or built-in |
| 32 |
|
| 33 |
diff --git a/gen_compile.sh b/gen_compile.sh |
| 34 |
index ae66ca2..2f8a71a 100755 |
| 35 |
--- a/gen_compile.sh |
| 36 |
+++ b/gen_compile.sh |
| 37 |
@@ -475,6 +475,7 @@ compile_mdadm() { |
| 38 |
gen_die 'MDADM directory ${MDADM_DIR} is invalid!' |
| 39 |
|
| 40 |
cd "${MDADM_DIR}" |
| 41 |
+ apply_patches mdadm ${MDADM_VER} |
| 42 |
sed -i "/^CFLAGS = /s:^CFLAGS = \(.*\)$:CFLAGS = -Os:" Makefile |
| 43 |
sed -i "/^CXFLAGS = /s:^CXFLAGS = \(.*\)$:CXFLAGS = -Os:" Makefile |
| 44 |
sed -i "/^CWFLAGS = /s:^CWFLAGS = \(.*\)$:CWFLAGS = -Wall:" Makefile |
| 45 |
|
| 46 |
diff --git a/patches/mdadm/3.1.4/mdadm-3.1.4-z-now.patch b/patches/mdadm/3.1.4/mdadm-3.1.4-z-now.patch |
| 47 |
new file mode 100644 |
| 48 |
index 0000000..82b0b3e |
| 49 |
--- /dev/null |
| 50 |
+++ b/patches/mdadm/3.1.4/mdadm-3.1.4-z-now.patch |
| 51 |
@@ -0,0 +1,26 @@ |
| 52 |
+From 5296bc73a66e9eee31ba79d26aa02543205a7a26 Mon Sep 17 00:00:00 2001 |
| 53 |
+From: Sebastian Pipping <sebastian@×××××××.org> |
| 54 |
+Date: Tue, 30 Aug 2011 14:38:14 +0200 |
| 55 |
+Subject: [PATCH] Replace "-z now" by "-Wl,-z,now" to fix compilation with GCC |
| 56 |
+ 4.4.5 on Alpha (bug #331653) |
| 57 |
+ |
| 58 |
+--- |
| 59 |
+ Makefile | 2 +- |
| 60 |
+ 1 files changed, 1 insertions(+), 1 deletions(-) |
| 61 |
+ |
| 62 |
+diff --git a/Makefile b/Makefile |
| 63 |
+index e2c65a5..0cc9a87 100644 |
| 64 |
+--- a/Makefile |
| 65 |
++++ b/Makefile |
| 66 |
+@@ -167,7 +167,7 @@ mdmon.O2 : $(MON_SRCS) mdadm.h mdmon.h |
| 67 |
+ |
| 68 |
+ # use '-z now' to guarantee no dynamic linker interactions with the monitor thread |
| 69 |
+ mdmon : $(MON_OBJS) |
| 70 |
+- $(CC) $(LDFLAGS) $(MON_LDFLAGS) -z now -o mdmon $(MON_OBJS) $(LDLIBS) |
| 71 |
++ $(CC) $(LDFLAGS) $(MON_LDFLAGS) -Wl,-z,now -o mdmon $(MON_OBJS) $(LDLIBS) |
| 72 |
+ msg.o: msg.c msg.h |
| 73 |
+ |
| 74 |
+ test_stripe : restripe.c mdadm.h |
| 75 |
+-- |
| 76 |
+1.7.6.1 |
| 77 |
+ |
Archives