From 12190f1779aa5df4e227628139aad60d7b8b9de7 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 8 Mar 2018 20:17:47 +0200 Subject: 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 Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-extended/mdadm/files/gcc-4.9.patch | 12 ++++++------ .../mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'meta/recipes-extended/mdadm') 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 Signed-off-by: Khem Raj Upstream-Status: Pending -Index: mdadm-3.3/super-intel.c +Index: mdadm-4.0/super-intel.c =================================================================== ---- mdadm-3.3.orig/super-intel.c 2014-05-02 15:08:21.154319651 -0700 -+++ mdadm-3.3/super-intel.c 2014-05-02 15:09:31.470985794 -0700 -@@ -5060,7 +5060,7 @@ - spare->cache_size = mpb->cache_size, - spare->pwr_cycle_count = __cpu_to_le32(1), +--- mdadm-4.0.orig/super-intel.c ++++ mdadm-4.0/super-intel.c +@@ -5725,7 +5725,7 @@ static int write_super_imsm_spares(struc + spare->cache_size = mpb->cache_size; + spare->pwr_cycle_count = __cpu_to_le32(1); - snprintf((char *) spare->sig, MAX_SIGNATURE_LENGTH, + (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 Signed-off-by: Aníbal Limón -Index: mdadm-3.3.4/monitor.c +Index: mdadm-4.0/monitor.c =================================================================== ---- mdadm-3.3.4.orig/monitor.c -+++ mdadm-3.3.4/monitor.c -@@ -257,9 +257,12 @@ static int read_and_act(struct active_ar - mdi->curr_state = read_dev_state(mdi->state_fd); - } +--- mdadm-4.0.orig/monitor.c ++++ mdadm-4.0/monitor.c +@@ -445,9 +445,12 @@ static int read_and_act(struct active_ar + if (FD_ISSET(mdi->bb_fd, fds)) + check_for_cleared_bb(a, mdi); } - gettimeofday(&tv, NULL); -- cgit v1.2.3-54-g00ecf