summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/mdadm/files
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-10-16 16:40:03 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-26 15:59:11 +0100
commit4525157d979867a4e834568180d8f05b46398bea (patch)
tree5fb78d34015b3539adbf2e196688293ddb7b6db8 /meta/recipes-extended/mdadm/files
parent3347bc49645d2d8623011e3719f68afb9f3f8d90 (diff)
downloadpoky-4525157d979867a4e834568180d8f05b46398bea.tar.gz
mdadm: upgrade to 3.3
Refreshed mdadm-3.2.2_fix_for_x32.patch to apply correctly. (From OE-Core rev: dd125fc30042524079e32027f8be0784f140e379) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/mdadm/files')
-rw-r--r--meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch11
1 files changed, 5 insertions, 6 deletions
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.
8 8
9Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/07 9Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/07
10 10
11Index: mdadm-3.2.2/Makefile 11Index: mdadm-3.3/Makefile
12=================================================================== 12===================================================================
13--- mdadm-3.2.2.orig/Makefile 13--- mdadm-3.3.orig/Makefile 2013-09-03 07:47:47.000000000 +0300
14+++ mdadm-3.2.2/Makefile 14+++ mdadm-3.3/Makefile 2013-10-16 16:44:23.542295487 +0300
15@@ -40,7 +40,8 @@ KLIBC=/home/src/klibc/klibc-0.77 15@@ -41,7 +41,7 @@
16 16
17 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 17 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
18 18
19-CC = $(CROSS_COMPILE)gcc 19-CC = $(CROSS_COMPILE)gcc
20+CC ?= $(CROSS_COMPILE)gcc 20+CC ?= $(CROSS_COMPILE)gcc
21+ 21 CXFLAGS ?= -ggdb
22 CXFLAGS = -ggdb
23 CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter 22 CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
24 ifdef WARN_UNUSED 23 ifdef WARN_UNUSED