diff options
author | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2010-02-12 15:20:34 +0100 |
---|---|---|
committer | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2010-03-09 18:34:21 +0100 |
commit | ef73bcd899aaf182fb596e5912c20f966e0e6951 (patch) | |
tree | 47f6dfdd36740c1d2e0c731ed9154713d0be61ca /recipes/e2fsprogs/e2fsprogs.inc | |
parent | 475475704f711a7676eca0f63b6b27769544bf67 (diff) | |
download | openembedded-ef73bcd899aaf182fb596e5912c20f966e0e6951.tar.gz |
e2fsprogs: move libblkid/libuuid/fsck to util-linux-ng + new staging/native
Dropped libblkid, libuuid and fsck binary and use those which are in
util-linux-ng.
There are more and more applications/libraries which require libblkid
2.xx - for example recent HAL.
Unified recipes, moved to new staging, used BBCLASSEXTEND for native.
Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Diffstat (limited to 'recipes/e2fsprogs/e2fsprogs.inc')
-rw-r--r-- | recipes/e2fsprogs/e2fsprogs.inc | 120 |
1 files changed, 118 insertions, 2 deletions
diff --git a/recipes/e2fsprogs/e2fsprogs.inc b/recipes/e2fsprogs/e2fsprogs.inc index 6821d71004..2ff3e10896 100644 --- a/recipes/e2fsprogs/e2fsprogs.inc +++ b/recipes/e2fsprogs/e2fsprogs.inc @@ -2,21 +2,137 @@ DESCRIPTION = "EXT2 Filesystem Utilities" HOMEPAGE = "http://e2fsprogs.sf.net" LICENSE = "GPL" SECTION = "base" +DEPENDS = "gettext-native util-linux-ng" +DEPENDS_virtclass-native = "gettext-native" SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz" S = "${WORKDIR}/e2fsprogs-${PV}" +INC_PR = "r21a" + inherit autotools #if uclibc ntpl is merged into trunk we can enable tls for armv4 again EXTRA_OECONF = "${@['','--disable-tls'][bb.data.getVar('ARM_ABI', d, 1) == 'oabi' and \ bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0 ]} \ - --enable-dynamic-e2fsck --disable-nls --sbindir=${base_sbindir}" + --enable-dynamic-e2fsck --disable-nls --sbindir=${base_sbindir} \ + --disable-libuuid --disable-libblkid --disable-fsck" PARALLEL_MAKE = "" -e2miscbins = "mke2fs badblocks tune2fs dumpe2fs blkid logsave e2image fsck \ +do_compile_prepend () { + find ./ -print|xargs chmod u=rwX + ( cd util; ${BUILD_CC} subst.c -o subst ) +} + +e2miscbins = "mke2fs badblocks tune2fs dumpe2fs blkid logsave e2image \ e2undo chattr lsattr uuidgen mklost+found filefrag uuidd e2initrd_helper" +ext2fsheaders = "ext2_ext_attr.h bitops.h ext2_err.h \ + ext2_types.h ext2_fs.h ext2_io.h \ + ext2fs.h" +e2pheaders = "e2p.h" + +do_install_append () { + oe_libinstall -a -C lib libe2p ${D}${libdir}/ + oe_libinstall -a -C lib libext2fs ${D}${libdir}/ + + install -d ${D}${includedir}/e2p + for h in ${e2pheaders}; do + install -m 0644 lib/e2p/$h ${D}${includedir}/e2p/ || die "failed to install $h" + done + + install -d ${D}${includedir}/ext2fs + for h in ${ext2fsheaders}; do + install -m 0644 lib/ext2fs/$h ${D}${includedir}/ext2fs/ || die "failed to install $h" + done + + mv ${D}${base_sbindir}/e2fsck ${D}${base_sbindir}/e2fsck.${PN} + rm ${D}${base_sbindir}/fsck.ext2 + rm ${D}${base_sbindir}/fsck.ext3 + rm ${D}${base_sbindir}/fsck.ext4* + mv ${D}${base_sbindir}/mke2fs ${D}${base_sbindir}/mke2fs.${PN} + rm ${D}${base_sbindir}/mkfs.ext2 + rm ${D}${base_sbindir}/mkfs.ext3 + rm ${D}${base_sbindir}/mkfs.ext4* + + cd ${D}/${base_sbindir} + ln -sf ./e2fsck.${PN} fsck.ext2.${PN} + ln -sf ./e2fsck.${PN} fsck.ext3.${PN} + ln -sf ./e2fsck.${PN} fsck.ext4.${PN} + ln -sf ./e2fsck.${PN} fsck.ext4dev.${PN} + ln -sf ./mke2fs.${PN} mkfs.ext2.${PN} + ln -sf ./mke2fs.${PN} mkfs.ext3.${PN} + ln -sf ./mke2fs.${PN} mkfs.ext4.${PN} + ln -sf ./mke2fs.${PN} mkfs.ext4dev.${PN} + + ln -sf ./tune2fs findfs + ln -sf ./tune2fs e2label + + mv ${D}${bindir}/chattr ${D}${bindir}/chattr.${PN} +} + +pkg_postinst_e2fsprogs () { + update-alternatives --install ${base_bindir}/chattr chattr chattr.${PN} 100 +} + +pkg_prerm_e2fsprogs () { + update-alternatives --remove chattr chattr.${PN} +} + + +pkg_postinst_e2fsprogs-blkid () { + update-alternatives --install ${base_sbindir}/blkid blkid blkid.${PN} 100 +} + +pkg_prerm_e2fsprogs-blkid () { + update-alternatives --remove blkid blkid.${PN} +} + +pkg_postinst_e2fsprogs-e2fsck () { + update-alternatives --install ${base_sbindir}/e2fsck e2fsck e2fsck.${PN} 100 + update-alternatives --install ${base_sbindir}/fsck.ext2 fsck.ext2 fsck.ext2.${PN} 100 + update-alternatives --install ${base_sbindir}/fsck.ext3 fsck.ext3 fsck.ext3.${PN} 100 + update-alternatives --install ${base_sbindir}/fsck.ext4 fsck.ext4 fsck.ext4.${PN} 100 + update-alternatives --install ${base_sbindir}/fsck.ext4dev fsck.ext4dev fsck.ext4dev.${PN} 100 +} + +pkg_prerm_e2fsprogs-e2fsck () { + update-alternatives --remove e2fsck e2fsck.${PN} + update-alternatives --remove fsck.ext2 fsck.ext2.${PN} + update-alternatives --remove fsck.ext3 fsck.ext3.${PN} + update-alternatives --remove fsck.ext4 fsck.ext4.${PN} + update-alternatives --remove fsck.ext4dev fsck.ext4dev.${PN} +} + +pkg_postinst_e2fsprogs-mke2fs () { + update-alternatives --install ${base_sbindir}/mke2fs mke2fs mke2fs.${PN} 100 + update-alternatives --install ${base_sbindir}/mkfs.ext2 mkfs.ext2 mkfs.ext2.${PN} 100 + update-alternatives --install ${base_sbindir}/mkfs.ext3 mkfs.ext3 mkfs.ext3.${PN} 100 + update-alternatives --install ${base_sbindir}/mkfs.ext4 mkfs.ext4 mkfs.ext4.${PN} 100 + update-alternatives --install ${base_sbindir}/mkfs.ext4dev mkfs.ext4dev mkfs.ext4dev.${PN} 100 +} + +pkg_prerm_e2fsprogs-mke2fs () { + update-alternatives --remove mke2fs mke2fs.${PN} + update-alternatives --remove mkfs.ext2 mkfs.ext2.${PN} + update-alternatives --remove mkfs.ext3 mkfs.ext3.${PN} + update-alternatives --remove mkfs.ext4 mkfs.ext4.${PN} + update-alternatives --remove mkfs.ext4dev mkfs.ext4dev.${PN} +} + +# blkid used to be part of e2fsprogs but is useful outside, add it +# as an RDEPENDS so that anything relying on it being in e2fsprogs +# still works +RDEPENDS_e2fsprogs = "util-linux-ng e2fsprogs-badblocks" + +FILES_${PN} += "${libdir}/e2initrd_helper" + +PACKAGES =+ "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-tune2fs e2fsprogs-badblocks" +FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck.${PN} ${base_sbindir}/fsck.ext*.${PN}" +FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs.${PN} ${base_sbindir}/mkfs.ext*.${PN}" +FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs" +FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" +BBCLASSEXTEND = "native" |