summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-06-02 12:04:37 +0100
committerJoshua Lock <josh@linux.intel.com>2010-06-02 15:25:23 +0100
commitc4476f7914145f7816868700f1ee1cb352056c21 (patch)
tree4fe1c25ea88f07de0ba2ae7d2c334a1b1f6ee6dc /meta/packages
parent7ada79de07b207b3791517ab29c9302fe8f24b14 (diff)
downloadpoky-c4476f7914145f7816868700f1ee1cb352056c21.tar.gz
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>
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/e2fsprogs/e2fsprogs.inc4
-rw-r--r--meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb6
2 files changed, 4 insertions, 6 deletions
diff --git a/meta/packages/e2fsprogs/e2fsprogs.inc b/meta/packages/e2fsprogs/e2fsprogs.inc
index 63a56bc5cd..dc7d326bba 100644
--- a/meta/packages/e2fsprogs/e2fsprogs.inc
+++ b/meta/packages/e2fsprogs/e2fsprogs.inc
@@ -2,12 +2,10 @@ DESCRIPTION = "EXT2 Filesystem Utilities"
2HOMEPAGE = "http://e2fsprogs.sf.net" 2HOMEPAGE = "http://e2fsprogs.sf.net"
3LICENSE = "GPL" 3LICENSE = "GPL"
4SECTION = "base" 4SECTION = "base"
5DEPENDS = "gettext" 5DEPENDS = "gettext util-linux"
6 6
7SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \ 7SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
8 file://mkdir.patch;patch=1" 8 file://mkdir.patch;patch=1"
9 9
10inherit autotools 10inherit autotools
11 11
12EXTRA_OECONF = " --enable-dynamic-e2fsck"
13
diff --git a/meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb b/meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb
index 410e1721b8..5360243f16 100644
--- a/meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb
+++ b/meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb
@@ -1,6 +1,6 @@
1require e2fsprogs.inc 1require e2fsprogs.inc
2 2
3PR = "r17" 3PR = "r18"
4 4
5SRC_URI += "file://quotefix.patch;patch=1 \ 5SRC_URI += "file://quotefix.patch;patch=1 \
6 file://acinclude.m4" 6 file://acinclude.m4"
@@ -9,8 +9,8 @@ SRC_URI += "file://quotefix.patch;patch=1 \
9PARALLEL_MAKE = "" 9PARALLEL_MAKE = ""
10 10
11EXTRA_OECONF += " --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid" 11EXTRA_OECONF += " --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid"
12EXTRA_OECONF_darwin = "--enable-dynamic-e2fsck --sbindir=${base_sbindir} --enable-bsd-shlibs" 12EXTRA_OECONF_darwin = "--sbindir=${base_sbindir} --enable-bsd-shlibs"
13EXTRA_OECONF_darwin8 = "--enable-dynamic-e2fsck --sbindir=${base_sbindir} --enable-bsd-shlibs" 13EXTRA_OECONF_darwin8 = "--sbindir=${base_sbindir} --enable-bsd-shlibs"
14 14
15do_configure_prepend () { 15do_configure_prepend () {
16 cp ${WORKDIR}/acinclude.m4 ${S}/ 16 cp ${WORKDIR}/acinclude.m4 ${S}/