From c4476f7914145f7816868700f1ee1cb352056c21 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Wed, 2 Jun 2010 12:04:37 +0100 Subject: 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 --- meta/packages/e2fsprogs/e2fsprogs.inc | 4 +--- meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'meta') diff --git a/meta/packages/e2fsprogs/e2fsprogs.inc b/meta/packages/e2fsprogs/e2fsprogs.inc index 63a56bc5c..dc7d326bb 100644 --- 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 410e1721b..5360243f1 100644 --- 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}/ -- cgit v1.2.3