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:34:14 +0100 |
| commit | 0d0a591fca9fadd786f0ccda05cd68c295d6bb21 (patch) | |
| tree | 1d62e65417897cc1d1cd465e4d5a17f229bd2671 /meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch | |
| parent | 443f9efa457ab57be8f79bccec8250678d4065c5 (diff) | |
| download | openembedded-core-contrib-0d0a591fca9fadd786f0ccda05cd68c295d6bb21.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)
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/mdadm-3.3.2_x32_abi_time_t.patch')
| -rw-r--r-- | meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch | 23 |
1 files changed, 11 insertions, 12 deletions
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], |