summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-04-08 10:47:32 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-10 13:46:17 +0100
commit4019b0393fcc779743fab3b258d5436d33e3352f (patch)
treec1fd475efe9a88c65dc9daf2441a16ade81c1f68
parent7c915df65f078204d3321420c1f13314794fe2df (diff)
downloadpoky-4019b0393fcc779743fab3b258d5436d33e3352f.tar.gz
Revert "mdadm: fix gcc8 maybe-uninitialized/format-overflow warning"
This patch tried to address a gcc problem when -Og is used, but it did cause regressions on normal compiles when using clang e.g. the real problem is to fix the compiler until then disable the warning in DEBUG_FLAGS This reverts commit 630281663893cdcfa9c4323b717b415d87d5510f. (From OE-Core rev: 949961cdf7d4639da538045dc83c2a354e16ea80) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/mdadm/files/0001-mdadm-gcc8-maybe-uninitialized-format-overflow-warni.patch60
-rw-r--r--meta/recipes-extended/mdadm/mdadm_4.1.bb1
2 files changed, 0 insertions, 61 deletions
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 @@
1From bf457a83834932ba06de3528b8779a023e73fa7b Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Tue, 12 Mar 2019 16:17:29 +0800
4Subject: [PATCH] mdadm: gcc8 maybe-uninitialized/format-overflow warning
5
6while compiled with -Werror=maybe-uninitialized/-Werror=format-overflow=,
7it failed
8
9[snip]
10| Incremental.c: In function 'Incremental_container':
11| Incremental.c:1593:3: error: 'mdfd' may be used uninitialized in this function [-Werror=maybe-uninitialized]
12| close(mdfd);
13| ^~~~~~~~~~~
14
15[snip]
16super-intel.c: In function 'apply_takeover_update':
17| super-intel.c:9615:15: error: '%d' directive writing between 1 and 11 bytes into a region of size 7 [-Werror=format-overflow=]
18| " MISSING_%d", du->index);
19| ^~
20
21Upstream-Status: Submitted [https://github.com/neilbrown/mdadm/pull/36]
22
23Signed-off-by: Changqing Li <changqing.li@windriver.com>
24---
25 Incremental.c | 2 +-
26 super-intel.c | 4 ++--
27 2 files changed, 3 insertions(+), 3 deletions(-)
28
29diff --git a/Incremental.c b/Incremental.c
30index a4ff7d4..b667868 100644
31--- a/Incremental.c
32+++ b/Incremental.c
33@@ -1500,7 +1500,7 @@ static int Incremental_container(struct supertype *st, char *devname,
34 return 0;
35 }
36 for (ra = list ; ra ; ra = ra->next) {
37- int mdfd;
38+ int mdfd = 0;
39 char chosen_name[1024];
40 struct map_ent *mp;
41 struct mddev_ident *match = NULL;
42diff --git a/super-intel.c b/super-intel.c
43index 10d7218..c3741ea 100644
44--- a/super-intel.c
45+++ b/super-intel.c
46@@ -9612,9 +9612,9 @@ static int apply_takeover_update(struct imsm_update_takeover *u,
47 du->major = 0;
48 du->index = (i * 2) + 1;
49 sprintf((char *)du->disk.serial,
50- " MISSING_%d", du->index);
51+ " MISSING_%hu", du->index);
52 sprintf((char *)du->serial,
53- "MISSING_%d", du->index);
54+ "MISSING_%hu", du->index);
55 du->next = super->missing;
56 super->missing = du;
57 }
58--
592.7.4
60
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 \
19 file://0001-fix-gcc-8-format-truncation-warning.patch \ 19 file://0001-fix-gcc-8-format-truncation-warning.patch \
20 file://mdadm.init \ 20 file://mdadm.init \
21 file://mdmonitor.service \ 21 file://mdmonitor.service \
22 file://0001-mdadm-gcc8-maybe-uninitialized-format-overflow-warni.patch \
23 " 22 "
24SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598" 23SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598"
25SRC_URI[sha256sum] = "ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a" 24SRC_URI[sha256sum] = "ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a"