summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-08 20:17:47 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-09 09:17:03 -0800
commit12190f1779aa5df4e227628139aad60d7b8b9de7 (patch)
treef4900e2c3ddbc8b869f3318cb7c860b96689caef
parent712b3c172e9373b127a70cce01619a4293c0f321 (diff)
downloadpoky-12190f1779aa5df4e227628139aad60d7b8b9de7.tar.gz
mdadm: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: 3c3f76677759156b8cd87659fb4fefb46eb87d13) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/mdadm/files/gcc-4.9.patch12
-rw-r--r--meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch12
2 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-extended/mdadm/files/gcc-4.9.patch b/meta/recipes-extended/mdadm/files/gcc-4.9.patch
index 54bf1d79ab..df21399deb 100644
--- a/meta/recipes-extended/mdadm/files/gcc-4.9.patch
+++ b/meta/recipes-extended/mdadm/files/gcc-4.9.patch
@@ -7,13 +7,13 @@ make: *** [super-intel.o] Error 1
7Signed-off-by: Khem Raj <raj.khem@gmail.com> 7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8Upstream-Status: Pending 8Upstream-Status: Pending
9 9
10Index: mdadm-3.3/super-intel.c 10Index: mdadm-4.0/super-intel.c
11=================================================================== 11===================================================================
12--- mdadm-3.3.orig/super-intel.c 2014-05-02 15:08:21.154319651 -0700 12--- mdadm-4.0.orig/super-intel.c
13+++ mdadm-3.3/super-intel.c 2014-05-02 15:09:31.470985794 -0700 13+++ mdadm-4.0/super-intel.c
14@@ -5060,7 +5060,7 @@ 14@@ -5725,7 +5725,7 @@ static int write_super_imsm_spares(struc
15 spare->cache_size = mpb->cache_size, 15 spare->cache_size = mpb->cache_size;
16 spare->pwr_cycle_count = __cpu_to_le32(1), 16 spare->pwr_cycle_count = __cpu_to_le32(1);
17 17
18- snprintf((char *) spare->sig, MAX_SIGNATURE_LENGTH, 18- snprintf((char *) spare->sig, MAX_SIGNATURE_LENGTH,
19+ (void)snprintf((char *) spare->sig, MAX_SIGNATURE_LENGTH, 19+ (void)snprintf((char *) spare->sig, MAX_SIGNATURE_LENGTH,
diff --git a/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch b/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
index c656d073e3..00e6657e09 100644
--- a/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
+++ b/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
@@ -5,13 +5,13 @@ Upstream-Status: Pending
5 5
6Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> 6Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
7 7
8Index: mdadm-3.3.4/monitor.c 8Index: mdadm-4.0/monitor.c
9=================================================================== 9===================================================================
10--- mdadm-3.3.4.orig/monitor.c 10--- mdadm-4.0.orig/monitor.c
11+++ mdadm-3.3.4/monitor.c 11+++ mdadm-4.0/monitor.c
12@@ -257,9 +257,12 @@ static int read_and_act(struct active_ar 12@@ -445,9 +445,12 @@ static int read_and_act(struct active_ar
13 mdi->curr_state = read_dev_state(mdi->state_fd); 13 if (FD_ISSET(mdi->bb_fd, fds))
14 } 14 check_for_cleared_bb(a, mdi);
15 } 15 }
16- 16-
17 gettimeofday(&tv, NULL); 17 gettimeofday(&tv, NULL);