Patchwork [1/3] e2fsprogs: fix multilib header conflict - ext2_types.h

login
register
mail settings
Submitter Ming Liu
Date April 7, 2014, 11:27 a.m.
Message ID <1396870039-26834-1-git-send-email-ming.liu@windriver.com>
Download mbox | patch
Permalink /patch/70205/
State Accepted
Commit b3f71950616228fb378da9173345cc341018e101
Headers show

Comments

Ming Liu - April 7, 2014, 11:27 a.m.
ext2_types.h conflicts between 32-bit and 64-bit versions.

Signed-off-by: Ming Liu <ming.liu@windriver.com>
---
 meta/recipes-devtools/e2fsprogs/e2fsprogs.inc       | 3 +--
 meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)
Khem Raj - April 7, 2014, 7:50 p.m.
On Apr 7, 2014 1:28 AM, "Ming Liu" <ming.liu@windriver.com> wrote:
>
> ext2_types.h conflicts between 32-bit and 64-bit versions.
>

can you explain the conflicts
may be they can be addressed

> Signed-off-by: Ming Liu <ming.liu@windriver.com>
> ---
>  meta/recipes-devtools/e2fsprogs/e2fsprogs.inc       | 3 +--
>  meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb | 2 ++
>  2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
> index a34df37..99447c1 100644
> --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
> +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
> @@ -22,5 +22,4 @@ DEPENDS = "util-linux"
>  SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
>             file://mkdir.patch"
>
> -inherit autotools gettext pkgconfig
> -
> +inherit autotools gettext pkgconfig multilib_header
> diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bbb/meta/recipes-devtools/e2fsprogs/
e2fsprogs_1.42.9.bb
> index 3a5d6ee..2bdd724 100644
> --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
> +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
> @@ -52,6 +52,8 @@ do_install () {
>                 mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir}
>                 mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
>         fi
> +
> +       oe_multilib_header ext2fs/ext2_types.h
>  }
>
>  RDEPENDS_e2fsprogs = "e2fsprogs-badblocks"
> --
> 1.8.4.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
index a34df37..99447c1 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
@@ -22,5 +22,4 @@  DEPENDS = "util-linux"
 SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
            file://mkdir.patch"
 
-inherit autotools gettext pkgconfig
-
+inherit autotools gettext pkgconfig multilib_header
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
index 3a5d6ee..2bdd724 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
@@ -52,6 +52,8 @@  do_install () {
 		mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir}
 		mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
 	fi
+
+	oe_multilib_header ext2fs/ext2_types.h
 }
 
 RDEPENDS_e2fsprogs = "e2fsprogs-badblocks"