summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/mdadm/files/fix-z-now.patch15
-rw-r--r--meta/recipes-extended/mdadm/mdadm_3.2.1.bb (renamed from meta/recipes-extended/mdadm/mdadm_3.1.4.bb)9
2 files changed, 4 insertions, 20 deletions
diff --git a/meta/recipes-extended/mdadm/files/fix-z-now.patch b/meta/recipes-extended/mdadm/files/fix-z-now.patch
deleted file mode 100644
index 3cd606b528..0000000000
--- a/meta/recipes-extended/mdadm/files/fix-z-now.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Fix -z now is really a LD option, not a gcc option so use -Wl to pass it to LD
2
3Created-by: Saul Wold <saul.wold@intel.com>
4
5--- Makefile.orig 2010-08-31 13:52:46.277764099 -0700
6+++ Makefile 2010-08-31 14:02:28.218014078 -0700
7@@ -167,7 +167,7 @@
8
9 # use '-z now' to guarantee no dynamic linker interactions with the monitor thread
10 mdmon : $(MON_OBJS)
11- $(CC) $(LDFLAGS) $(MON_LDFLAGS) -z now -o mdmon $(MON_OBJS) $(LDLIBS)
12+ $(CC) $(LDFLAGS) $(MON_LDFLAGS) -Wl,-z,now -o mdmon $(MON_OBJS) $(LDLIBS)
13 msg.o: msg.c msg.h
14
15 test_stripe : restripe.c mdadm.h
diff --git a/meta/recipes-extended/mdadm/mdadm_3.1.4.bb b/meta/recipes-extended/mdadm/mdadm_3.2.1.bb
index ef62a3f118..937abad845 100644
--- a/meta/recipes-extended/mdadm/mdadm_3.1.4.bb
+++ b/meta/recipes-extended/mdadm/mdadm_3.2.1.bb
@@ -8,13 +8,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
8 file://mdmon.c;beginline=4;endline=18;md5=af7d8444d9c4d3e5c7caac0d9d34039d \ 8 file://mdmon.c;beginline=4;endline=18;md5=af7d8444d9c4d3e5c7caac0d9d34039d \
9 file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161" 9 file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161"
10 10
11PR = "r1" 11PR = "r0"
12 12
13SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \ 13SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2"
14 file://fix-z-now.patch;striplevel=0"
15 14
16SRC_URI[md5sum] = "0e7dcb5cc4192ae3abd9956bac475576" 15SRC_URI[md5sum] = "d1e2549202bd79d9e99f1498d1109530"
17SRC_URI[sha256sum] = "849ad0ad4ad3c1d2d8806a16b30e1f59ab2daf313cb103807207f7cba889ea63" 16SRC_URI[sha256sum] = "7f68f149c6c0e8893d0b9220ac255b46af08e6a6b81223cab57ed54d628ae125"
18 17
19CFLAGS += "-fno-strict-aliasing" 18CFLAGS += "-fno-strict-aliasing"
20 19