mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

mdadm: Drop redundant patches and fix build with clang

Browse Source 
Several patches were being applied unnecessarily, the purpose they
served at one point has either been fixed differently, or accepted
upstream.

Add a new patch to make clang's diagnostics happy

(From OE-Core rev: 8bc0d2f2197430723f8b2d0785169e48c883eedb)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2018-12-08 12:56:02 -08:00
committed by Richard Purdie
parent 55553c2477
commit d47e89f338
6 changed files with 40 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
meta/recipes-extended/mdadm/files/0001-Compute-abs-diff-in-a-standard-compliant-way.patch Normal file
View File

@@ -0,0 +1,31 @@
From b273e892bd6aaafe448f84356abb78a6d463e784 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Dec 2018 17:22:39 -0800
Subject: [PATCH] Compute abs diff in a standard compliant way
This make it a bit less implementation defined and silences clang
warning -Wabsolute-value
| super-intel.c:2822:20: error: taking the absolute value of unsigned type 'unsi
gned long long' has no effect [-Werror,-Wabsolute-value]
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
super-intel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/super-intel.c b/super-intel.c
index 6438987..10d7218 100644
--- a/super-intel.c
+++ b/super-intel.c
@@ -2819,7 +2819,7 @@ static unsigned long long calc_component_size(struct imsm_map *map,
* 2048 blocks per each device. If the difference is higher it means
* that array size was expanded and num_data_stripes was not updated.
*/
- if ((unsigned int)abs(calc_dev_size - dev_size) >
+ if ((unsigned int)abs((int)calc_dev_size - (int)dev_size) >
(1 << SECT_PER_MB_SHIFT) * member_disks) {
component_size = dev_size / member_disks;
dprintf("Invalid num_data_stripes in metadata; expected=%llu, found=%llu\n",

152
meta/recipes-extended/mdadm/files/0001-Disable-gcc8-warnings.patch
View File

@@ -1,152 +0,0 @@
From a6c991750ae6ebd87a0b9b243bec7fd8e5a064c5 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 9 May 2018 12:56:41 -0700
Subject: [PATCH] Disable gcc8 warnings
This is needed until
https://bugzilla.redhat.com/show_bug.cgi?id=1553958
Fix super0.c issue which is triggered only in DEBUG_BUILD with -O1 (or any
configuration without -ftree-vrp or with -fno-tree-vrp)
super0.c: In function 'examine_super0':
super0.c:238:32: error: 'snprintf' output may be truncated before the last format character [-Werror=format-truncation=]
snprintf(nb, sizeof(nb), "%4d", d);
^
Upstream-Status: Inappropriate [Workaround]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Monitor.c | 4 +++-
mdopen.c | 4 ++++
super-ddf.c | 4 ++++
super-intel.c | 6 ++++++
super0.c | 2 +-
super1.c | 5 +++++
6 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/Monitor.c b/Monitor.c
index 036103f..08cbd0a 100644
--- a/Monitor.c
+++ b/Monitor.c
@@ -445,7 +445,8 @@ static void alert(char *event, char *dev, char *disc, struct alert_info *info)
event, dev);
}
}
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-truncation"
static int check_array(struct state *st, struct mdstat_ent *mdstat,
int test, struct alert_info *ainfo,
int increments, char *prefer)
@@ -673,6 +674,7 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
st->err++;
goto out;
}
+#pragma GCC diagnostic pop
static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist,
int test, struct alert_info *info)
diff --git a/mdopen.c b/mdopen.c
index 98c54e4..4f72b69 100644
--- a/mdopen.c
+++ b/mdopen.c
@@ -26,6 +26,9 @@
#include "md_p.h"
#include <ctype.h>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-truncation"
+
void make_parts(char *dev, int cnt)
{
/* make 'cnt' partition devices for 'dev'
@@ -101,6 +104,7 @@ void make_parts(char *dev, int cnt)
}
free(name);
}
+#pragma GCC diagnostic pop
int create_named_array(char *devnm)
{
diff --git a/super-ddf.c b/super-ddf.c
index 618542c..6ed4e7e 100644
--- a/super-ddf.c
+++ b/super-ddf.c
@@ -2828,6 +2828,9 @@ static void _set_config_size(struct phys_disk_entry *pde, const struct dl *dl)
(unsigned long long)cfs, (unsigned long long)(dl->size-cfs));
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-overflow"
+
/* Add a device to a container, either while creating it or while
* expanding a pre-existing container
*/
@@ -2964,6 +2967,7 @@ static int add_to_super_ddf(struct supertype *st,
return 0;
}
+#pragma GCC diagnostic pop
static int remove_from_super_ddf(struct supertype *st, mdu_disk_info_t *dk)
{
diff --git a/super-intel.c b/super-intel.c
index 1bc4b80..39d0e92 100644
--- a/super-intel.c
+++ b/super-intel.c
@@ -333,6 +333,11 @@ struct md_list {
};
#define pr_vrb(fmt, arg...) (void) (verbose && pr_err(fmt, ##arg))
+#pragma GCC diagnostic push
+# if __GNUC__ == 8
+# pragma GCC diagnostic ignored "-Wstringop-truncation"
+# endif
+#pragma GCC diagnostic ignored "-Wformat-truncation"
static __u8 migr_type(struct imsm_dev *dev)
{
@@ -12208,3 +12213,4 @@ struct superswitch super_imsm = {
.clear_bad_block = imsm_clear_badblock,
.get_bad_blocks = imsm_get_badblocks,
};
+#pragma GCC diagnostic pop
diff --git a/super0.c b/super0.c
index 42989b9..f5e8031 100644
--- a/super0.c
+++ b/super0.c
@@ -229,7 +229,7 @@ static void examine_super0(struct supertype *st, char *homehost)
d++) {
mdp_disk_t *dp;
char *dv;
- char nb[11];
+ char nb[12];
int wonly, failfast;
if (d>=0) dp = &sb->disks[d];
else dp = &sb->this_disk;
diff --git a/super1.c b/super1.c
index 636a286..f894cbb 100644
--- a/super1.c
+++ b/super1.c
@@ -1176,6 +1176,10 @@ static struct mdinfo *container_content1(struct supertype *st, char *subarray)
return info;
}
+#pragma GCC diagnostic push
+# if __GNUC__ == 8
+# pragma GCC diagnostic ignored "-Wstringop-truncation"
+#endif
static int update_super1(struct supertype *st, struct mdinfo *info,
char *update, char *devname, int verbose,
int uuid_set, char *homehost)
@@ -1641,6 +1645,7 @@ static int init_super1(struct supertype *st, mdu_array_info_t *info,
return 1;
}
+#pragma GCC diagnostic pop
struct devinfo {
int fd;

44
meta/recipes-extended/mdadm/files/0001-include-sys-sysmacros.h-for-major-minor-defintions.patch
View File

@@ -1,44 +0,0 @@
From 714f2262960a7fe9e8f973629ed214023e144590 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 18 Dec 2016 08:30:51 +0000
Subject: [PATCH] include <sys/sysmacros.h> for major/minor defintions
glibc 2.25 is warning about it if applications depend on
sys/types.h for these macros, it expects to be included
from <sys/sysmacros.h>
Fixes
| Grow.c:3534:13: error: In the GNU C Library, "minor" is defined
| by <sys/sysmacros.h>. For historical compatibility, it is
| currently defined by <sys/types.h> as well, but we plan to
| remove this soon. To use "minor", include <sys/sysmacros.h>
| directly. If you did not intend to use a system-defined macro
| "minor", you should undefine it after including <sys/types.h>. [-Werror]
| Query.c: In function 'Query':
| Query.c:105:13: error: In the GNU C Library, "makedev" is defined
| by <sys/sysmacros.h>. For historical compatibility, it is
| currently defined by <sys/types.h> as well, but we plan to
| remove this soon. To use "makedev", include <sys/sysmacros.h>
| directly. If you did not intend to use a system-defined macro
| "makedev", you should undefine it after including <sys/types.h>. [-Werror]
| makedev((unsigned)disc.major,(unsigned)disc.minor) == stb.st_rdev)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
---
mdadm.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/mdadm.h b/mdadm.h
index bb943bf..79c44c6 100644
--- a/mdadm.h
+++ b/mdadm.h
@@ -34,6 +34,7 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
#endif
#include <sys/types.h>
+#include <sys/sysmacros.h>
#include <sys/stat.h>
#include <stdint.h>
#include <stdlib.h>

124
meta/recipes-extended/mdadm/files/0005-Add-a-comment-to-indicate-valid-fallthrough.patch
View File

@@ -1,124 +0,0 @@
From 0c2c8ae6b3a1fb0f611f9795953a7a6ed06be38d Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 19 Apr 2017 12:04:15 -0700
Subject: [PATCH] Add a comment to indicate valid fallthrough
gcc7 warns about code with fallthroughs, this patch adds
the comment to indicate a valid fallthrough, helps gcc7
compiler warnings
This works in cross and native compilation case
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Submitted
---
Grow.c | 4 ++++
bitmap.c | 8 ++++++++
mdadm.c | 2 ++
super-intel.c | 1 +
util.c | 1 +
5 files changed, 16 insertions(+)
diff --git a/Grow.c b/Grow.c
index 4436a4d..b3116e2 100644
--- a/Grow.c
+++ b/Grow.c
@@ -1447,6 +1447,7 @@ char *analyse_change(char *devname, struct mdinfo *info, struct reshape *re)
switch (info->new_level) {
case 4:
delta_parity = 1;
+ /* fallthrough */
case 0:
re->level = 4;
re->before.layout = 0;
@@ -1474,10 +1475,12 @@ char *analyse_change(char *devname, struct mdinfo *info, struct reshape *re)
case 4:
info->array.layout = ALGORITHM_PARITY_N;
+ /* fallthrough */
case 5:
switch (info->new_level) {
case 0:
delta_parity = -1;
+ /* fallthrough */
case 4:
re->level = info->array.level;
re->before.data_disks = info->array.raid_disks - 1;
@@ -1533,6 +1536,7 @@ char *analyse_change(char *devname, struct mdinfo *info, struct reshape *re)
case 4:
case 5:
delta_parity = -1;
+ /* fallthrough */
case 6:
re->level = 6;
re->before.data_disks = info->array.raid_disks - 2;
diff --git a/bitmap.c b/bitmap.c
index e38cb96..10af328 100644
--- a/bitmap.c
+++ b/bitmap.c
@@ -82,13 +82,21 @@ static inline int count_dirty_bits_byte(char byte, int num_bits)
switch (num_bits) { /* fall through... */
case 8: if (byte & 128) num++;
+ /* fallthrough */
case 7: if (byte & 64) num++;
+ /* fallthrough */
case 6: if (byte & 32) num++;
+ /* fallthrough */
case 5: if (byte & 16) num++;
+ /* fallthrough */
case 4: if (byte & 8) num++;
+ /* fallthrough */
case 3: if (byte & 4) num++;
+ /* fallthrough */
case 2: if (byte & 2) num++;
+ /* fallthrough */
case 1: if (byte & 1) num++;
+ /* fallthrough */
default: break;
}
diff --git a/mdadm.c b/mdadm.c
index 25a1abd..9843bc5 100644
--- a/mdadm.c
+++ b/mdadm.c
@@ -155,6 +155,7 @@ int main(int argc, char *argv[])
mode == CREATE || mode == GROW ||
mode == INCREMENTAL || mode == MANAGE)
break; /* b means bitmap */
+ /* fallthrough */
case Brief:
c.brief = 1;
continue;
@@ -839,6 +840,7 @@ int main(int argc, char *argv[])
case O(INCREMENTAL,NoDegraded):
pr_err("--no-degraded is deprecated in Incremental mode\n");
+ /* fallthrough */
case O(ASSEMBLE,NoDegraded): /* --no-degraded */
c.runstop = -1; /* --stop isn't allowed for --assemble,
* so we overload slightly */
diff --git a/super-intel.c b/super-intel.c
index e726987..1bc4b80 100644
--- a/super-intel.c
+++ b/super-intel.c
@@ -3425,6 +3425,7 @@ static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info,
}
}
+ /* fallthrough */
case MIGR_VERIFY:
/* we could emulate the checkpointing of
* 'sync_action=check' migrations, but for now
diff --git a/util.c b/util.c
index c26cf5f..61cbe23 100644
--- a/util.c
+++ b/util.c
@@ -400,6 +400,7 @@ unsigned long long parse_size(char *size)
switch (*c) {
case 'K':
c++;
+ /* fallthrough */
default:
s *= 2;
break;

31
meta/recipes-extended/mdadm/files/gcc-4.9.patch
View File

@@ -1,31 +0,0 @@
From 8804bca3de1b79a7c579783b7e3a7603f43bbb48 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 2 May 2014 16:31:17 -0700
Subject: [PATCH] mdadm: Fix build on gcc 4.9
super-intel.c:5063:2: error: right-hand operand of comma expression has no effect [-Werror=unused-value]
snprintf((char *) spare->sig, MAX_SIGNATURE_LENGTH,
^
cc1: all warnings being treated as errors
make: *** [super-intel.o] Error 1
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
---
super-intel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/super-intel.c b/super-intel.c
index 6438987..e726987 100644
--- a/super-intel.c
+++ b/super-intel.c
@@ -5941,7 +5941,7 @@ static int write_super_imsm_spares(struct intel_super *super, int doclose)
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,
MPB_SIGNATURE MPB_VERSION_RAID0);
for (d = super->disks; d; d = d->next) {

20
meta/recipes-extended/mdadm/mdadm_4.1.bb
View File

@@ -9,24 +9,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
file://gcc-4.9.patch \
file://run-ptest \
file://mdadm-3.3.2_x32_abi_time_t.patch \
file://mdadm-fix-ptest-build-errors.patch \
file://0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch \
file://run-ptest \
file://0001-mdadm.h-Undefine-dprintf-before-redefining.patch \
file://0001-include-sys-sysmacros.h-for-major-minor-defintions.patch \
file://0005-Add-a-comment-to-indicate-valid-fallthrough.patch \
file://0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch \
file://0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch \
file://0001-Disable-gcc8-warnings.patch \
file://0001-Compute-abs-diff-in-a-standard-compliant-way.patch \
"
SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598"
SRC_URI[sha256sum] = "ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a"
CFLAGS += "-fno-strict-aliasing"
inherit autotools-brokensep
inherit autotools-brokensep ptest
CFLAGS_append_toolchain-clang = " -Wno-error=address-of-packed-member"
EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}"'
# PPC64 and MIPS64 uses long long for u64 in the kernel, but powerpc's asm/types.h
# prevents 64-bit userland from seeing this definition, instead defaulting
# to u64 == long in userspace. Define __SANE_USERSPACE_TYPES__ to get
@@ -35,6 +32,8 @@ CFLAGS_append_powerpc64 = ' -D__SANE_USERSPACE_TYPES__'
CFLAGS_append_mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__'
CFLAGS_append_mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__'
EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}"'
do_compile() {
# Point to right sbindir
sed -i -e "s;BINDIR = /sbin;BINDIR = $base_sbindir;" -e "s;UDEVDIR = /lib;UDEVDIR = $nonarch_base_libdir;" ${S}/Makefile
@@ -46,8 +45,6 @@ do_install() {
autotools_do_install
}
inherit ptest
do_compile_ptest() {
oe_runmake test
}
@@ -62,6 +59,7 @@ do_install_ptest() {
install -D -m 755 $prg ${D}${PTEST_PATH}/
done
}
RDEPENDS_${PN}-ptest += "bash"
RRECOMMENDS_${PN}-ptest += " \
coreutils \