diff --git a/hardware/disk/mdadm/actions.py b/hardware/disk/mdadm/actions.py index cee9c766..04c761cb 100644 --- a/hardware/disk/mdadm/actions.py +++ b/hardware/disk/mdadm/actions.py @@ -12,7 +12,7 @@ from pisi.actionsapi import shelltools def builddiet(): autotools.make("clean") shelltools.export("GCC", "diet %s %s %s %s -DHAVE_STDINT_H -Os -static" % (get.CC(), get.CFLAGS(), get.CXXFLAGS(), get.LDFLAGS())) - autotools.make("mdadm.static") + autotools.make("CXFLAGS='%s -DNO_LIBUDEV' mdadm.static" % get.CFLAGS()) #autotools.make("mdassemble.static") pisitools.insinto("/sbin", "mdadm.static") @@ -22,7 +22,7 @@ def build(): # fix build with gcc-4.9.0 pisitools.dosed("Makefile", "(Wall) -Werror", "\\1") # Not sure about MDASSEMBLE_AUTO=1. Need to investigate. - autotools.make("SYSCONFDIR=/%s MDASSEMBLE_AUTO=1 mdadm mdmon" % get.confDIR()) + autotools.make("CXFLAGS='%s -DNO_LIBUDEV' SYSCONFDIR=/%s MDASSEMBLE_AUTO=1 mdadm mdmon" % (get.CFLAGS(), get.confDIR())) def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) diff --git a/hardware/disk/mdadm/files/mdadm-4.3-no-udev.patch b/hardware/disk/mdadm/files/mdadm-4.3-no-udev.patch new file mode 100644 index 00000000..dd7ef696 --- /dev/null +++ b/hardware/disk/mdadm/files/mdadm-4.3-no-udev.patch @@ -0,0 +1,31 @@ +https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/patch/?id=1750758c7ff526e3560433f6235e5cfa35cf646a +https://bugs.gentoo.org/928228 + +From 1750758c7ff526e3560433f6235e5cfa35cf646a Mon Sep 17 00:00:00 2001 +From: Mariusz Tkaczyk +Date: Wed, 6 Mar 2024 15:50:55 +0100 +Subject: udev.c: Do not require libudev.h if DNO_LIBUDEV + +libudev may not be presented at all, do not require it. + +Reported-by: Boian Bonev +Signed-off-by: Mariusz Tkaczyk +--- + udev.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/udev.c b/udev.c +index bc4722b0..066e6ab1 100644 +--- a/udev.c ++++ b/udev.c +@@ -26,7 +26,10 @@ + #include + #include + #include ++ ++#ifndef NO_LIBUDEV + #include ++#endif + + static char *unblock_path; + diff --git a/hardware/disk/mdadm/pspec.xml b/hardware/disk/mdadm/pspec.xml index ae52e3fc..27123603 100644 --- a/hardware/disk/mdadm/pspec.xml +++ b/hardware/disk/mdadm/pspec.xml @@ -12,12 +12,13 @@ app:console Utility to control Linux MD devices (software RAID arrays) mdadm is used to create, manage, and monitor Linux MD (software RAID) devices. - https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz + https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.3.tar.xz dietlibc sysmacros.patch + mdadm-4.3-no-udev.patch @@ -57,6 +58,13 @@ + + 2024-07-25 + 4.3 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2023-11-08 4.1