From dd125fc30042524079e32027f8be0784f140e379 Mon Sep 17 00:00:00 2001
From: Laurentiu Palcu <laurentiu.palcu@intel.com>
Date: Wed, 16 Oct 2013 16:40:03 +0300
Subject: mdadm: upgrade to 3.3

Refreshed mdadm-3.2.2_fix_for_x32.patch to apply correctly.

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../mdadm/files/mdadm-3.2.2_fix_for_x32.patch      | 11 +++----
 meta/recipes-extended/mdadm/mdadm_3.2.6.bb         | 38 ----------------------
 meta/recipes-extended/mdadm/mdadm_3.3.bb           | 37 +++++++++++++++++++++
 3 files changed, 42 insertions(+), 44 deletions(-)
 delete mode 100644 meta/recipes-extended/mdadm/mdadm_3.2.6.bb
 create mode 100644 meta/recipes-extended/mdadm/mdadm_3.3.bb

(limited to 'meta/recipes-extended/mdadm')

diff --git a/meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch b/meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch
index 58d54f9d0c..3b3db0a7f0 100644
--- a/meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch
+++ b/meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch
@@ -8,17 +8,16 @@ make file, hence making the CC definition in the Makefile conditional.
 
 Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/07
 
-Index: mdadm-3.2.2/Makefile
+Index: mdadm-3.3/Makefile
 ===================================================================
---- mdadm-3.2.2.orig/Makefile
-+++ mdadm-3.2.2/Makefile
-@@ -40,7 +40,8 @@ KLIBC=/home/src/klibc/klibc-0.77
+--- mdadm-3.3.orig/Makefile	2013-09-03 07:47:47.000000000 +0300
++++ mdadm-3.3/Makefile	2013-10-16 16:44:23.542295487 +0300
+@@ -41,7 +41,7 @@
  
  KLIBC_GCC = gcc -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIBC)/linux/include -I$(KLIBC)/klibc/arch/i386/include -I$(KLIBC)/klibc/include/bits32
  
 -CC = $(CROSS_COMPILE)gcc
 +CC ?= $(CROSS_COMPILE)gcc
-+
- CXFLAGS = -ggdb
+ CXFLAGS ?= -ggdb
  CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
  ifdef WARN_UNUSED
diff --git a/meta/recipes-extended/mdadm/mdadm_3.2.6.bb b/meta/recipes-extended/mdadm/mdadm_3.2.6.bb
deleted file mode 100644
index 7b6a6c7fe7..0000000000
--- a/meta/recipes-extended/mdadm/mdadm_3.2.6.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-DESCRIPTION = " A tool for managing Soft RAID under Linux"
-HOMEPAGE = "http://www.kernel.org/pub/linux/utils/raid/mdadm/"
-BUGTRACKER = "n/a"
-
-# Some files are GPLv2+ while others are GPLv2.
-LICENSE = "GPLv2 & GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://mdmon.c;beginline=4;endline=18;md5=af7d8444d9c4d3e5c7caac0d9d34039d \
-                    file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161"
-
-PR = "r0"
-
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \
-	    file://mdadm-3.2.2_fix_for_x32.patch \
-	  "
-
-SRC_URI[md5sum] = "3e255dc71e5144bbcb872788ca647267"
-SRC_URI[sha256sum] = "c44ed3b31238b41cffe67caffaf45067d01e095de94988889ea8a94e22dc6c38"
-
-CFLAGS += "-fno-strict-aliasing"
-
-inherit autotools
-
-# We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header
-do_configure_prepend () {
-	sed -i -e '/.*ansidecl.h.*/d' ${S}/sha1.h
-}
-
-do_compile() {
-	oe_runmake
-}
-
-do_install() {
-	export STRIP=""
-	autotools_do_install
-}
-
-FILES_${PN} += "${base_libdir}/udev/rules.d/*.rules"
diff --git a/meta/recipes-extended/mdadm/mdadm_3.3.bb b/meta/recipes-extended/mdadm/mdadm_3.3.bb
new file mode 100644
index 0000000000..23c9408645
--- /dev/null
+++ b/meta/recipes-extended/mdadm/mdadm_3.3.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = " A tool for managing Soft RAID under Linux"
+HOMEPAGE = "http://www.kernel.org/pub/linux/utils/raid/mdadm/"
+BUGTRACKER = "n/a"
+
+# Some files are GPLv2+ while others are GPLv2.
+LICENSE = "GPLv2 & GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://mdmon.c;beginline=4;endline=18;md5=af7d8444d9c4d3e5c7caac0d9d34039d \
+                    file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161"
+
+
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \
+	    file://mdadm-3.2.2_fix_for_x32.patch \
+	  "
+
+SRC_URI[md5sum] = "8ac04259cdd74b4566c3b6dea9414b57"
+SRC_URI[sha256sum] = "9c07e518bdf3392ebac8874eb686258e10ea3ae0ff7a8acb6d014718a9c3ed45"
+
+CFLAGS += "-fno-strict-aliasing"
+
+inherit autotools
+
+# We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header
+do_configure_prepend () {
+	sed -i -e '/.*ansidecl.h.*/d' ${S}/sha1.h
+}
+
+do_compile() {
+	oe_runmake
+}
+
+do_install() {
+	export STRIP=""
+	autotools_do_install
+}
+
+FILES_${PN} += "${base_libdir}/udev/rules.d/*.rules"
-- 
cgit 1.2.3-korg