diff options
| -rw-r--r-- | meta/packages/e2fsprogs/e2fsprogs-native_1.41.5.bb | 35 | ||||
| -rw-r--r-- | meta/packages/e2fsprogs/e2fsprogs.inc | 4 | ||||
| -rw-r--r-- | meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb | 39 |
3 files changed, 9 insertions, 69 deletions
diff --git a/meta/packages/e2fsprogs/e2fsprogs-native_1.41.5.bb b/meta/packages/e2fsprogs/e2fsprogs-native_1.41.5.bb deleted file mode 100644 index dd0dcea6bf..0000000000 --- a/meta/packages/e2fsprogs/e2fsprogs-native_1.41.5.bb +++ /dev/null @@ -1,35 +0,0 @@ -require e2fsprogs_${PV}.bb -inherit native - -DEPENDS = "gettext-native" -PR = "r2" - -do_stage () { - #oe_libinstall -a -C lib libblkid ${STAGING_LIBDIR}/ - oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/ - oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/ - oe_libinstall -a -C lib libuuid ${STAGING_LIBDIR}/ - install -d ${STAGING_BINDIR_NATIVE}/ - for b in ${e2miscbins}; do - install -m 0755 misc/$b ${STAGING_BINDIR_NATIVE}/ || die "failed to install $b" - done - install -d ${STAGING_INCDIR}/e2p - for h in ${e2pheaders}; do - install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h" - done - install -d ${STAGING_INCDIR}/ext2fs - for h in ${ext2fsheaders}; do - install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h" - done - #install -d ${STAGING_INCDIR}/blkid - #for h in blkid.h blkid_types.h; do - # install -m 0644 lib/blkid/$h ${STAGING_INCDIR}/blkid/ || die "failed to install $h" - #done - install -d ${STAGING_INCDIR}/uuid - install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ || die "failed to install $h" - - install -d ${STAGING_LIBDIR}/pkgconfig - for pc in lib/*/*.pc; do - install -m 0644 $pc ${STAGING_LIBDIR}/pkgconfig/ || die "failed to install $h" - done -} diff --git a/meta/packages/e2fsprogs/e2fsprogs.inc b/meta/packages/e2fsprogs/e2fsprogs.inc index aa8fc8f510..63a56bc5cd 100644 --- a/meta/packages/e2fsprogs/e2fsprogs.inc +++ b/meta/packages/e2fsprogs/e2fsprogs.inc @@ -11,7 +11,3 @@ inherit autotools EXTRA_OECONF = " --enable-dynamic-e2fsck" -e2miscbins = "mke2fs badblocks tune2fs dumpe2fs blkid logsave e2image fsck \ - e2undo chattr lsattr uuidgen mklost+found filefrag uuidd e2initrd_helper" - - diff --git a/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb b/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb index f209240810..7eb1bde41f 100644 --- a/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb +++ b/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb @@ -15,36 +15,13 @@ do_compile_prepend () { ( cd util; ${BUILD_CC} subst.c -o subst ) } -ext2fsheaders = "ext2_ext_attr.h bitops.h ext2_err.h \ - ext2_types.h ext2_fs.h ext2_io.h \ - ext2fs.h ext3_extents.h" -e2pheaders = "e2p.h" - -do_stage () { - #oe_libinstall -a -C lib libblkid ${STAGING_LIBDIR}/ - oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/ - oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/ - oe_libinstall -a -C lib libuuid ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/e2p - for h in ${e2pheaders}; do - install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h" - done - install -d ${STAGING_INCDIR}/ext2fs - for h in ${ext2fsheaders}; do - install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h" - done - #install -d ${STAGING_INCDIR}/blkid - #for h in blkid.h blkid_types.h; do - # install -m 0644 lib/blkid/$h ${STAGING_INCDIR}/blkid/ || die "failed to install $h" - #done - install -d ${STAGING_INCDIR}/uuid - install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ || die "failed to install $h" - - install -d ${STAGING_LIBDIR}/pkgconfig - rm lib/*/blkid.pc - for pc in lib/*/*.pc; do - install -m 0644 $pc ${STAGING_LIBDIR}/pkgconfig/ || die "failed to install $h" - done +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}${libdir}/libblkid* + rm -rf ${D}${includedir}/blkid + rm -f ${D}${libdir}/pkgconfig/blkid.oc } # blkid used to be part of e2fsprogs but is useful outside, add it @@ -61,3 +38,5 @@ FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*" FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs" FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" FILES_libuuid = "${libdir}/libuuid.so.*" + +BBCLASSEXTEND = "native" |