From patchwork Thu Mar 8 18:17:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131057 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp53303lja; Thu, 8 Mar 2018 10:28:03 -0800 (PST) X-Google-Smtp-Source: AG47ELsbBWgxCf7bTywqjaiFYisfV+Ny+TnKn2yq1B6Kx3ffjtTyYBQ6kdceXi94daGdMOcYqUuN X-Received: by 2002:a17:902:76cb:: with SMTP id j11-v6mr24972065plt.431.1520533683111; Thu, 08 Mar 2018 10:28:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533683; cv=none; d=google.com; s=arc-20160816; b=Bhey91IIWExRLbED7hV9nbmIWifNR8dc7pH3HVFL/tfJpbZYMP+88TIY5ZbAENXIbZ 3dtMHiQ9qmCiuZ0h4k/Bd2uTUP9rp7NVTmICQiwjm/UW6eaaq4VsHVDHZaAq2Op0M+wW +6BcrBgzj/oxu2wBFs7t09tZyVaGJaDgZwYsaIKiPAiauNQISi8Rm9l/hLrLbZTkjKsz jHvRX3YM5YUGAuXUkWpDL5+B+0CeGsAEhoHWfenyxNbPNhJ6Pk9PF5vvlVcReh0X6ymT 8FaXJxGeF7ykO4PyN7Ajk5Pn02roPRpHn9PsS1yYDBUuS+cqg+lIjFKWsiUhVLEOHUn3 DRGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :delivered-to:arc-authentication-results; bh=uq56mfEhIDkaisISN7cOU/HOZkHZaho2ZDo7fREyz38=; b=MKYqJHP4tr/zggCTC46u1dFCRK2xfQzEnQLk/+GWHR1iGTkXDJa8hWU411yuC+6JIv 9oRyj9RAJwb8YxcMDlpUDfsudSMehtWTQl/ryELds3pIsdXWCmvAhsnEbsRJUoNz6Zsz aQauZpKM/NEsqJ9MtBXKHc6BPfXeNvDnXldyvU/Twscl02U8e7+8InADecCAsLopSI7h lAmfRMrMi5ArG/wzTLW0IGJZkVgG9KGmNoRAGtvr3ROKLq/eS1SFCtAuea8tQkiVbTFc 6uLgni4ylOQnBgFgWJluDBux26Grc0tnofQczt/6bVkZX6HFQuol4ay3BVLE6Od4B2XU DYLg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id z3si13246219pgp.788.2018.03.08.10.28.02; Thu, 08 Mar 2018 10:28:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 913FB78A26; Thu, 8 Mar 2018 18:25:35 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id E2AAA789CE for ; Thu, 8 Mar 2018 18:25:19 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053960" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:20 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:47 +0200 Message-Id: <20180308181804.31261-25-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 25/42] mdadm: refresh patches X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Ross Burton 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. Signed-off-by: Ross Burton Signed-off-by: Alexander Kanavin --- 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(-) diff --git a/meta/recipes-extended/mdadm/files/gcc-4.9.patch b/meta/recipes-extended/mdadm/files/gcc-4.9.patch index 54bf1d79ab7..df21399deb2 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 c656d073e37..00e6657e091 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);