mdadm: upgrade 4.4 -> 4.5
PATCH v2 1/2 mdadm: upgrade 4.4 -> 4.5
From: Ankur Tyagi <[email protected]>
Changelog:
https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/tree/CHANGELOG.md?h=mdadm-4.5
Replaced 0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch with 0001-raid6check.c-restripe.c-Use-64-bit-off_t-across-both.patch as partial changes from first patch are part of the upstream version[1].
Dropped patches that are part of upstream version
- xmalloc.patch [2]
- 0001-Makefile-install-mdcheck.patch [3]
Also refreshed other patches.
[1] https://github.com/md-raid-utilities/mdadm/commit/787cc1b60130b8031be59e49d54463c58cd8cf74
[2] https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/raid6check.c?h=mdadm-4.5&id=e0df6c4c984d564e9e40913727e916a6cd8f466e
[3] https://github.com/md-raid-utilities/mdadm/commit/934d81184880d2231b0d7b3836b12358516ea35c
---
...-corosync-and-dlm-header-files-check.patch | 6 +-
.../files/0001-Makefile-install-mdcheck.patch | 27 ---
...tripe.c-Use-64-bit-off_t-across-both.patch | 54 ++++++
...FILE_OFFSET_BITS-to-enable-largefile.patch | 155 ------------------
...-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch | 6 +-
.../mdadm/files/xmalloc.patch | 32 ----
.../mdadm/{mdadm_4.4.bb => mdadm_4.5.bb} | 8 +-
7 files changed, 63 insertions(+), 225 deletions(-)
delete mode 100644 meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch
create mode 100644 meta/recipes-extended/mdadm/files/0001-raid6check.c-restripe.c-Use-64-bit-off_t-across-both.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/xmalloc.patch
rename meta/recipes-extended/mdadm/{mdadm_4.4.bb => mdadm_4.5.bb} (93%)meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch +3 -3
@@ -1,4 +1,4 @@ -From 232101e2fcc6359fb6db2bc232570e373e368c75 Mon Sep 17 00:00:00 2001 +From 77e9527a0ea995ed377e00813eeeb17175dbce72 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
@@ -14,10 +14,10 @@ Signed-off-by: Maxin B. John <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index bcd092de..0a78cd22 100644 +index 8031ce24..788ff5d9 100644 --- a/Makefile +++ b/Makefile -@@ -130,8 +130,8 @@ FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots +@@ -120,8 +120,8 @@ FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots SYSTEMD_DIR=/lib/systemd/system LIB_DIR=/usr/libexec/mdadm
meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch deleted +0 -27
@@ -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-raid6check.c-restripe.c-Use-64-bit-off_t-across-both.patch new file +54 -0
54 lines not on this page · raw message
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 +3 -3
@@ -1,4 +1,4 @@ -From 8de073c637a1ea968b7304f373a20b13a4a47bbc Mon Sep 17 00:00:00 2001 +From b7e51fbedc1fbc44af00398a4a7aef51cdf191ee 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
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 insertion(+) diff --git a/Create.c b/Create.c -index fd6c9215..3210a03e 100644 +index 4aa75b7e..5d5fc806 100644 --- a/Create.c +++ b/Create.c -@@ -33,6 +33,7 @@ +@@ -31,6 +31,7 @@ #include <signal.h> #include <sys/signalfd.h> #include <sys/wait.h>
meta/recipes-extended/mdadm/files/xmalloc.patch deleted +0 -32
@@ -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.5.bb renamed from meta/recipes-extended/mdadm/mdadm_4.4.bb +3 -5
@@ -12,13 +12,11 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/mdadm/mdadm.git;protocol=https;bra 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 \ + file://0001-raid6check.c-restripe.c-Use-64-bit-off_t-across-both.patch \ " -SRCREV = "8e56efac9afd7080bb42bae4b77cdad5f345633a" +SRCREV = "8f0c7692d48414ff7b3fe927ce75799c65ef24b1" inherit ptest systemd
@@ -37,7 +35,7 @@ CFLAGS:append:mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__' EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CWFLAGS="" CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_system_unitdir} \ BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev" LDFLAGS="${LDFLAGS}" \ - SYSROOT="${STAGING_DIR_TARGET}" STRIP=' + SYSROOT="${STAGING_DIR_TARGET}" MISCDIR="${datadir}/${BPN}" STRIP=' DEBUG_OPTIMIZATION:append = " -Wno-error"
PATCH v2 2/2 mdadm: catch sed substitution failure during install
From: Ankur Tyagi <[email protected]>
This patch is to validate a possible race condition theory during install. Also fail the build if sed substitution still fails for further investigation.
Details: https://bugzilla.yoctoproject.org/show_bug.cgi?id=16166
[YOCTO #16166]
--- ...1-Makefile-install-rule-improvements.patch | 64 +++++++++++++++++++ meta/recipes-extended/mdadm/mdadm_4.5.bb | 13 +++- 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/mdadm/files/0001-Makefile-install-rule-improvements.patch
meta/recipes-extended/mdadm/files/0001-Makefile-install-rule-improvements.patch new file +64 -0
@@ -0,0 +1,64 @@ +From 21310a9249e21c3dbdb6a6b8e07e74bf0a4557bc Mon Sep 17 00:00:00 2001 +From: Ankur Tyagi <[email protected]> +Date: Tue, 17 Feb 2026 08:41:48 +1300 +Subject: [PATCH] Makefile: install rule improvements + +- Removed double install logic +- Use unique temp files + +Upstream-Status: Pending + +Signed-off-by: Ankur Tyagi <[email protected]> +--- + Makefile | 30 ++++++++++++++---------------- + 1 file changed, 14 insertions(+), 16 deletions(-) + +diff --git a/Makefile b/Makefile +index 788ff5d9..a4d4f178 100644 +--- a/Makefile ++++ b/Makefile +@@ -298,30 +298,28 @@ install-man: mdadm.8 md.4 mdadm.conf.5 mdmon.8 + install-udev: udev-md-raid-arrays.rules udev-md-raid-assembly.rules udev-md-raid-creating.rules \ + udev-md-clustered-confirm-device.rules + @for file in $(UDEV_RULES); \ +- do sed -e 's,BINDIR,$(BINDIR),g' udev-$${file#??-} > .install.tmp.1 && \ +- $(ECHO) $(INSTALL) -D -m 644 udev-$${file#??-} $(DESTDIR)$(UDEVDIR)/rules.d/$$file ; \ +- $(INSTALL) -D -m 644 .install.tmp.1 $(DESTDIR)$(UDEVDIR)/rules.d/$$file ; \ +- rm -f .install.tmp.1; \ ++ do \ ++ srcfile=udev-$${file#??-} ; \ ++ sed -e 's,BINDIR,$(BINDIR),g' $$srcfile > $$srcfile.tmp && \ ++ $(INSTALL) -D -m 644 $$srcfile.tmp $(DESTDIR)$(UDEVDIR)/rules.d/$$file && \ ++ rm -f $$srcfile.tmp ; \ + done + + install-systemd: systemd/[email protected] + @for file in $(SYSTEMD_UNITS); \ +- do sed -e 's,BINDIR,$(BINDIR),g;s,MISCDIR,$(MISCDIR),g' systemd/$$file > .install.tmp.2 && \ +- $(ECHO) $(INSTALL) -D -m 644 systemd/$$file $(DESTDIR)$(SYSTEMD_DIR)/$$file ; \ +- $(INSTALL) -D -m 644 .install.tmp.2 $(DESTDIR)$(SYSTEMD_DIR)/$$file ; \ +- rm -f .install.tmp.2; \ ++ do sed -e 's,BINDIR,$(BINDIR),g;s,MISCDIR,$(MISCDIR),g' systemd/$$file > systemd/$$file.tmp && \ ++ $(INSTALL) -D -m 644 systemd/$$file.tmp $(DESTDIR)$(SYSTEMD_DIR)/$$file && \ ++ rm -f systemd/$$file.tmp; \ + done + @for file in mdadm.shutdown ; \ +- do sed -e 's,BINDIR,$(BINDIR),g' systemd/$$file > .install.tmp.3 && \ +- $(ECHO) $(INSTALL) -D -m 755 systemd/$$file $(DESTDIR)$(SYSTEMD_DIR)-shutdown/$$file ; \ +- $(INSTALL) -D -m 755 .install.tmp.3 $(DESTDIR)$(SYSTEMD_DIR)-shutdown/$$file ; \ +- rm -f .install.tmp.3; \ ++ do sed -e 's,BINDIR,$(BINDIR),g' systemd/$$file > systemd/$$file.tmp && \ ++ $(INSTALL) -D -m 755 systemd/$$file.tmp $(DESTDIR)$(SYSTEMD_DIR)-shutdown/$$file && \ ++ rm -f systemd/$$file.tmp; \ + done + @for file in mdcheck ; \ +- do sed -e 's,BINDIR,$(BINDIR),g' misc/$$file > .install.tmp.4 && \ +- $(ECHO) $(INSTALL) -D -m 755 misc/$$file $(DESTDIR)$(MISCDIR)/$$file ; \ +- $(INSTALL) -D -m 755 .install.tmp.4 $(DESTDIR)$(MISCDIR)/$$file ; \ +- rm -f .install.tmp.4; \ ++ do sed -e 's,BINDIR,$(BINDIR),g' misc/$$file > misc/$$file.tmp && \ ++ $(INSTALL) -D -m 755 misc/$$file.tmp $(DESTDIR)$(MISCDIR)/$$file && \ ++ rm -f misc/$$file.tmp; \ + done + + install-bin: mdadm mdmon
meta/recipes-extended/mdadm/mdadm_4.5.bb +12 -1
@@ -14,6 +14,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/mdadm/mdadm.git;protocol=https;bra file://mdadm.init \ file://0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch \ file://0001-raid6check.c-restripe.c-Use-64-bit-off_t-across-both.patch \ + file://0001-Makefile-install-rule-improvements.patch \ " SRCREV = "8f0c7692d48414ff7b3fe927ce75799c65ef24b1"
@@ -40,11 +41,21 @@ EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CWFLAGS="" CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${sys DEBUG_OPTIMIZATION:append = " -Wno-error" do_install() { - oe_runmake 'DESTDIR=${D}' install install-systemd + install -d ${D}/${datadir}/ + + oe_runmake -j 1 'DESTDIR=${D}' install install-systemd + install -d ${D}/${sysconfdir}/ install -m 644 ${S}/documentation/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf install -d ${D}/${sysconfdir}/init.d install -m 755 ${UNPACKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor + # temp change + install -m 644 ${S}/udev-md-raid-safe-timeouts.rules ${D}/${sysconfdir}/tmp-file + + if grep -q "BINDIR" ${D}${datadir}/${BPN}/mdcheck; then + bberror "Build failed: 'BINDIR' placeholder found in mdcheck." + bbfatal_log "sed command in Makefile failed to execute correctly." + fi } do_compile_ptest() {
Re: [OE-core][PATCH v2 2/2] mdadm: catch sed substitution failure during install
To be honest, I wouldn't start tweaking the code with patches just yet. The existing code doesn't seem wrong, so we need to understand where and how it breaks, otherwise how would we justify any changes to upstream?
So I'd keep only the very last bit:
+ # temp change
+ install -m 644 ${S}/udev-md-raid-safe-timeouts.rules
${D}/${sysconfdir}/tmp-file
+
+ if grep -q "BINDIR" ${D}${datadir}/${BPN}/mdcheck; then
+ bberror "Build failed: 'BINDIR' placeholder found in mdcheck."
+ bbfatal_log "sed command in Makefile failed to execute correctly."
+ fi
tmp-file needs to increment every time a new version is sent. E.g. tmp-file-2 etc.
Alex
Quoted 131 lines · Ankur Tyagi via lists.openembedded.org
From: Ankur Tyagi <[email protected]>
This patch is to validate a possible race condition theory during install. Also fail the build if sed substitution still fails for further investigation.
Details: https://bugzilla.yoctoproject.org/show_bug.cgi?id=16166
[YOCTO #16166]
Signed-off-by Ankur Tyagi <[email protected]>--- ...1-Makefile-install-rule-improvements.patch | 64 +++++++++++++++++++ meta/recipes-extended/mdadm/mdadm_4.5.bb | 13 +++- 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/mdadm/files/0001-Makefile-install-rule-improvements.patchmeta/recipes-extended/mdadm/files/0001-Makefile-install-rule-improvements.patch new file +64
-0@@ -0,0 +1,64 @@ +From 21310a9249e21c3dbdb6a6b8e07e74bf0a4557bc Mon Sep 17 00:00:00 2001 +From: Ankur Tyagi <[email protected]> +Date: Tue, 17 Feb 2026 08:41:48 +1300 +Subject: [PATCH] Makefile: install rule improvements + +- Removed double install logic +- Use unique temp files + +Upstream-Status: Pending + +Signed-off-by: Ankur Tyagi <[email protected]> +--- + Makefile | 30 ++++++++++++++---------------- + 1 file changed, 14 insertions(+), 16 deletions(-) + +diff --git a/Makefile b/Makefile +index 788ff5d9..a4d4f178 100644 +--- a/Makefile ++++ b/Makefile +@@ -298,30 +298,28 @@ install-man: mdadm.8 md.4 mdadm.conf.5 mdmon.8 + install-udev: udev-md-raid-arrays.rules udev-md-raid-assembly.rules udev-md-raid-creating.rules \ + udev-md-clustered-confirm-device.rules + @for file in $(UDEV_RULES); \ +- do sed -e 's,BINDIR,$(BINDIR),g' udev-$${file#??-} > .install.tmp.1 && \ +- $(ECHO) $(INSTALL) -D -m 644 udev-$${file#??-} $(DESTDIR)$(UDEVDIR)/rules.d/$$file ; \ +- $(INSTALL) -D -m 644 .install.tmp.1 $(DESTDIR)$(UDEVDIR)/rules.d/$$file ; \ +- rm -f .install.tmp.1; \ ++ do \ ++ srcfile=udev-$${file#??-} ; \ ++ sed -e 's,BINDIR,$(BINDIR),g' $$srcfile > $$srcfile.tmp && \ ++ $(INSTALL) -D -m 644 $$srcfile.tmp $(DESTDIR)$(UDEVDIR)/rules.d/$$file && \ ++ rm -f $$srcfile.tmp ; \ + done + + install-systemd: systemd/[email protected] + @for file in $(SYSTEMD_UNITS); \ +- do sed -e 's,BINDIR,$(BINDIR),g;s,MISCDIR,$(MISCDIR),g' systemd/$$file > .install.tmp.2 && \ +- $(ECHO) $(INSTALL) -D -m 644 systemd/$$file $(DESTDIR)$(SYSTEMD_DIR)/$$file ; \ +- $(INSTALL) -D -m 644 .install.tmp.2 $(DESTDIR)$(SYSTEMD_DIR)/$$file ; \ +- rm -f .install.tmp.2; \ ++ do sed -e 's,BINDIR,$(BINDIR),g;s,MISCDIR,$(MISCDIR),g' systemd/$$file > systemd/$$file.tmp && \ ++ $(INSTALL) -D -m 644 systemd/$$file.tmp $(DESTDIR)$(SYSTEMD_DIR)/$$file && \ ++ rm -f systemd/$$file.tmp; \ + done + @for file in mdadm.shutdown ; \ +- do sed -e 's,BINDIR,$(BINDIR),g' systemd/$$file > .install.tmp.3 && \ +- $(ECHO) $(INSTALL) -D -m 755 systemd/$$file $(DESTDIR)$(SYSTEMD_DIR)-shutdown/$$file ; \ +- $(INSTALL) -D -m 755 .install.tmp.3 $(DESTDIR)$(SYSTEMD_DIR)-shutdown/$$file ; \ +- rm -f .install.tmp.3; \ ++ do sed -e 's,BINDIR,$(BINDIR),g' systemd/$$file > systemd/$$file.tmp && \ ++ $(INSTALL) -D -m 755 systemd/$$file.tmp $(DESTDIR)$(SYSTEMD_DIR)-shutdown/$$file && \ ++ rm -f systemd/$$file.tmp; \ + done + @for file in mdcheck ; \ +- do sed -e 's,BINDIR,$(BINDIR),g' misc/$$file > .install.tmp.4 && \ +- $(ECHO) $(INSTALL) -D -m 755 misc/$$file $(DESTDIR)$(MISCDIR)/$$file ; \ +- $(INSTALL) -D -m 755 .install.tmp.4 $(DESTDIR)$(MISCDIR)/$$file ; \ +- rm -f .install.tmp.4; \ ++ do sed -e 's,BINDIR,$(BINDIR),g' misc/$$file > misc/$$file.tmp && \ ++ $(INSTALL) -D -m 755 misc/$$file.tmp $(DESTDIR)$(MISCDIR)/$$file && \ ++ rm -f misc/$$file.tmp; \ + done + + install-bin: mdadm mdmonmeta/recipes-extended/mdadm/mdadm_4.5.bb +12
-2@@ -14,6 +14,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/mdadm/mdadm.git;protocol=https;bra file://mdadm.init \ file://0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch \ file://0001-raid6check.c-restripe.c-Use-64-bit-off_t-across-both.patch \ + file://0001-Makefile-install-rule-improvements.patch \ " SRCREV = "8f0c7692d48414ff7b3fe927ce75799c65ef24b1"@@ -40,11 +41,21 @@ EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CWFLAGS="" CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${sys DEBUG_OPTIMIZATION:append = " -Wno-error" do_install() { - oe_runmake 'DESTDIR=${D}' install install-systemd + install -d ${D}/${datadir}/ + + oe_runmake -j 1 'DESTDIR=${D}' install install-systemd + install -d ${D}/${sysconfdir}/ install -m 644 ${S}/documentation/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf install -d ${D}/${sysconfdir}/init.d install -m 755 ${UNPACKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor + # temp change + install -m 644 ${S}/udev-md-raid-safe-timeouts.rules ${D}/${sysconfdir}/tmp-file + + if grep -q "BINDIR" ${D}${datadir}/${BPN}/mdcheck; then + bberror "Build failed: 'BINDIR' placeholder found in mdcheck." + bbfatal_log "sed command in Makefile failed to execute correctly." + fi } do_compile_ptest() { -=-=-=-=-=-=-=-=-=-=-=-Links: You receive all messages sent to this group.
View/Reply Online (#231226): https://lists.openembedded.org/g/openembedded-core/message/231226
Mute This Topic: https://lists.openembedded.org/mt/117847720/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core][PATCH v2 2/2] mdadm: catch sed substitution failure during install
Quoted 17 lines · Alexander Kanavin
To be honest, I wouldn't start tweaking the code with patches just yet. The existing code doesn't seem wrong, so we need to understand where and how it breaks, otherwise how would we justify any changes to upstream?
So I'd keep only the very last bit:
(quoted diff) +2
-0+ # temp change + install -m 644 ${S}/udev-md-raid-safe-timeouts.rules${D}/${sysconfdir}/tmp-file
meta/recipes-extended/mdadm/mdadm_4.5.bb +5
-0+ + if grep -q "BINDIR" ${D}${datadir}/${BPN}/mdcheck; then + bberror "Build failed: 'BINDIR' placeholder found in mdcheck." + bbfatal_log "sed command in Makefile failed to execute correctly." + fi
Quoted 3 lines
tmp-file needs to increment every time a new version is sent. E.g. tmp-file-2 etc.
Hi Alex,
I am unsure of the resource constraints, so I was planning to achieve a working baseline first.
And then undo changes incrementally, which now I think is the same effort.
I'll start with incremental changes and send v3 with the Makefile patch removed.
cheers
Ankur
Quoted 135 lines
Alex
Quoted 131 lines · Ankur Tyagi via lists.openembedded.org
From: Ankur Tyagi <[email protected]>
This patch is to validate a possible race condition theory during install. Also fail the build if sed substitution still fails for further investigation.
Details: https://bugzilla.yoctoproject.org/show_bug.cgi?id=16166
[YOCTO #16166]
Signed-off-by Ankur Tyagi <[email protected]>--- ...1-Makefile-install-rule-improvements.patch | 64 +++++++++++++++++++ meta/recipes-extended/mdadm/mdadm_4.5.bb | 13 +++- 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/mdadm/files/0001-Makefile-install-rule-improvements.patchmeta/recipes-extended/mdadm/files/0001-Makefile-install-rule-improvements.patch new file +64
-0@@ -0,0 +1,64 @@ +From 21310a9249e21c3dbdb6a6b8e07e74bf0a4557bc Mon Sep 17 00:00:00 2001 +From: Ankur Tyagi <[email protected]> +Date: Tue, 17 Feb 2026 08:41:48 +1300 +Subject: [PATCH] Makefile: install rule improvements + +- Removed double install logic +- Use unique temp files + +Upstream-Status: Pending + +Signed-off-by: Ankur Tyagi <[email protected]> +--- + Makefile | 30 ++++++++++++++---------------- + 1 file changed, 14 insertions(+), 16 deletions(-) + +diff --git a/Makefile b/Makefile +index 788ff5d9..a4d4f178 100644 +--- a/Makefile ++++ b/Makefile +@@ -298,30 +298,28 @@ install-man: mdadm.8 md.4 mdadm.conf.5 mdmon.8 + install-udev: udev-md-raid-arrays.rules udev-md-raid-assembly.rules udev-md-raid-creating.rules \ + udev-md-clustered-confirm-device.rules + @for file in $(UDEV_RULES); \ +- do sed -e 's,BINDIR,$(BINDIR),g' udev-$${file#??-} > .install.tmp.1 && \ +- $(ECHO) $(INSTALL) -D -m 644 udev-$${file#??-} $(DESTDIR)$(UDEVDIR)/rules.d/$$file ; \ +- $(INSTALL) -D -m 644 .install.tmp.1 $(DESTDIR)$(UDEVDIR)/rules.d/$$file ; \ +- rm -f .install.tmp.1; \ ++ do \ ++ srcfile=udev-$${file#??-} ; \ ++ sed -e 's,BINDIR,$(BINDIR),g' $$srcfile > $$srcfile.tmp && \ ++ $(INSTALL) -D -m 644 $$srcfile.tmp $(DESTDIR)$(UDEVDIR)/rules.d/$$file && \ ++ rm -f $$srcfile.tmp ; \ + done + + install-systemd: systemd/[email protected] + @for file in $(SYSTEMD_UNITS); \ +- do sed -e 's,BINDIR,$(BINDIR),g;s,MISCDIR,$(MISCDIR),g' systemd/$$file > .install.tmp.2 && \ +- $(ECHO) $(INSTALL) -D -m 644 systemd/$$file $(DESTDIR)$(SYSTEMD_DIR)/$$file ; \ +- $(INSTALL) -D -m 644 .install.tmp.2 $(DESTDIR)$(SYSTEMD_DIR)/$$file ; \ +- rm -f .install.tmp.2; \ ++ do sed -e 's,BINDIR,$(BINDIR),g;s,MISCDIR,$(MISCDIR),g' systemd/$$file > systemd/$$file.tmp && \ ++ $(INSTALL) -D -m 644 systemd/$$file.tmp $(DESTDIR)$(SYSTEMD_DIR)/$$file && \ ++ rm -f systemd/$$file.tmp; \ + done + @for file in mdadm.shutdown ; \ +- do sed -e 's,BINDIR,$(BINDIR),g' systemd/$$file > .install.tmp.3 && \ +- $(ECHO) $(INSTALL) -D -m 755 systemd/$$file $(DESTDIR)$(SYSTEMD_DIR)-shutdown/$$file ; \ +- $(INSTALL) -D -m 755 .install.tmp.3 $(DESTDIR)$(SYSTEMD_DIR)-shutdown/$$file ; \ +- rm -f .install.tmp.3; \ ++ do sed -e 's,BINDIR,$(BINDIR),g' systemd/$$file > systemd/$$file.tmp && \ ++ $(INSTALL) -D -m 755 systemd/$$file.tmp $(DESTDIR)$(SYSTEMD_DIR)-shutdown/$$file && \ ++ rm -f systemd/$$file.tmp; \ + done + @for file in mdcheck ; \ +- do sed -e 's,BINDIR,$(BINDIR),g' misc/$$file > .install.tmp.4 && \ +- $(ECHO) $(INSTALL) -D -m 755 misc/$$file $(DESTDIR)$(MISCDIR)/$$file ; \ +- $(INSTALL) -D -m 755 .install.tmp.4 $(DESTDIR)$(MISCDIR)/$$file ; \ +- rm -f .install.tmp.4; \ ++ do sed -e 's,BINDIR,$(BINDIR),g' misc/$$file > misc/$$file.tmp && \ ++ $(INSTALL) -D -m 755 misc/$$file.tmp $(DESTDIR)$(MISCDIR)/$$file && \ ++ rm -f misc/$$file.tmp; \ + done + + install-bin: mdadm mdmonmeta/recipes-extended/mdadm/mdadm_4.5.bb +12
-2@@ -14,6 +14,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/mdadm/mdadm.git;protocol=https;bra file://mdadm.init \ file://0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch \ file://0001-raid6check.c-restripe.c-Use-64-bit-off_t-across-both.patch \ + file://0001-Makefile-install-rule-improvements.patch \ " SRCREV = "8f0c7692d48414ff7b3fe927ce75799c65ef24b1"@@ -40,11 +41,21 @@ EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CWFLAGS="" CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${sys DEBUG_OPTIMIZATION:append = " -Wno-error" do_install() { - oe_runmake 'DESTDIR=${D}' install install-systemd + install -d ${D}/${datadir}/ + + oe_runmake -j 1 'DESTDIR=${D}' install install-systemd + install -d ${D}/${sysconfdir}/ install -m 644 ${S}/documentation/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf install -d ${D}/${sysconfdir}/init.d install -m 755 ${UNPACKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor + # temp change + install -m 644 ${S}/udev-md-raid-safe-timeouts.rules ${D}/${sysconfdir}/tmp-file + + if grep -q "BINDIR" ${D}${datadir}/${BPN}/mdcheck; then + bberror "Build failed: 'BINDIR' placeholder found in mdcheck." + bbfatal_log "sed command in Makefile failed to execute correctly." + fi } do_compile_ptest() { -=-=-=-=-=-=-=-=-=-=-=-Links: You receive all messages sent to this group.
View/Reply Online (#231226): https://lists.openembedded.org/g/openembedded-core/message/231226
Mute This Topic: https://lists.openembedded.org/mt/117847720/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-