mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
adc9f935c3
Update mdadm to 4.0
Remove 000-compile.patch as it's fixed upstream
Refresh patches
Add mdadm.h-Undefine-dprintf-before-redefining.patch
Source: http://git.openembedded.org/openembedded-core/tree/meta/recipes-extended/mdadm/files
Add RAID 0,1 and 10 as depends to make mdadm usable.
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
(cherry picked from commit 980c41f8e0)
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
From 6d369e8f226594632ce4260129509daf7030de0a Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Mon, 9 May 2016 22:03:57 +0000
|
|
Subject: [PATCH] mdadm.h: Undefine dprintf before redefining
|
|
|
|
dprintf is also defined in libc see
|
|
usr/include/bits/stdio2.h, this comes into
|
|
play especially when fortify sources is enabled
|
|
and compilers like clang reports the override
|
|
|
|
In file included from policy.c:25:
|
|
./mdadm.h:1562:9: error: 'dprintf' macro redefined [-Werror,-Wmacro-redefined]
|
|
^
|
|
/mnt/oe/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/bits/stdio2.h:145:12: note: previous definition is here
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
Upstream-Status: Pending
|
|
|
|
mdadm.h | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
--- a/mdadm.h
|
|
+++ b/mdadm.h
|
|
@@ -1595,11 +1595,13 @@ static inline char *to_subarray(struct m
|
|
}
|
|
|
|
#ifdef DEBUG
|
|
+#undef dprintf
|
|
#define dprintf(fmt, arg...) \
|
|
fprintf(stderr, "%s: %s: "fmt, Name, __func__, ##arg)
|
|
#define dprintf_cont(fmt, arg...) \
|
|
fprintf(stderr, fmt, ##arg)
|
|
#else
|
|
+#undef dprintf
|
|
#define dprintf(fmt, arg...) \
|
|
({ if (0) fprintf(stderr, "%s: %s: " fmt, Name, __func__, ##arg); 0; })
|
|
#define dprintf_cont(fmt, arg...) \
|