summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/mdadm/files
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2015-03-15 09:02:14 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-20 23:56:03 +0000
commit3732fdec0a22a6d8de7f9a9858c60b8e492d2dc0 (patch)
treeea2c4aa98e79958d69c365ab447217bedd98c833 /meta/recipes-extended/mdadm/files
parent8e19349b696d4a3e8576ba64e935cf3a43bc7940 (diff)
downloadpoky-3732fdec0a22a6d8de7f9a9858c60b8e492d2dc0.tar.gz
mdadm: Fix build in x32 ABI
Add a patch for fix build in x32 ABI, the fail is cause by time_t printf because time_t is long int in x64 and long long int in x32. [YOCTO #7422] (From OE-Core rev: 753994a2016758ec058822d727b05ef9532b97c8) Signed-off-by: Aníbal Limón <anibal.limon@linux.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/mdadm-3.3.2_x32_abi_time_t.patch26
1 files changed, 26 insertions, 0 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
new file mode 100644
index 0000000000..143a8d952e
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
@@ -0,0 +1,26 @@
1When try to print time_t values as a long int it causes an error because time_t
2data type in x32 ABI is long long int.
3
4Upstream-Status: Pending
5
6Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
7
8diff --git a/monitor.c b/monitor.c
9index f81e707..19ea041 100644
10--- a/monitor.c
11+++ b/monitor.c
12@@ -260,8 +260,13 @@ static int read_and_act(struct active_array *a)
13 }
14
15 gettimeofday(&tv, NULL);
16+#if defined(__x86_64__) && defined(__ILP32__)
17+ dprintf("%s(%d): %lld.%06lld state:%s prev:%s action:%s prev: %s start:%llu\n",
18+#else
19 dprintf("%s(%d): %ld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n",
20- __func__, a->info.container_member,
21+#endif
22+ __func__,
23+ a->info.container_member,
24 tv.tv_sec, tv.tv_usec,
25 array_states[a->curr_state],
26 array_states[a->prev_state],