diff options
author | Scott Garman <scott.a.garman@intel.com> | 2012-03-15 14:12:15 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-21 13:00:47 +0000 |
commit | bb9af542bc69f417d414d92ebf46a9412944c1e1 (patch) | |
tree | d8f0678d19e6993f1afebdee2c0c4a537c5e0a35 /meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb | |
parent | 5fe34f0c6a6808a3abb0107c06b13b3d6ceb4ceb (diff) | |
download | openembedded-core-bb9af542bc69f417d414d92ebf46a9412944c1e1.tar.gz openembedded-core-bb9af542bc69f417d414d92ebf46a9412944c1e1.tar.bz2 openembedded-core-bb9af542bc69f417d414d92ebf46a9412944c1e1.tar.xz openembedded-core-bb9af542bc69f417d414d92ebf46a9412944c1e1.zip |
e2fsprogs: upgrade to 1.42.1
Includes minor tweaks to the formatting of some patch headers and the
addition of a SOB line where needed.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb')
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb new file mode 100644 index 000000000..6df7cea32 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb @@ -0,0 +1,64 @@ +require e2fsprogs.inc + +PR = "r0" + +SRC_URI += "file://fallocate.patch \ + file://acinclude.m4 \ + file://remove.ldconfig.call.patch \ +" + +SRC_URI[md5sum] = "8ed1501ae6746e2e735bdd1407211dc9" +SRC_URI[sha256sum] = "0f1fdc10c6289b6750714490837df9aab691f352d33f5ecb64507704df6ff991" + +EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid --disable-uuidd" +EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs" +EXTRA_OECONF_darwin8 = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs" + +do_configure_prepend () { + cp ${WORKDIR}/acinclude.m4 ${S}/ +} + +do_compile_prepend () { + find ./ -print | grep -v ./patches | xargs chmod u=rwX + ( cd util; ${BUILD_CC} subst.c -o subst ) +} + +do_install () { + oe_runmake 'DESTDIR=${D}' install + oe_runmake 'DESTDIR=${D}' install-libs + # We use blkid from util-linux now so remove from here + rm -f ${D}${base_libdir}/libblkid* + rm -rf ${D}${includedir}/blkid + rm -f ${D}${base_libdir}/pkgconfig/blkid.pc +} + +do_install_append () { + # e2initrd_helper and the pkgconfig files belong in libdir + if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then + install -d ${D}${libdir} + mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir} + mv ${D}${base_libdir}/pkgconfig ${D}${libdir} + fi +} + +# blkid used to be part of e2fsprogs but is useful outside, add it +# as an RDEPENDS_${PN} so that anything relying on it being in e2fsprogs +# still works +RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-badblocks" + +PACKAGES =+ "e2fsprogs-blkid e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks" +PACKAGES =+ "libcomerr libss libe2p libext2fs" + +FILES_e2fsprogs-blkid = "${base_sbindir}/blkid" +FILES_e2fsprogs-fsck = "${base_sbindir}/fsck" +FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*" +FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf" +FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs" +FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" +FILES_libcomerr = "${base_libdir}/libcom_err.so.*" +FILES_libss = "${base_libdir}/libss.so.*" +FILES_libe2p = "${base_libdir}/libe2p.so.*" +FILES_libext2fs = "${libdir}/e2initrd_helper ${libdir}/libext2fs.so.*" +FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so" + +BBCLASSEXTEND = "native" |