summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-selftest/recipes-test/images/oe-selftest-image.bb3
-rw-r--r--meta/recipes-extended/mdadm/files/0001-Compute-abs-diff-in-a-standard-compliant-way.patch31
-rw-r--r--meta/recipes-extended/mdadm/files/debian-no-Werror.patch19
-rw-r--r--meta/recipes-extended/mdadm/files/mdadm-fix-ptest-build-errors.patch43
-rw-r--r--meta/recipes-extended/mdadm/mdadm_4.2.bb (renamed from meta/recipes-extended/mdadm/mdadm_4.1.bb)7
5 files changed, 17 insertions, 86 deletions
diff --git a/meta-selftest/recipes-test/images/oe-selftest-image.bb b/meta-selftest/recipes-test/images/oe-selftest-image.bb
index 5d4d10eef6..e295943ae5 100644
--- a/meta-selftest/recipes-test/images/oe-selftest-image.bb
+++ b/meta-selftest/recipes-test/images/oe-selftest-image.bb
@@ -1,6 +1,7 @@
1SUMMARY = "An image used during oe-selftest tests" 1SUMMARY = "An image used during oe-selftest tests"
2 2
3IMAGE_INSTALL = "packagegroup-core-boot dropbear" 3# libudev is needed for deploy mdadm via devtool
4IMAGE_INSTALL = "packagegroup-core-boot dropbear libudev"
4IMAGE_FEATURES = "debug-tweaks" 5IMAGE_FEATURES = "debug-tweaks"
5 6
6IMAGE_LINGUAS = " " 7IMAGE_LINGUAS = " "
diff --git a/meta/recipes-extended/mdadm/files/0001-Compute-abs-diff-in-a-standard-compliant-way.patch b/meta/recipes-extended/mdadm/files/0001-Compute-abs-diff-in-a-standard-compliant-way.patch
deleted file mode 100644
index 803a59b3ec..0000000000
--- a/meta/recipes-extended/mdadm/files/0001-Compute-abs-diff-in-a-standard-compliant-way.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From b273e892bd6aaafe448f84356abb78a6d463e784 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Dec 2018 17:22:39 -0800
4Subject: [PATCH] Compute abs diff in a standard compliant way
5
6This make it a bit less implementation defined and silences clang
7warning -Wabsolute-value
8
9| super-intel.c:2822:20: error: taking the absolute value of unsigned type 'unsi
10gned long long' has no effect [-Werror,-Wabsolute-value]
11
12Upstream-Status: Pending
13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 super-intel.c | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/super-intel.c b/super-intel.c
20index 6438987..10d7218 100644
21--- a/super-intel.c
22+++ b/super-intel.c
23@@ -2819,7 +2819,7 @@ static unsigned long long calc_component_size(struct imsm_map *map,
24 * 2048 blocks per each device. If the difference is higher it means
25 * that array size was expanded and num_data_stripes was not updated.
26 */
27- if ((unsigned int)abs(calc_dev_size - dev_size) >
28+ if ((unsigned int)abs((int)calc_dev_size - (int)dev_size) >
29 (1 << SECT_PER_MB_SHIFT) * member_disks) {
30 component_size = dev_size / member_disks;
31 dprintf("Invalid num_data_stripes in metadata; expected=%llu, found=%llu\n",
diff --git a/meta/recipes-extended/mdadm/files/debian-no-Werror.patch b/meta/recipes-extended/mdadm/files/debian-no-Werror.patch
index e66a15cd79..fa90647489 100644
--- a/meta/recipes-extended/mdadm/files/debian-no-Werror.patch
+++ b/meta/recipes-extended/mdadm/files/debian-no-Werror.patch
@@ -1,5 +1,7 @@
1From: martin f. krafft <madduck@debian.org> 1From adb75f0bdec97dbe4aa15cc988d349775f7995ff Mon Sep 17 00:00:00 2001
2Subject: Remove -Werror from compiler flags 2From: "martin f. krafft" <madduck@debian.org>
3Date: Mon, 3 Jan 2022 19:14:12 +0000
4Subject: [PATCH] Remove -Werror from compiler flags
3 5
4-Werror seems like a bad idea on released/packaged code because a toolchain 6-Werror seems like a bad idea on released/packaged code because a toolchain
5update (introducing new warnings) could break the build. We'll let upstream 7update (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.
8Signed-off-by: martin f. krafft <madduck@debian.org> 10Signed-off-by: martin f. krafft <madduck@debian.org>
9 11
10Upstream-Status: Pending 12Upstream-Status: Pending
13
11--- 14---
12 Makefile | 2 +- 15 Makefile | 2 +-
13 1 files changed, 1 insertions(+), 1 deletions(-) 16 1 file changed, 1 insertion(+), 1 deletion(-)
14 17
18diff --git a/Makefile b/Makefile
19index 716c97c..40354ea 100644
15--- a/Makefile 20--- a/Makefile
16+++ b/Makefile 21+++ b/Makefile
17@@ -48,7 +48,7 @@ endif 22@@ -50,7 +50,7 @@ ifeq ($(origin CC),default)
18 23 CC := $(CROSS_COMPILE)gcc
19 CC ?= $(CROSS_COMPILE)gcc 24 endif
20 CXFLAGS ?= -ggdb 25 CXFLAGS ?= -ggdb
21-CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter 26-CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
22+CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter 27+CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter
diff --git a/meta/recipes-extended/mdadm/files/mdadm-fix-ptest-build-errors.patch b/meta/recipes-extended/mdadm/files/mdadm-fix-ptest-build-errors.patch
deleted file mode 100644
index 8e2a8a9043..0000000000
--- a/meta/recipes-extended/mdadm/files/mdadm-fix-ptest-build-errors.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From 911f6ea9be0c334885aeff66853b111cbd4066df Mon Sep 17 00:00:00 2001
2From: "Maxin B. John" <maxin.john@intel.com>
3Date: Wed, 10 Feb 2016 17:28:05 +0200
4Subject: [PATCH] mdadm-fix-ptest-build-errors
5
6builds fail with ptest enabled:
7
8| restripe.c: In function 'test_stripes':
9| restripe.c:845:4: error: ignoring return value of 'read', declared with
10| attribute warn_unused_result [-Werror=unused-result]
11| read(source[i], stripes[i], chunk_size);
12| ^
13| cc1: all warnings being treated as errors
14| Makefile:214: recipe for target 'test_stripe' failed
15
16Upstream-Status: Pending
17
18Signed-off-by: Maxin B. John <maxin.john@intel.com>
19
20---
21 restripe.c | 6 +++++-
22 1 file changed, 5 insertions(+), 1 deletion(-)
23
24diff --git a/restripe.c b/restripe.c
25index 31b07e8..592ba5d 100644
26--- a/restripe.c
27+++ b/restripe.c
28@@ -864,10 +864,14 @@ int test_stripes(int *source, unsigned long long *offsets,
29
30 while (length > 0) {
31 int disk;
32+ ssize_t ret;
33
34 for (i = 0 ; i < raid_disks ; i++) {
35 lseek64(source[i], offsets[i]+start, 0);
36- read(source[i], stripes[i], chunk_size);
37+ ret = read(source[i], stripes[i], chunk_size);
38+ if (ret == -1) {
39+ printf("Read Failed\n");
40+ }
41 }
42 for (i = 0 ; i < data_disks ; i++) {
43 int disk = geo_map(i, start/chunk_size, raid_disks,
diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb b/meta/recipes-extended/mdadm/mdadm_4.2.bb
index 35535aef86..fa51364283 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.2.bb
@@ -12,11 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
12SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ 12SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
13 file://run-ptest \ 13 file://run-ptest \
14 file://mdadm-3.3.2_x32_abi_time_t.patch \ 14 file://mdadm-3.3.2_x32_abi_time_t.patch \
15 file://mdadm-fix-ptest-build-errors.patch \
16 file://0001-mdadm.h-Undefine-dprintf-before-redefining.patch \ 15 file://0001-mdadm.h-Undefine-dprintf-before-redefining.patch \
17 file://0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch \ 16 file://0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch \
18 file://0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch \ 17 file://0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch \
19 file://0001-Compute-abs-diff-in-a-standard-compliant-way.patch \
20 file://0001-fix-gcc-8-format-truncation-warning.patch \ 18 file://0001-fix-gcc-8-format-truncation-warning.patch \
21 file://debian-no-Werror.patch \ 19 file://debian-no-Werror.patch \
22 file://0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch \ 20 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 \
26 file://0001-mdadm-skip-test-11spare-migration.patch \ 24 file://0001-mdadm-skip-test-11spare-migration.patch \
27 " 25 "
28 26
29SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598" 27SRC_URI[sha256sum] = "461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d"
30SRC_URI[sha256sum] = "ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a"
31 28
32inherit autotools-brokensep ptest systemd 29inherit autotools-brokensep ptest systemd
33 30
31DEPENDS = "udev"
32
34SYSTEMD_SERVICE:${PN} = "mdmonitor.service" 33SYSTEMD_SERVICE:${PN} = "mdmonitor.service"
35SYSTEMD_AUTO_ENABLE = "disable" 34SYSTEMD_AUTO_ENABLE = "disable"
36 35