mdadm: Use upstream fix for musl 1.1.23 compile

[openwrt/openwrt.git] / package / utils / mdadm / Makefile

diff --git a/package/utils/mdadm/Makefile b/package/utils/mdadm/Makefile
index 6c4145ad6d1075682fa2bce5a1fdb9041f20d215..f20a58b7046c480df4b49c9b6dc246d06928c028 100644 (file)
--- a/package/utils/mdadm/Makefile
+++ b/package/utils/mdadm/Makefile
@@ -8,14 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mdadm
-PKG_VERSION:=3.2.5
-PKG_RELEASE:=1
+PKG_VERSION:=4.1
+PKG_RELEASE:=2
 
-PKG_SOURCE_URL:=@KERNEL/linux/utils/raid/mdadm
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_MD5SUM:=2fd33dedcdb06f0d1461f50ddabb7e4a
+PKG_SOURCE_URL:=@KERNEL/linux/utils/raid/mdadm
+PKG_HASH:=ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
+PKG_CPE_ID:=cpe:/a:mdadm_project:mdadm
 
 PKG_BUILD_PARALLEL:=1
 
@@ -24,30 +25,46 @@ include $(INCLUDE_DIR)/package.mk
 define Package/mdadm
   SECTION:=utils
   CATEGORY:=Utilities
+  SUBMENU:=Disc
   TITLE:=A tool for managing Soft RAID under Linux
-  URL:=http://www.kernel.org/pub/linux/utils/raid/mdadm/
-  DEPENDS:=+@KERNEL_DIRECT_IO
+  URL:=https://www.kernel.org/pub/linux/utils/raid/mdadm/
+  DEPENDS:=+libpthread +kmod-md-mod +kmod-md-raid0 +kmod-md-raid10 +kmod-md-raid1
 endef
 
 define Package/mdadm/description
  A tool for managing Linux Software RAID arrays.
+ RAID 0, 1 and 10 support included.
+ If you need RAID 4,5 or 6 functionality please
+ install kmod-md-raid456 .
+endef
+
+define Package/mdadm/conffiles
+/etc/config/mdadm
 endef
 
-TARGET_CFLAGS += -ffunction-sections -fdata-sections
+TARGET_CFLAGS += \
+       -ffunction-sections -fdata-sections \
+       -DHAVE_STDINT_H -DNO_COROSYNC -DNO_DLM -DUSE_PTHREADS \
+       -DCONFFILE='\"/var/etc/mdadm.conf\"' \
+       -DMAP_DIR='\"/var/run/mdadm\"' \
+       -DMDMON_DIR='\"/var/run/mdadm\"' \
+       -DFAILED_SLOTS_DIR='\"/var/run/mdadm/failed-slots\"'
+
 TARGET_LDFLAGS += -Wl,--gc-sections
 
+MAKE_VARS += CHECK_RUN_DIR=0
+
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC="$(TARGET_CC)" \
-               CFLAGS="$(TARGET_CFLAGS) -DHAVE_STDINT_H" \
-               LDFLAGS="$(TARGET_LDFLAGS)" \
-               mdadm mdassemble
+       $(call Build/Compile/Default,mdadm)
 endef
 
 define Package/mdadm/install
        $(INSTALL_DIR) $(1)/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/mdadm $(1)/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/mdassemble $(1)/sbin
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/mdadm.init $(1)/etc/init.d/mdadm
+       $(INSTALL_DIR) $(1)/etc/config
+       $(INSTALL_CONF) ./files/mdadm.config $(1)/etc/config/mdadm
 endef
 
 $(eval $(call BuildPackage,mdadm))