diff options
| author | Dexuan Cui <dexuan.cui@intel.com> | 2011-04-19 16:22:07 +0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2011-04-22 22:03:57 -0700 |
| commit | 818b71e7f4190d9fafbbbfa1b68ae1cc99de7c2d (patch) | |
| tree | 9a2f503ee61c73f264e3c10db8b5497d7d9bd142 | |
| parent | f9072234c0e9b9f229762f0cdff53c571c948740 (diff) | |
| download | openembedded-core-818b71e7f4190d9fafbbbfa1b68ae1cc99de7c2d.tar.gz openembedded-core-818b71e7f4190d9fafbbbfa1b68ae1cc99de7c2d.tar.bz2 openembedded-core-818b71e7f4190d9fafbbbfa1b68ae1cc99de7c2d.tar.xz openembedded-core-818b71e7f4190d9fafbbbfa1b68ae1cc99de7c2d.zip | |
mdadm: upgrade from 3.1.4 to the latest version 3.2.1
removed fix-z-now.patch since 3.2.1 has integrated it.
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
| -rw-r--r-- | meta/recipes-extended/mdadm/files/fix-z-now.patch | 15 | ||||
| -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 3cd606b52..000000000 --- a/meta/recipes-extended/mdadm/files/fix-z-now.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fix -z now is really a LD option, not a gcc option so use -Wl to pass it to LD - -Created-by: Saul Wold <saul.wold@intel.com> - ---- Makefile.orig 2010-08-31 13:52:46.277764099 -0700 -+++ Makefile 2010-08-31 14:02:28.218014078 -0700 -@@ -167,7 +167,7 @@ - - # use '-z now' to guarantee no dynamic linker interactions with the monitor thread - mdmon : $(MON_OBJS) -- $(CC) $(LDFLAGS) $(MON_LDFLAGS) -z now -o mdmon $(MON_OBJS) $(LDLIBS) -+ $(CC) $(LDFLAGS) $(MON_LDFLAGS) -Wl,-z,now -o mdmon $(MON_OBJS) $(LDLIBS) - msg.o: msg.c msg.h - - 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 ef62a3f11..937abad84 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 \ file://mdmon.c;beginline=4;endline=18;md5=af7d8444d9c4d3e5c7caac0d9d34039d \ file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161" -PR = "r1" +PR = "r0" -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \ - file://fix-z-now.patch;striplevel=0" +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "0e7dcb5cc4192ae3abd9956bac475576" -SRC_URI[sha256sum] = "849ad0ad4ad3c1d2d8806a16b30e1f59ab2daf313cb103807207f7cba889ea63" +SRC_URI[md5sum] = "d1e2549202bd79d9e99f1498d1109530" +SRC_URI[sha256sum] = "7f68f149c6c0e8893d0b9220ac255b46af08e6a6b81223cab57ed54d628ae125" CFLAGS += "-fno-strict-aliasing" |