e2fsprogs: add util-linux to depends

e2fsprogs requires libuuid to build and we have disabled its built in version
in favour of the one in util-linux, therefore we need util-linux in the DEPENDS

Drop old configure option --enable-dynamic-e2fsck

Signed-off-by: Joshua Lock <josh@linux.intel.com>

diff --git a/meta/packages/e2fsprogs/e2fsprogs.inc b/meta/packages/e2fsprogs/e2fsprogs.inc
index 63a56bc5cdd79547bf12fd0c259ac34ab8ece5c5..dc7d326bba7ac2c96ca8184dd2f5a5f9f966d075 100644 (file)
--- a/meta/packages/e2fsprogs/e2fsprogs.inc
+++ b/meta/packages/e2fsprogs/e2fsprogs.inc
@@ -2,12 +2,10 @@ DESCRIPTION = "EXT2 Filesystem Utilities"
 HOMEPAGE = "http://e2fsprogs.sf.net"
 LICENSE = "GPL"
 SECTION = "base"
-DEPENDS = "gettext"
+DEPENDS = "gettext util-linux"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
            file://mkdir.patch;patch=1"
 
 inherit autotools
 
-EXTRA_OECONF = " --enable-dynamic-e2fsck"
-

diff --git a/meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb b/meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb
index 410e1721b804b711f2291228358f8d3d8d8a3ada..5360243f16608bc6124ca0d0030fe45b9ac0d0c6 100644 (file)
--- a/meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb
+++ b/meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb
@@ -1,6 +1,6 @@
 require e2fsprogs.inc
 
-PR = "r17"
+PR = "r18"
 
 SRC_URI += "file://quotefix.patch;patch=1 \
             file://acinclude.m4"
@@ -9,8 +9,8 @@ SRC_URI += "file://quotefix.patch;patch=1 \
 PARALLEL_MAKE = ""
 
 EXTRA_OECONF += " --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid"
-EXTRA_OECONF_darwin = "--enable-dynamic-e2fsck --sbindir=${base_sbindir} --enable-bsd-shlibs"
-EXTRA_OECONF_darwin8 = "--enable-dynamic-e2fsck --sbindir=${base_sbindir} --enable-bsd-shlibs"
+EXTRA_OECONF_darwin = "--sbindir=${base_sbindir} --enable-bsd-shlibs"
+EXTRA_OECONF_darwin8 = "--sbindir=${base_sbindir} --enable-bsd-shlibs"
 
 do_configure_prepend () {
        cp ${WORKDIR}/acinclude.m4 ${S}/