mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
mdadm: update 4.1 -> 4.2
Drop 0001-Compute-abs-diff-in-a-standard-compliant-way.patch (upstream refactored code) mdadm-fix-ptest-build-errors.patch (upstream fixed the issue) (From OE-Core rev: acf82e36996c082f52c02d50b06965f74ef87430) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
633b403b6d
commit
b93bd0e85e
@@ -1,6 +1,7 @@
|
||||
SUMMARY = "An image used during oe-selftest tests"
|
||||
|
||||
IMAGE_INSTALL = "packagegroup-core-boot dropbear"
|
||||
# libudev is needed for deploy mdadm via devtool
|
||||
IMAGE_INSTALL = "packagegroup-core-boot dropbear libudev"
|
||||
IMAGE_FEATURES = "debug-tweaks"
|
||||
|
||||
IMAGE_LINGUAS = " "
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
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",
|
||||
@@ -1,5 +1,7 @@
|
||||
From: martin f. krafft <madduck@debian.org>
|
||||
Subject: Remove -Werror from compiler flags
|
||||
From adb75f0bdec97dbe4aa15cc988d349775f7995ff Mon Sep 17 00:00:00 2001
|
||||
From: "martin f. krafft" <madduck@debian.org>
|
||||
Date: Mon, 3 Jan 2022 19:14:12 +0000
|
||||
Subject: [PATCH] Remove -Werror from compiler flags
|
||||
|
||||
-Werror seems like a bad idea on released/packaged code because a toolchain
|
||||
update (introducing new warnings) could break the build. We'll let upstream
|
||||
@@ -8,15 +10,18 @@ use it to beautify the code, but remove it for out builds.
|
||||
Signed-off-by: martin f. krafft <madduck@debian.org>
|
||||
|
||||
Upstream-Status: Pending
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 716c97c..40354ea 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -48,7 +48,7 @@ endif
|
||||
|
||||
CC ?= $(CROSS_COMPILE)gcc
|
||||
@@ -50,7 +50,7 @@ ifeq ($(origin CC),default)
|
||||
CC := $(CROSS_COMPILE)gcc
|
||||
endif
|
||||
CXFLAGS ?= -ggdb
|
||||
-CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
|
||||
+CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
From 911f6ea9be0c334885aeff66853b111cbd4066df Mon Sep 17 00:00:00 2001
|
||||
From: "Maxin B. John" <maxin.john@intel.com>
|
||||
Date: Wed, 10 Feb 2016 17:28:05 +0200
|
||||
Subject: [PATCH] mdadm-fix-ptest-build-errors
|
||||
|
||||
builds fail with ptest enabled:
|
||||
|
||||
| restripe.c: In function 'test_stripes':
|
||||
| restripe.c:845:4: error: ignoring return value of 'read', declared with
|
||||
| attribute warn_unused_result [-Werror=unused-result]
|
||||
| read(source[i], stripes[i], chunk_size);
|
||||
| ^
|
||||
| cc1: all warnings being treated as errors
|
||||
| Makefile:214: recipe for target 'test_stripe' failed
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Maxin B. John <maxin.john@intel.com>
|
||||
|
||||
---
|
||||
restripe.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/restripe.c b/restripe.c
|
||||
index 31b07e8..592ba5d 100644
|
||||
--- a/restripe.c
|
||||
+++ b/restripe.c
|
||||
@@ -864,10 +864,14 @@ int test_stripes(int *source, unsigned long long *offsets,
|
||||
|
||||
while (length > 0) {
|
||||
int disk;
|
||||
+ ssize_t ret;
|
||||
|
||||
for (i = 0 ; i < raid_disks ; i++) {
|
||||
lseek64(source[i], offsets[i]+start, 0);
|
||||
- read(source[i], stripes[i], chunk_size);
|
||||
+ ret = read(source[i], stripes[i], chunk_size);
|
||||
+ if (ret == -1) {
|
||||
+ printf("Read Failed\n");
|
||||
+ }
|
||||
}
|
||||
for (i = 0 ; i < data_disks ; i++) {
|
||||
int disk = geo_map(i, start/chunk_size, raid_disks,
|
||||
@@ -12,11 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
|
||||
file://run-ptest \
|
||||
file://mdadm-3.3.2_x32_abi_time_t.patch \
|
||||
file://mdadm-fix-ptest-build-errors.patch \
|
||||
file://0001-mdadm.h-Undefine-dprintf-before-redefining.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-Compute-abs-diff-in-a-standard-compliant-way.patch \
|
||||
file://0001-fix-gcc-8-format-truncation-warning.patch \
|
||||
file://debian-no-Werror.patch \
|
||||
file://0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch \
|
||||
@@ -26,11 +24,12 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
|
||||
file://0001-mdadm-skip-test-11spare-migration.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598"
|
||||
SRC_URI[sha256sum] = "ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a"
|
||||
SRC_URI[sha256sum] = "461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d"
|
||||
|
||||
inherit autotools-brokensep ptest systemd
|
||||
|
||||
DEPENDS = "udev"
|
||||
|
||||
SYSTEMD_SERVICE:${PN} = "mdmonitor.service"
|
||||
SYSTEMD_AUTO_ENABLE = "disable"
|
||||
|
||||
Reference in New Issue
Block a user