summaryrefslogtreecommitdiff
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-17 23:48:54 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-17 23:48:54 +0000
commit90a50d59d97a58b66c836d5cda459acd5407a4fc (patch)
tree7a42132b0c238a0134c88450b792e949e6385f93 /meta/packages
parente4d0c6479e04f8fa88686570dd0b2847abe75d56 (diff)
downloadopenembedded-core-90a50d59d97a58b66c836d5cda459acd5407a4fc.tar.gz
openembedded-core-90a50d59d97a58b66c836d5cda459acd5407a4fc.tar.bz2
openembedded-core-90a50d59d97a58b66c836d5cda459acd5407a4fc.tar.xz
openembedded-core-90a50d59d97a58b66c836d5cda459acd5407a4fc.zip
e2fsprogs: Drop unneeded custom staging function by improving do_install and convert to use BBCLASSEXTEND for -native recipe
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/e2fsprogs/e2fsprogs-native_1.41.5.bb35
-rw-r--r--meta/packages/e2fsprogs/e2fsprogs.inc4
-rw-r--r--meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb39
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 dd0dcea6b..000000000
--- 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 aa8fc8f51..63a56bc5c 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 f20924081..7eb1bde41 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"