mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-19 06:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

e2fsprogs: Drop unneeded custom staging function by improving do_install and convert to use BBCLASSEXTEND for -native recipe

Browse Source 
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
2009-11-17 23:48:54 +00:00
parent e4d0c6479e
commit 90a50d59d9
3 changed files with 9 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
meta/packages/e2fsprogs/e2fsprogs-native_1.41.5.bb
View File

@@ -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
}

4
meta/packages/e2fsprogs/e2fsprogs.inc
View File

@@ -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"

39
meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb
View File

@@ -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"