summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 dd0dcea6bf..0000000000
--- a/meta/packages/e2fsprogs/e2fsprogs-native_1.41.5.bb
+++ /dev/null
@@ -1,35 +0,0 @@
1require e2fsprogs_${PV}.bb
2inherit native
3
4DEPENDS = "gettext-native"
5PR = "r2"
6
7do_stage () {
8 #oe_libinstall -a -C lib libblkid ${STAGING_LIBDIR}/
9 oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/
10 oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/
11 oe_libinstall -a -C lib libuuid ${STAGING_LIBDIR}/
12 install -d ${STAGING_BINDIR_NATIVE}/
13 for b in ${e2miscbins}; do
14 install -m 0755 misc/$b ${STAGING_BINDIR_NATIVE}/ || die "failed to install $b"
15 done
16 install -d ${STAGING_INCDIR}/e2p
17 for h in ${e2pheaders}; do
18 install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h"
19 done
20 install -d ${STAGING_INCDIR}/ext2fs
21 for h in ${ext2fsheaders}; do
22 install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h"
23 done
24 #install -d ${STAGING_INCDIR}/blkid
25 #for h in blkid.h blkid_types.h; do
26 # install -m 0644 lib/blkid/$h ${STAGING_INCDIR}/blkid/ || die "failed to install $h"
27 #done
28 install -d ${STAGING_INCDIR}/uuid
29 install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ || die "failed to install $h"
30
31 install -d ${STAGING_LIBDIR}/pkgconfig
32 for pc in lib/*/*.pc; do
33 install -m 0644 $pc ${STAGING_LIBDIR}/pkgconfig/ || die "failed to install $h"
34 done
35}
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
11 11
12EXTRA_OECONF = " --enable-dynamic-e2fsck" 12EXTRA_OECONF = " --enable-dynamic-e2fsck"
13 13
14e2miscbins = "mke2fs badblocks tune2fs dumpe2fs blkid logsave e2image fsck \
15 e2undo chattr lsattr uuidgen mklost+found filefrag uuidd e2initrd_helper"
16
17
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 () {
15 ( cd util; ${BUILD_CC} subst.c -o subst ) 15 ( cd util; ${BUILD_CC} subst.c -o subst )
16} 16}
17 17
18ext2fsheaders = "ext2_ext_attr.h bitops.h ext2_err.h \ 18do_install () {
19 ext2_types.h ext2_fs.h ext2_io.h \ 19 oe_runmake 'DESTDIR=${D}' install
20 ext2fs.h ext3_extents.h" 20 oe_runmake 'DESTDIR=${D}' install-libs
21e2pheaders = "e2p.h" 21 # We use blkid from util-linux now so remove from here
22 22 rm -f ${D}${libdir}/libblkid*
23do_stage () { 23 rm -rf ${D}${includedir}/blkid
24 #oe_libinstall -a -C lib libblkid ${STAGING_LIBDIR}/ 24 rm -f ${D}${libdir}/pkgconfig/blkid.oc
25 oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/
26 oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/
27 oe_libinstall -a -C lib libuuid ${STAGING_LIBDIR}/
28 install -d ${STAGING_INCDIR}/e2p
29 for h in ${e2pheaders}; do
30 install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h"
31 done
32 install -d ${STAGING_INCDIR}/ext2fs
33 for h in ${ext2fsheaders}; do
34 install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h"
35 done
36 #install -d ${STAGING_INCDIR}/blkid
37 #for h in blkid.h blkid_types.h; do
38 # install -m 0644 lib/blkid/$h ${STAGING_INCDIR}/blkid/ || die "failed to install $h"
39 #done
40 install -d ${STAGING_INCDIR}/uuid
41 install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ || die "failed to install $h"
42
43 install -d ${STAGING_LIBDIR}/pkgconfig
44 rm lib/*/blkid.pc
45 for pc in lib/*/*.pc; do
46 install -m 0644 $pc ${STAGING_LIBDIR}/pkgconfig/ || die "failed to install $h"
47 done
48} 25}
49 26
50# blkid used to be part of e2fsprogs but is useful outside, add it 27# 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*"
61FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs" 38FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
62FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" 39FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
63FILES_libuuid = "${libdir}/libuuid.so.*" 40FILES_libuuid = "${libdir}/libuuid.so.*"
41
42BBCLASSEXTEND = "native"