Skip to contentSkip to conversation

mdadm: upgrade 4.4 -> 4.6

PATCH New Maxin John 1 participant 1 message Mar 20

lore
Share & tools
lore

Maxin John

author
#0 lore raw

PATCH 1/1 mdadm: upgrade 4.4 -> 4.6

Drop backported patch:
- xmalloc.patch

Drop upstreamed patches and patches made obsolete by upstream commits:

- 0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch [1]
- 0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch [2]
- 0001-Makefile-install-mdcheck.patch [3]
- 0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch [4]

[1] https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=5b8560e66ca8f72d008778b5daa1059de48fb73a
[2] https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?h=main&id=52bead95d2957437c691891fcdc49bd6afccdd49
[3] https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?h=main&id=934d81184880d2231b0d7b3836b12358516ea35c
[4] https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?h=main&id=787cc1b60130b8031be59e49d54463c58cd8cf74

Changelog:
https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/tree/CHANGELOG.md?h=mdadm-4.6

---
 ...-corosync-and-dlm-header-files-check.patch |  30 ----
 .../files/0001-Makefile-install-mdcheck.patch |  27 ---
 ...FILE_OFFSET_BITS-to-enable-largefile.patch | 155 ------------------
 ...-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch |  27 ---
 .../mdadm/files/xmalloc.patch                 |  32 ----
 .../mdadm/{mdadm_4.4.bb => mdadm_4.6.bb}      |   9 +-
 6 files changed, 2 insertions(+), 278 deletions(-)
 delete mode 100644 meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch
 delete mode 100644 meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch
 delete mode 100644 meta/recipes-extended/mdadm/files/0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch
 delete mode 100644 meta/recipes-extended/mdadm/files/0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch
 delete mode 100644 meta/recipes-extended/mdadm/files/xmalloc.patch
 rename meta/recipes-extended/mdadm/{mdadm_4.4.bb => mdadm_4.6.bb} (90%)
meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch deleted +0 -30
deleted file mode 100644
index 8598aea1f1ef..000000000000
@@ -1,30 +0,0 @@
-From 232101e2fcc6359fb6db2bc232570e373e368c75 Mon Sep 17 00:00:00 2001
-From: "Maxin B. John" <[email protected]>
-Date: Tue, 9 Feb 2016 11:44:01 +0200
-Subject: [PATCH] Fix the path of corosync and dlm header files check
-
-Original Makefile will check headers on host instead of sysroot.
-Fix it.
-
-Upstream-Status: Inappropriate [Yocto specific]
-
-Signed-off-by: Maxin B. John <[email protected]>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index bcd092de..0a78cd22 100644
---- a/Makefile
-+++ b/Makefile
-@@ -130,8 +130,8 @@ FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots
- SYSTEMD_DIR=/lib/systemd/system
- LIB_DIR=/usr/libexec/mdadm
- 
--COROSYNC:=$(shell [ -d /usr/include/corosync ] || echo -DNO_COROSYNC)
--DLM:=$(shell [ -f /usr/include/libdlm.h ] || echo -DNO_DLM)
-+COROSYNC:=$(shell [ -f $(SYSROOT)/usr/include/corosync/cmap.h ] || echo -DNO_COROSYNC)
-+DLM:=$(shell [ -f $(SYSROOT)/usr/include/libdlm.h ] || echo -DNO_DLM)
- 
- DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\"
- DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\"
meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch deleted +0 -27
deleted file mode 100644
index bb4e8d060421..000000000000
@@ -1,27 +0,0 @@
-From 407691e11037709af888ce2cf6bd5eac6971ac61 Mon Sep 17 00:00:00 2001
-From: Chen Qi <[email protected]>
-Date: Tue, 25 Jan 2022 16:25:01 +0800
-Subject: [PATCH] Makefile: install mdcheck
-
-The mdcheck_xxx.service files use mdcheck, but it's not installed.
-We need to install this script.
-
-Upstream-Status: Submitted [Sent patch to maintainer]
-
-Signed-off-by: Chen Qi <[email protected]>
----
- Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile b/Makefile
-index 981e16fa..b28e7855 100644
---- a/Makefile
-+++ b/Makefile
-@@ -345,6 +345,7 @@ install-systemd: systemd/[email protected]
- install-bin: mdadm mdmon
- 	$(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
- 	$(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon
-+	$(INSTALL) -D -m 755 misc/mdcheck $(DESTDIR)/usr/share/mdadm/mdcheck
- 
- uninstall:
- 	rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm
meta/recipes-extended/mdadm/files/0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch deleted +0 -155

155 lines not on this page · raw message

meta/recipes-extended/mdadm/files/0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch deleted +0 -27
deleted file mode 100644
index e425fc446e27..000000000000
@@ -1,27 +0,0 @@
-From 8de073c637a1ea968b7304f373a20b13a4a47bbc Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Tue, 12 Mar 2024 10:54:08 +0100
-Subject: [PATCH] Create.c: include linux/falloc.h for FALLOC_FL_ZERO_RANGE
- definition
-
-glibc provides this through fcntl.h but musl does not - should
-be reported and fixed there.
-
-Upstream-Status: Inappropriate [musl-specific issue]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- Create.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Create.c b/Create.c
-index fd6c9215..3210a03e 100644
---- a/Create.c
-+++ b/Create.c
-@@ -33,6 +33,7 @@
- #include	<signal.h>
- #include	<sys/signalfd.h>
- #include	<sys/wait.h>
-+#include	<linux/falloc.h>
- 
- #ifndef FALLOC_FL_ZERO_RANGE
- #define FALLOC_FL_ZERO_RANGE 16
meta/recipes-extended/mdadm/files/xmalloc.patch deleted +0 -32
deleted file mode 100644
index 61774721d038..000000000000
@@ -1,32 +0,0 @@
-From c5cf5a83be4e3ce04ebf3250f77aeb465eeb53a1 Mon Sep 17 00:00:00 2001
-From: Xiao Ni <[email protected]>
-Date: Fri, 17 Jan 2025 15:15:40 +0800
-Subject: [PATCH] mdadm/raid6check: add xmalloc.h to raid6check.c
-
-It reports building error:
-raid6check.c:324:26: error: implicit declaration of function xmalloc
-
-Add xmalloc.h to raid6check.c file to fix this.
-
-Signed-off-by: Xiao Ni <[email protected]>
-Link: https://lore.kernel.org/r/[email protected]
-Signed-off-by: Song Liu <[email protected]>
-
-Upstream-Status: Backport [https://web.git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?h=main&id=e0df6c4c984d564e9e40913727e916a6cd8f466e]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- raid6check.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/raid6check.c b/raid6check.c
-index 8e7f1421..486b10c6 100644
---- a/raid6check.c
-+++ b/raid6check.c
-@@ -26,6 +26,7 @@
- #define _FILE_OFFSET_BITS 64
- 
- #include "mdadm.h"
-+#include "xmalloc.h"
- #include <stdint.h>
- #include <sys/mman.h>
- 
meta/recipes-extended/mdadm/mdadm_4.6.bb renamed from meta/recipes-extended/mdadm/mdadm_4.4.bb +2 -7
similarity index 90%
rename from meta/recipes-extended/mdadm/mdadm_4.4.bb
rename to meta/recipes-extended/mdadm/mdadm_4.6.bb
index 26a60e4c1a30..b1d0a27c7fc7 100644
@@ -10,17 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 
 SRC_URI = "git://git.kernel.org/pub/scm/utils/mdadm/mdadm.git;protocol=https;branch=main;tag=mdadm-${PV} \
            file://run-ptest \
-           file://0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch \
            file://mdadm.init \
-           file://0001-Makefile-install-mdcheck.patch \
-           file://0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch \
-           file://0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch \
-           file://xmalloc.patch \
            "
 
-SRCREV = "8e56efac9afd7080bb42bae4b77cdad5f345633a"
+SRCREV = "8b414a0d4753693d67b9a5822994e5f0c91b0b0a"
 
-inherit ptest systemd
+inherit pkgconfig ptest systemd
 
 DEPENDS = "udev"
 
Signature · 1 line
2.47.3