diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-08-22 08:52:58 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-30 12:35:54 +0100 |
commit | 36e8f935a139efc877dd2aee84f07771325dfad0 (patch) | |
tree | 09609d88c12cf590682951a9679ba58a672c36b9 /meta/recipes-extended/mdadm/files | |
parent | 9d46958079f5c4df0694b5749b96582ab43830b6 (diff) | |
download | openembedded-core-contrib-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.patch | 39 | ||||
-rw-r--r-- | meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch | 23 |
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 @@ -with gnu11 turning on a default with gcc-5 we have to abide by new inline semantics -using 'inline' and using is in same translation unit means an external definition has to exist -same like "external inline" in gnu89, we simply make the functions static inline since they -are just meant to be used in this file - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: mdadm-3.3.2/bitmap.c -=================================================================== ---- mdadm-3.3.2.orig/bitmap.c -+++ mdadm-3.3.2/bitmap.c -@@ -20,7 +20,7 @@ - - #include "mdadm.h" - --inline void sb_le_to_cpu(bitmap_super_t *sb) -+static inline void sb_le_to_cpu(bitmap_super_t *sb) - { - sb->magic = __le32_to_cpu(sb->magic); - sb->version = __le32_to_cpu(sb->version); -@@ -34,7 +34,7 @@ inline void sb_le_to_cpu(bitmap_super_t - sb->write_behind = __le32_to_cpu(sb->write_behind); - } - --inline void sb_cpu_to_le(bitmap_super_t *sb) -+static inline void sb_cpu_to_le(bitmap_super_t *sb) - { - sb_le_to_cpu(sb); /* these are really the same thing */ - } -@@ -74,7 +74,7 @@ typedef struct bitmap_info_s { - } bitmap_info_t; - - /* count the dirty bits in the first num_bits of byte */ --inline int count_dirty_bits_byte(char byte, int num_bits) -+static inline int count_dirty_bits_byte(char byte, int num_bits) - { - int num = 0; - 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 Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> -diff --git a/monitor.c b/monitor.c -index f81e707..19ea041 100644 ---- a/monitor.c -+++ b/monitor.c -@@ -260,8 +260,13 @@ static int read_and_act(struct active_array *a) +Index: mdadm-3.3.4/monitor.c +=================================================================== +--- mdadm-3.3.4.orig/monitor.c ++++ mdadm-3.3.4/monitor.c +@@ -257,9 +257,12 @@ static int read_and_act(struct active_ar + mdi->curr_state = read_dev_state(mdi->state_fd); + } } - +- gettimeofday(&tv, NULL); +#if defined(__x86_64__) && defined(__ILP32__) -+ dprintf("%s(%d): %lld.%06lld state:%s prev:%s action:%s prev: %s start:%llu\n", ++ dprintf("(%d): %lld.%06lld state:%s prev:%s action:%s prev: %s start:%llu\n", +#else - dprintf("%s(%d): %ld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n", -- __func__, a->info.container_member, + dprintf("(%d): %ld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n", +#endif -+ __func__, -+ a->info.container_member, + a->info.container_member, tv.tv_sec, tv.tv_usec, array_states[a->curr_state], - array_states[a->prev_state], |