diff options
-rw-r--r-- | meta/recipes-extended/mdadm/files/gcc-4.9.patch | 22 | ||||
-rw-r--r-- | meta/recipes-extended/mdadm/mdadm_3.3.bb | 3 |
2 files changed, 24 insertions, 1 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/mdadm_3.3.bb b/meta/recipes-extended/mdadm/mdadm_3.3.bb index 5ef418e170..40d68d6664 100644 --- a/meta/recipes-extended/mdadm/mdadm_3.3.bb +++ b/meta/recipes-extended/mdadm/mdadm_3.3.bb | |||
@@ -9,7 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | |||
9 | 9 | ||
10 | 10 | ||
11 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \ | 11 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \ |
12 | file://mdadm-3.2.2_fix_for_x32.patch \ | 12 | file://mdadm-3.2.2_fix_for_x32.patch \ |
13 | file://gcc-4.9.patch \ | ||
13 | " | 14 | " |
14 | 15 | ||
15 | SRC_URI[md5sum] = "8ac04259cdd74b4566c3b6dea9414b57" | 16 | SRC_URI[md5sum] = "8ac04259cdd74b4566c3b6dea9414b57" |