1c8fb911e6
- Update for latest mdadm-4.1+ patches, this is required by jsc#SLE-10078 and jsc#SLE-9348. Mostly the purpose is for latest Intel IMSM raid support. The following patches also include previous patches with new re-ordered prefix numbers. - Makefile: install mdadm_env.sh to /usr/lib/mdadm (bsc#1111960) 0000-Makefile-install-mdadm_env.sh-to-usr-lib-mdadm.patch - Assemble: keep MD_DISK_FAILFAST and MD_DISK_WRITEMOSTLY flag (jsc#SLE-10078, jsc#SLE-9348) 0001-Assemble-keep-MD_DISK_FAILFAST-and-MD_DISK_WRITEMOST.patch - Document PART-POLICY lines (jsc#SLE-10078, jsc#SLE-9348) 0002-Document-PART-POLICY-lines.patc - policy: support devices with multiple paths. (jsc#SLE-10078, jsc#SLE-9348) 0003-policy-support-devices-with-multiple-paths.patch - mdcheck: add systemd unit files to run mdcheck. (bsc#1115407) 0004-mdcheck-add-systemd-unit-files-to-run-mdcheck.patch - Monitor: add system timer to run --oneshot periodically (bsc#1115407) 0005-Monitor-add-system-timer-to-run-oneshot-periodically.patch - imsm: update metadata correctly while raid10 double (jsc#SLE-10078, jsc#SLE-9348) 0006-imsm-update-metadata-correctly-while-raid10-double-d.patch - Assemble: mask FAILFAST and WRITEMOSTLY flags when finding (jsc#SLE-10078, jsc#SLE-9348) 0007-Assemble-mask-FAILFAST-and-WRITEMOSTLY-flags-when-fi.patch - Grow: avoid overflow in compute_backup_blocks() (jsc#SLE-10078, jsc#SLE-9348) 0008-Grow-avoid-overflow-in-compute_backup_blocks.patch - Grow: report correct new chunk size. (jsc#SLE-10078, jsc#SLE-9348) 0009-Grow-report-correct-new-chunk-size.patch OBS-URL: https://build.opensuse.org/request/show/781064 OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=181
40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
From 452dc4d13a012cdcb05088c0dbc699959c4d6c73 Mon Sep 17 00:00:00 2001
|
|
From: Baruch Siach <baruch@tkos.co.il>
|
|
Date: Tue, 6 Aug 2019 16:05:23 +0300
|
|
Subject: [PATCH] mdadm.h: include sysmacros.h unconditionally
|
|
Git-commit: 452dc4d13a012cdcb05088c0dbc699959c4d6c73
|
|
Patch-mainline: mdadm-4.1+
|
|
References: jsc#SLE-10078, jsc#SLE-9348
|
|
|
|
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>
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
|
|
|
---
|
|
mdadm.h | 2 --
|
|
1 file changed, 2 deletions(-)
|
|
|
|
diff --git a/mdadm.h b/mdadm.h
|
|
index c36d7fd..d61a9ca 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.25.0
|
|
|