summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/mdadm/files
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-08-22 08:52:58 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-30 12:35:54 +0100
commit36e8f935a139efc877dd2aee84f07771325dfad0 (patch)
tree09609d88c12cf590682951a9679ba58a672c36b9 /meta/recipes-extended/mdadm/files
parent9d46958079f5c4df0694b5749b96582ab43830b6 (diff)
downloadpoky-36e8f935a139efc877dd2aee84f07771325dfad0.tar.gz
mdadm: Upgrade mdadm_3.3.2.bb -> mdadm_3.3.4.bb
Drop upstreamed patch for gcc5 compatibility Forward port x32 patch (From OE-Core rev: 2782ae4dfb417ba377f861283792d7d9929f2ae3) (From OE-Core rev: 0d0a591fca9fadd786f0ccda05cd68c295d6bb21) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/mdadm/files')
-rw-r--r--meta/recipes-extended/mdadm/files/inline.patch39
-rw-r--r--meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch23
2 files changed, 11 insertions, 51 deletions
diff --git a/meta/recipes-extended/mdadm/files/inline.patch b/meta/recipes-extended/mdadm/files/inline.patch
deleted file mode 100644
index 9009f0650c..0000000000
--- a/meta/recipes-extended/mdadm/files/inline.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1with gnu11 turning on a default with gcc-5 we have to abide by new inline semantics
2using 'inline' and using is in same translation unit means an external definition has to exist
3same like "external inline" in gnu89, we simply make the functions static inline since they
4are just meant to be used in this file
5
6Upstream-Status: Pending
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8
9Index: mdadm-3.3.2/bitmap.c
10===================================================================
11--- mdadm-3.3.2.orig/bitmap.c
12+++ mdadm-3.3.2/bitmap.c
13@@ -20,7 +20,7 @@
14
15 #include "mdadm.h"
16
17-inline void sb_le_to_cpu(bitmap_super_t *sb)
18+static inline void sb_le_to_cpu(bitmap_super_t *sb)
19 {
20 sb->magic = __le32_to_cpu(sb->magic);
21 sb->version = __le32_to_cpu(sb->version);
22@@ -34,7 +34,7 @@ inline void sb_le_to_cpu(bitmap_super_t
23 sb->write_behind = __le32_to_cpu(sb->write_behind);
24 }
25
26-inline void sb_cpu_to_le(bitmap_super_t *sb)
27+static inline void sb_cpu_to_le(bitmap_super_t *sb)
28 {
29 sb_le_to_cpu(sb); /* these are really the same thing */
30 }
31@@ -74,7 +74,7 @@ typedef struct bitmap_info_s {
32 } bitmap_info_t;
33
34 /* count the dirty bits in the first num_bits of byte */
35-inline int count_dirty_bits_byte(char byte, int num_bits)
36+static inline int count_dirty_bits_byte(char byte, int num_bits)
37 {
38 int num = 0;
39
diff --git a/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch b/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
index 143a8d952e..c656d073e3 100644
--- a/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
+++ b/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
@@ -5,22 +5,21 @@ Upstream-Status: Pending
5 5
6Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> 6Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
7 7
8diff --git a/monitor.c b/monitor.c 8Index: mdadm-3.3.4/monitor.c
9index f81e707..19ea041 100644 9===================================================================
10--- a/monitor.c 10--- mdadm-3.3.4.orig/monitor.c
11+++ b/monitor.c 11+++ mdadm-3.3.4/monitor.c
12@@ -260,8 +260,13 @@ static int read_and_act(struct active_array *a) 12@@ -257,9 +257,12 @@ static int read_and_act(struct active_ar
13 mdi->curr_state = read_dev_state(mdi->state_fd);
14 }
13 } 15 }
14 16-
15 gettimeofday(&tv, NULL); 17 gettimeofday(&tv, NULL);
16+#if defined(__x86_64__) && defined(__ILP32__) 18+#if defined(__x86_64__) && defined(__ILP32__)
17+ dprintf("%s(%d): %lld.%06lld state:%s prev:%s action:%s prev: %s start:%llu\n", 19+ dprintf("(%d): %lld.%06lld state:%s prev:%s action:%s prev: %s start:%llu\n",
18+#else 20+#else
19 dprintf("%s(%d): %ld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n", 21 dprintf("(%d): %ld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n",
20- __func__, a->info.container_member,
21+#endif 22+#endif
22+ __func__, 23 a->info.container_member,
23+ a->info.container_member,
24 tv.tv_sec, tv.tv_usec, 24 tv.tv_sec, tv.tv_usec,
25 array_states[a->curr_state], 25 array_states[a->curr_state],
26 array_states[a->prev_state],