diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2019-04-08 10:47:32 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-10 13:46:08 +0100 |
| commit | 949961cdf7d4639da538045dc83c2a354e16ea80 (patch) | |
| tree | e7294c0b281a000943a9e56b0b1e09458a3fd2e1 /meta/recipes-extended/mdadm | |
| parent | 9251cec30ff77b526363bed7299238e33b68feb4 (diff) | |
| download | openembedded-core-contrib-949961cdf7d4639da538045dc83c2a354e16ea80.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.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/mdadm')
| -rw-r--r-- | meta/recipes-extended/mdadm/files/0001-mdadm-gcc8-maybe-uninitialized-format-overflow-warni.patch | 60 | ||||
| -rw-r--r-- | meta/recipes-extended/mdadm/mdadm_4.1.bb | 1 |
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 @@ -From bf457a83834932ba06de3528b8779a023e73fa7b Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -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 <changqing.li@windriver.com> ---- - 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" |