<html>
<head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<div class="moz-cite-prefix">On 04/08/2014 03:50 AM, Khem Raj wrote:<br>
</div>
<blockquote
cite="mid:CAMKF1soQs+xKTK3gQemohdN0Mgu05PWYAvbjXDopFM2H1qwGuw@mail.gmail.com"
type="cite">
<meta http-equiv="Context-Type" content="text/html; charset=UTF-8">
<p dir="ltr"><br>
</p>
<p dir="ltr">On Apr 7, 2014 1:28 AM, "Ming Liu" <<a
moz-do-not-send="true" href="mailto:ming.liu@windriver.com">ming.liu@windriver.com</a>>
wrote:<br>
><br>
> ext2_types.h conflicts between 32-bit and 64-bit versions.<br>
></p>
<p dir="ltr">can you explain the conflicts<br>
may be they can be addressed</p>
</blockquote>
Yes, of course, see the following diff output of 64bits and 32bits
ext2_types.h :<br>
diff -urpN /tmp/64bits/ext2_types.h /tmp/32bits/ext2_types.h<br>
--- /tmp/64bits/ext2_types.h<br>
+++ /tmp/32bits/ext2_types.h<br>
@@ -63,7 +63,7 @@ typedef __U32_TYPEDEF __u32;<br>
#if (4 == 4)<br>
typedef unsigned int __u32;<br>
#else<br>
-#if (8 == 4)<br>
+#if (4 == 4)<br>
typedef unsigned long __u32;<br>
#else<br>
#if (2 == 4)<br>
@@ -81,7 +81,7 @@ typedef __S32_TYPEDEF __s32;<br>
#if (4 == 4)<br>
typedef int __s32;<br>
#else<br>
-#if (8 == 4)<br>
+#if (4 == 4)<br>
typedef long __s32;<br>
#else<br>
#if (2 == 4)<br>
@@ -102,7 +102,7 @@ typedef unsigned int __u64;<br>
#if (8 == 8)<br>
typedef unsigned long long __u64;<br>
#else<br>
-#if (8 == 8)<br>
+#if (4 == 8)<br>
typedef unsigned long __u64;<br>
#endif /* SIZEOF_LONG_LONG == 8 */<br>
#endif /* SIZEOF_LONG == 8 */<br>
@@ -122,7 +122,7 @@ typedef __signed__ long long __s64;<br>
typedef signed long long __s64;<br>
#endif /* __GNUC__ */<br>
#else<br>
-#if (8 == 8)<br>
+#if (4 == 8)<br>
typedef long __s64;<br>
#endif /* SIZEOF_LONG_LONG == 8 */<br>
#endif /* SIZEOF_LONG == 8 */<br>
<br>
ext2_types.h conflicts between 32-bit and 64-bit versions.<br>
<br>
//Ming Liu<br>
<blockquote
cite="mid:CAMKF1soQs+xKTK3gQemohdN0Mgu05PWYAvbjXDopFM2H1qwGuw@mail.gmail.com"
type="cite">
<p dir="ltr">> Signed-off-by: Ming Liu <<a
moz-do-not-send="true" href="mailto:ming.liu@windriver.com">ming.liu@windriver.com</a>><br>
> ---<br>
> meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 3
+--<br>
> meta/recipes-devtools/e2fsprogs/<a moz-do-not-send="true"
href="http://e2fsprogs_1.42.9.bb">e2fsprogs_1.42.9.bb</a> | 2
++<br>
> 2 files changed, 3 insertions(+), 2 deletions(-)<br>
><br>
> diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc<br>
> index a34df37..99447c1 100644<br>
> --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc<br>
> +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc<br>
> @@ -22,5 +22,4 @@ DEPENDS = "util-linux"<br>
> SRC_URI =
"${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \<br>
> <a class="moz-txt-link-freetext" href="file://mkdir.patch">file://mkdir.patch</a>"<br>
><br>
> -inherit autotools gettext pkgconfig<br>
> -<br>
> +inherit autotools gettext pkgconfig multilib_header<br>
> diff --git a/meta/recipes-devtools/e2fsprogs/<a
moz-do-not-send="true" href="http://e2fsprogs_1.42.9.bb">e2fsprogs_1.42.9.bb</a>
b/meta/recipes-devtools/e2fsprogs/<a moz-do-not-send="true"
href="http://e2fsprogs_1.42.9.bb">e2fsprogs_1.42.9.bb</a><br>
> index 3a5d6ee..2bdd724 100644<br>
> --- a/meta/recipes-devtools/e2fsprogs/<a
moz-do-not-send="true" href="http://e2fsprogs_1.42.9.bb">e2fsprogs_1.42.9.bb</a><br>
> +++ b/meta/recipes-devtools/e2fsprogs/<a
moz-do-not-send="true" href="http://e2fsprogs_1.42.9.bb">e2fsprogs_1.42.9.bb</a><br>
> @@ -52,6 +52,8 @@ do_install () {<br>
> mv ${D}${base_libdir}/e2initrd_helper
${D}${libdir}<br>
> mv ${D}${base_libdir}/pkgconfig
${D}${libdir}<br>
> fi<br>
> +<br>
> + oe_multilib_header ext2fs/ext2_types.h<br>
> }<br>
><br>
> RDEPENDS_e2fsprogs = "e2fsprogs-badblocks"<br>
> --<br>
> 1.8.4.1<br>
><br>
> --<br>
> _______________________________________________<br>
> Openembedded-core mailing list<br>
> <a moz-do-not-send="true"
href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
> <a moz-do-not-send="true"
href="http://lists.openembedded.org/mailman/listinfo/openembedded-core">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</p>
</blockquote>
<br>
</body>
</html>