diff options
| author | Khem Raj <raj.khem@gmail.com> | 2009-07-19 09:31:34 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2009-07-19 09:31:34 -0700 |
| commit | 69ef2d4fd54b49281c5187be7a98da78c84346f3 (patch) | |
| tree | 6d1420c8dc55a561acb2fe266e606999aa770ef7 /recipes/e2fsprogs-libs/e2fsprogs-libs.inc | |
| parent | 918aa5c5a17a342eaafad143cdc0ccff059e5884 (diff) | |
e2fsprogs-libs: Add version 1.41.8 and dont provide libblkid and libuuid.
util-linux-ng: Add version 2.16 and provide libblkid and libuuid.
Change the provider for libuuid and libblkid from e2fsprogs-libs
to util-linux-ng.
Diffstat (limited to 'recipes/e2fsprogs-libs/e2fsprogs-libs.inc')
| -rw-r--r-- | recipes/e2fsprogs-libs/e2fsprogs-libs.inc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs.inc b/recipes/e2fsprogs-libs/e2fsprogs-libs.inc index 5b82c11ca1..517771c11b 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs.inc +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs.inc @@ -2,8 +2,9 @@ DESCRIPTION = "EXT2 Filesystem Utilities" LICENSE = "GPL" SECTION = "base" PRIORITY = "optional" +DEPENDS = "util-linux-ng" -inherit autotools pkgconfig +inherit autotools_stage pkgconfig SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ file://configure.patch;patch=1 \ @@ -13,6 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ S = "${WORKDIR}/e2fsprogs-libs-${PV}" FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss" FILES_${PN} = "${bindir}" +EXTRA_OECONF = "--disable-libblkid --disable-libuuid" python populate_packages_prepend () { e2fs_libdir = bb.data.expand('${libdir}', d) @@ -24,18 +26,12 @@ python populate_packages_prepend () { } do_stage () { - for i in libcom_err libss libuuid libblkid; do + for i in libcom_err libss; do oe_libinstall -a -C lib $i ${STAGING_LIBDIR} done install -d ${STAGING_INCDIR}/et \ - ${STAGING_INCDIR}/ss \ - ${STAGING_INCDIR}/uuid \ - ${STAGING_INCDIR}/blkid + ${STAGING_INCDIR}/ss install -m 0644 lib/et/com_err.h ${STAGING_INCDIR}/et/ install -m 0644 lib/ss/ss.h ${STAGING_INCDIR}/ss/ install -m 0644 lib/ss/ss_err.h ${STAGING_INCDIR}/ss/ - install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ - install -m 0644 lib/uuid/uuid_types.h ${STAGING_INCDIR}/uuid/ - install -m 0644 lib/blkid/blkid.h ${STAGING_INCDIR}/blkid/ - install -m 0644 lib/blkid/blkid_types.h ${STAGING_INCDIR}/blkid/ } |