diff options
Diffstat (limited to 'meta/recipes-extended/mdadm/files')
-rw-r--r-- | meta/recipes-extended/mdadm/files/gcc-4.9.patch | 22 | ||||
-rw-r--r-- | meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch | 23 |
2 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-extended/mdadm/files/gcc-4.9.patch b/meta/recipes-extended/mdadm/files/gcc-4.9.patch new file mode 100644 index 0000000000..54bf1d79ab --- /dev/null +++ b/meta/recipes-extended/mdadm/files/gcc-4.9.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | super-intel.c:5063:2: error: right-hand operand of comma expression has no effect [-Werror=unused-value] | ||
2 | snprintf((char *) spare->sig, MAX_SIGNATURE_LENGTH, | ||
3 | ^ | ||
4 | cc1: all warnings being treated as errors | ||
5 | make: *** [super-intel.o] Error 1 | ||
6 | |||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Index: mdadm-3.3/super-intel.c | ||
11 | =================================================================== | ||
12 | --- mdadm-3.3.orig/super-intel.c 2014-05-02 15:08:21.154319651 -0700 | ||
13 | +++ mdadm-3.3/super-intel.c 2014-05-02 15:09:31.470985794 -0700 | ||
14 | @@ -5060,7 +5060,7 @@ | ||
15 | spare->cache_size = mpb->cache_size, | ||
16 | spare->pwr_cycle_count = __cpu_to_le32(1), | ||
17 | |||
18 | - snprintf((char *) spare->sig, MAX_SIGNATURE_LENGTH, | ||
19 | + (void)snprintf((char *) spare->sig, MAX_SIGNATURE_LENGTH, | ||
20 | MPB_SIGNATURE MPB_VERSION_RAID0); | ||
21 | |||
22 | for (d = super->disks; d; d = d->next) { | ||
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 new file mode 100644 index 0000000000..3b3db0a7f0 --- /dev/null +++ b/meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | Upstream-Status: pending | ||
2 | |||
3 | By hardcoding CC's definition in the Makefile, all the gcc parameters | ||
4 | set by tune settings are lost. Causing compile failure with x32 toolchain | ||
5 | |||
6 | As the bitbake defined CC is good, there is no need to redfine CC in the | ||
7 | make file, hence making the CC definition in the Makefile conditional. | ||
8 | |||
9 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/07 | ||
10 | |||
11 | Index: mdadm-3.3/Makefile | ||
12 | =================================================================== | ||
13 | --- mdadm-3.3.orig/Makefile 2013-09-03 07:47:47.000000000 +0300 | ||
14 | +++ mdadm-3.3/Makefile 2013-10-16 16:44:23.542295487 +0300 | ||
15 | @@ -41,7 +41,7 @@ | ||
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 | ||
18 | |||
19 | -CC = $(CROSS_COMPILE)gcc | ||
20 | +CC ?= $(CROSS_COMPILE)gcc | ||
21 | CXFLAGS ?= -ggdb | ||
22 | CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter | ||
23 | ifdef WARN_UNUSED | ||