Return-Path: Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by mail.openembedded.org (Postfix) with ESMTP id 28E457D5B8 for ; Sun, 7 Apr 2019 00:11:58 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id 10so5402586pfo.5 for ; Sat, 06 Apr 2019 17:11:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=05PBuVtgoU5THi0O52lV1nwMiLdeFNsX9Vt5FNfAPTc=; b=gQvrm4RMbOtdSJFnkhfJKrguWgQpToiwtH2EtPsV3nMNtLQbIfsKyAcE1GidFUUkTS TE2AdTXwDcm/F8mCNMKAQgzCnhKJFWLXZEHkB9flpq3hPqxB2wWqtfpFZBc9n58EliP2 MQwRbZ/P+bNkQSUJpEYE8f2us2Qc7cJih4rTYSqga9MXByogdw2oFU+4xkSs2xoWIQQC fXQJhmxPsf/sIw6KXSrANIuooE5Hls8UFhD3ddBYVJSYDNWb51M9yklNjmGutoAZbdtq 0Q0iOAaYTGrErFMYq+acn47OwWix5niCtX/RPSiXiKSU9YbPe/f89DhzxM9L19x92UDO f8XA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=05PBuVtgoU5THi0O52lV1nwMiLdeFNsX9Vt5FNfAPTc=; b=F7jUMLgE93wboqmneCiLmEHzpLHwp5kzEXvt3YVcv9wi9rh3ROwXhbiXZFL8XHeaub +mhB3GyOBp0+dHg96wPyEyj5GviG9waJYdS/iQbEujrOx0vOY0OOK49OyTFfO2VHNJFU mplxosw6IwnQxZ97Hl662HwHI6WqRL7wDmoY+2Lpcf9wmToh4xirniOeINOZsTwXFRwH QaqdG5zImmr+xCEIJhnJWtRsolwQ4L3cme5ix/GQePJpPQ3jDhotp8rCNV+gC9VP6Ke9 9hOjft+ZK4Ajp+1lBMAfpjRKIUxyhG37QVYWBVYcWHyjTeSUkFo0ZCgn9pLTeIqb1ptT rvAw== X-Gm-Message-State: APjAAAVcjmpcDjkXCgj8m/9Ic6Fuc4+k0jiZf2RD/rpeV2Vu5aTJZSbA z+3HtMCUs5ZIk1T9NumHs2sf4qMNX48= X-Google-Smtp-Source: APXvYqy5YxfxR93VRD6qaXfNoqikA7hB9A6sW9io1dtAYDLslAPJ7GUSKxraw6WNdvI3zT9/Gdz4zg== X-Received: by 2002:a63:2a8f:: with SMTP id q137mr19847069pgq.31.1554595918422; Sat, 06 Apr 2019 17:11:58 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8500:6bc6::8ec8]) by smtp.gmail.com with ESMTPSA id 18sm32691302pfp.18.2019.04.06.17.11.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 06 Apr 2019 17:11:57 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sat, 6 Apr 2019 17:11:50 -0700 Message-Id: <20190407001150.41719-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [PATCH] Revert "mdadm: fix gcc8 maybe-uninitialized/format-overflow warning" 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: , X-List-Received-Date: Sun, 07 Apr 2019 00:11:58 -0000 Content-Transfer-Encoding: 8bit This reverts commit 630281663893cdcfa9c4323b717b415d87d5510f. Signed-off-by: Khem Raj --- ...-uninitialized-format-overflow-warni.patch | 60 ------------------- meta/recipes-extended/mdadm/mdadm_4.1.bb | 1 - 2 files changed, 61 deletions(-) delete mode 100644 meta/recipes-extended/mdadm/files/0001-mdadm-gcc8-maybe-uninitialized-format-overflow-warni.patch diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm-gcc8-maybe-uninitialized-format-overflow-warni.patch b/meta/recipes-extended/mdadm/files/0001-mdadm-gcc8-maybe-uninitialized-format-overflow-warni.patch deleted file mode 100644 index 237f83a87e..0000000000 --- a/meta/recipes-extended/mdadm/files/0001-mdadm-gcc8-maybe-uninitialized-format-overflow-warni.patch +++ /dev/null @@ -1,60 +0,0 @@ -From bf457a83834932ba06de3528b8779a023e73fa7b Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Tue, 12 Mar 2019 16:17:29 +0800 -Subject: [PATCH] mdadm: gcc8 maybe-uninitialized/format-overflow warning - -while compiled with -Werror=maybe-uninitialized/-Werror=format-overflow=, -it failed - -[snip] -| Incremental.c: In function 'Incremental_container': -| Incremental.c:1593:3: error: 'mdfd' may be used uninitialized in this function [-Werror=maybe-uninitialized] -| close(mdfd); -| ^~~~~~~~~~~ - -[snip] -super-intel.c: In function 'apply_takeover_update': -| super-intel.c:9615:15: error: '%d' directive writing between 1 and 11 bytes into a region of size 7 [-Werror=format-overflow=] -| " MISSING_%d", du->index); -| ^~ - -Upstream-Status: Submitted [https://github.com/neilbrown/mdadm/pull/36] - -Signed-off-by: Changqing Li ---- - Incremental.c | 2 +- - super-intel.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Incremental.c b/Incremental.c -index a4ff7d4..b667868 100644 ---- a/Incremental.c -+++ b/Incremental.c -@@ -1500,7 +1500,7 @@ static int Incremental_container(struct supertype *st, char *devname, - return 0; - } - for (ra = list ; ra ; ra = ra->next) { -- int mdfd; -+ int mdfd = 0; - char chosen_name[1024]; - struct map_ent *mp; - struct mddev_ident *match = NULL; -diff --git a/super-intel.c b/super-intel.c -index 10d7218..c3741ea 100644 ---- a/super-intel.c -+++ b/super-intel.c -@@ -9612,9 +9612,9 @@ static int apply_takeover_update(struct imsm_update_takeover *u, - du->major = 0; - du->index = (i * 2) + 1; - sprintf((char *)du->disk.serial, -- " MISSING_%d", du->index); -+ " MISSING_%hu", du->index); - sprintf((char *)du->serial, -- "MISSING_%d", du->index); -+ "MISSING_%hu", du->index); - du->next = super->missing; - super->missing = du; - } --- -2.7.4 - diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb b/meta/recipes-extended/mdadm/mdadm_4.1.bb index 9862a38dc3..947706ff5f 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.1.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb @@ -19,7 +19,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ file://0001-fix-gcc-8-format-truncation-warning.patch \ file://mdadm.init \ file://mdmonitor.service \ - file://0001-mdadm-gcc8-maybe-uninitialized-format-overflow-warni.patch \ " SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598" SRC_URI[sha256sum] = "ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a" -- 2.21.0