him411/lede-Heleguo
1
0
Fork 0
mirror of https://github.com/Heleguo/lede.git synced 2025-12-17 19:31:34 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

mdadm: update to 4.4 (#13694)

Browse Source
This commit is contained in:
Internet1235 2025-09-08 14:35:10 +08:00 committed by GitHub
parent 5974396acc
commit 8348c7faba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/utils/mdadm/Makefile
View File

@ -8,17 +8,18 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=mdadm PKG_NAME:=mdadm
PKG_VERSION:=4.2 PKG_VERSION:=4.4
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/utils/raid/mdadm PKG_SOURCE_URL:=@KERNEL/linux/utils/raid/mdadm
PKG_HASH:=461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d PKG_HASH:=9b488f35ed153df99924b5fe41eed380e8512de8f18a118628cacdd681b1d573
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_CPE_ID:=cpe:/a:mdadm_project:mdadm PKG_CPE_ID:=cpe:/a:mdadm_project:mdadm
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_BUILD_FLAGS:=gc-sections
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -43,7 +44,6 @@ define Package/mdadm/conffiles
endef endef
TARGET_CFLAGS += \ TARGET_CFLAGS += \
-ffunction-sections -fdata-sections \
-DHAVE_STDINT_H -DNO_COROSYNC -DNO_DLM -DUSE_PTHREADS \ -DHAVE_STDINT_H -DNO_COROSYNC -DNO_DLM -DUSE_PTHREADS \
-DCONFFILE='\"/var/etc/mdadm.conf\"' \ -DCONFFILE='\"/var/etc/mdadm.conf\"' \
-DMAP_DIR='\"/var/run/mdadm\"' \ -DMAP_DIR='\"/var/run/mdadm\"' \
@ -54,8 +54,6 @@ TARGET_CFLAGS += \
TARGET_CXFLAGS = -DNO_LIBUDEV TARGET_CXFLAGS = -DNO_LIBUDEV
TARGET_LDFLAGS += -Wl,--gc-sections
MAKE_FLAGS += \ MAKE_FLAGS += \
CHECK_RUN_DIR=0 \ CHECK_RUN_DIR=0 \
CXFLAGS="$(TARGET_CXFLAGS)" CXFLAGS="$(TARGET_CXFLAGS)"

2
package/utils/mdadm/patches/100-cross_compile.patch
View File

@ -1,6 +1,6 @@
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -99,7 +99,7 @@ DLM:=$(shell [ -f /usr/include/libdlm.h @@ -136,7 +136,7 @@ DLM:=$(shell [ -f /usr/include/libdlm.h ] || echo -DNO_DLM)
DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\" DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\"
DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\" DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\"
DIRFLAGS += -DFAILED_SLOTS_DIR=\"$(FAILED_SLOTS_DIR)\" DIRFLAGS += -DFAILED_SLOTS_DIR=\"$(FAILED_SLOTS_DIR)\"

4
package/utils/mdadm/patches/200-reduce_size.patch
View File

@ -1,6 +1,6 @@
--- a/Incremental.c --- a/Incremental.c
+++ b/Incremental.c +++ b/Incremental.c
@@ -983,6 +983,10 @@ static int array_try_spare(char *devname @@ -993,6 +993,10 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol,
goto next; goto next;
} }
@ -13,7 +13,7 @@
/* domain test fails */ /* domain test fails */
--- a/util.c --- a/util.c
+++ b/util.c +++ b/util.c
@@ -1147,7 +1147,9 @@ void wait_for(char *dev, int fd) @@ -1162,7 +1162,9 @@ void wait_for(char *dev, int fd)
struct superswitch *superlist[] = struct superswitch *superlist[] =
{ {
&super0, &super1, &super0, &super1,