package/mdadm: bump to version 4.2
- Drop first patch and use install-bin target added by https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=b4a5ad4958cb3ad87c3c5fa993e7572c38596d09 - Drop second patch (already in version) - Handle libudev optional dependency through CXFLAGS instead of overriding CFLAGS as wanted by upstream: https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=af3396dadfcd3b13480d021b8d3645c6d2420f79 - Update indentation in hash file (two spaces) https://www.spinics.net/lists/raid/msg69218.html Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Fabrice Fontaine
Arnout Vandecappelle (Essensium/Mind)
parent
e1c37ece28
commit
b03fc79745
|
|
@ -1,32 +0,0 @@
|
|||
From a1a9243671b1e23123f57e879890325154b8e00d Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Vu-Brugier <cvubrugier@lacie.com>
|
||||
Date: Wed, 6 Mar 2013 16:03:14 +0100
|
||||
Subject: [PATCH] Add install targets for mdadm and mdmon
|
||||
|
||||
|
||||
Signed-off-by: Christophe Vu-Brugier <cvubrugier@lacie.com>
|
||||
---
|
||||
Makefile | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 315455b..27d8eeb 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -231,8 +231,12 @@ $(MON_OBJS) : $(INCL) mdmon.h
|
||||
sha1.o : sha1.c sha1.h md5.h
|
||||
$(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c
|
||||
|
||||
-install : mdadm mdmon install-man install-udev
|
||||
+install : install-mdadm install-mdmon install-man install-udev
|
||||
+
|
||||
+install-mdadm :
|
||||
$(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
|
||||
+
|
||||
+install-mdmon :
|
||||
$(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon
|
||||
|
||||
install-static : mdadm.static install-man
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
From 6c781ad75d92c6f65832810c44afcba1b2dffc41 Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Tue, 6 Aug 2019 16:01:15 +0300
|
||||
Subject: [PATCH] mdadm.h: include sysmacros.h unconditionally
|
||||
|
||||
musl libc now also requires sys/sysmacros.h for the major/minor macros.
|
||||
All supported libc implementations carry sys/sysmacros.h, including
|
||||
diet-libc, klibc, and uclibc-ng.
|
||||
|
||||
Cc: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: https://marc.info/?l=linux-raid&m=156509677018508
|
||||
|
||||
mdadm.h | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/mdadm.h b/mdadm.h
|
||||
index c36d7fdb10f6..d61a9ca82dc1 100644
|
||||
--- a/mdadm.h
|
||||
+++ b/mdadm.h
|
||||
@@ -45,10 +45,8 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <syslog.h>
|
||||
-#ifdef __GLIBC__
|
||||
/* Newer glibc requires sys/sysmacros.h directly for makedev() */
|
||||
#include <sys/sysmacros.h>
|
||||
-#endif
|
||||
#ifdef __dietlibc__
|
||||
#include <strings.h>
|
||||
/* dietlibc has deprecated random and srandom!! */
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
# From https://www.kernel.org/pub/linux/utils/raid/mdadm/sha256sums.asc
|
||||
sha256 ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a mdadm-4.1.tar.xz
|
||||
sha256 461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d mdadm-4.2.tar.xz
|
||||
# Locally calculated
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
|
|
|
|||
|
|
@ -4,14 +4,19 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
MDADM_VERSION = 4.1
|
||||
MDADM_VERSION = 4.2
|
||||
MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.xz
|
||||
MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm
|
||||
MDADM_LICENSE = GPL-2.0+
|
||||
MDADM_LICENSE_FILES = COPYING
|
||||
|
||||
MDADM_BUILD_OPTS = $(TARGET_CONFIGURE_OPTS) \
|
||||
CFLAGS="$(TARGET_CFLAGS) -DNO_COROSYNC -DNO_DLM" \
|
||||
MDADM_CXFLAGS = $(TARGET_CFLAGS)
|
||||
|
||||
MDADM_BUILD_OPTS = \
|
||||
CC=$(TARGET_CC) \
|
||||
COROSYNC=-DNO_COROSYNC \
|
||||
DLM=-DNO_DLM \
|
||||
CXFLAGS="$(MDADM_CXFLAGS)" \
|
||||
CPPFLAGS="$(TARGET_CPPFLAGS) -DBINDIR=\\\"/sbin\\\"" \
|
||||
CHECK_RUN_DIR=0
|
||||
|
||||
|
|
@ -19,14 +24,18 @@ ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
|
|||
MDADM_BUILD_OPTS += USE_PTHREADS=
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
|
||||
MDADM_DEPENDENCIES += udev
|
||||
else
|
||||
MDADM_CXFLAGS += -DNO_LIBUDEV
|
||||
endif
|
||||
|
||||
define MDADM_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(MDADM_BUILD_OPTS) mdadm mdmon
|
||||
endef
|
||||
|
||||
define MDADM_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
|
||||
DESTDIR=$(TARGET_DIR) \
|
||||
install-mdadm install-mdmon
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install-bin
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
|
|
|||
Loading…
Reference in a new issue