Stage libext2fs and libe2p in the e2fsprogs builds (requirement for e2tools).

BKrev: 4150f161jJ7imQjGMG0sd1FTwjEY7w

4 files changed, 98 insertions, 4 deletions

diff --git a/e2fsprogs/e2fsprogs_1.33.oe b/e2fsprogs/e2fsprogs_1.33.oe
index a9b00d5633..27ef029b4d 100644
--- a/e2fsprogs/e2fsprogs_1.33.oe
+++ b/e2fsprogs/e2fsprogs_1.33.oe
@@ -12,4 +12,33 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
 
 inherit autotools
 
+EXTRA_OECONF = "--enable-dynamic-e2fsck"
+
 sbindir = "/sbin"
+
+PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck "
+FILES_e2fsprogs-fsck = "${sbindir}/fsck"
+FILES_e2fsprogs-e2fsck = "${sbindir}/e2fsck ${sbindir}/fsck.ext2 ${sbindir}/fsck.ext3"
+FILES_e2fsprogs-mke2fs = "${sbindir}/mke2fs ${sbindir}/mkfs.ext2 ${sbindir}/mkfs.ext3"
+
+do_compile_prepend () {
+	find ./ -print|xargs chmod u=rwX
+	( 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"
+e2pheaders = "e2p.h"
+do_stage () {
+	oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/
+	oe_libinstall -a -C lib libext2fs ${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
+}
diff --git a/e2fsprogs/e2fsprogs_1.34.oe b/e2fsprogs/e2fsprogs_1.34.oe
index 90bf367e6b..5026a72a25 100644
--- a/e2fsprogs/e2fsprogs_1.34.oe
+++ b/e2fsprogs/e2fsprogs_1.34.oe
@@ -12,9 +12,33 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
 
 inherit autotools
 
+EXTRA_OECONF = "--enable-dynamic-e2fsck"
+
 sbindir = "/sbin"
 
+PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck "
+FILES_e2fsprogs-fsck = "${sbindir}/fsck"
+FILES_e2fsprogs-e2fsck = "${sbindir}/e2fsck ${sbindir}/fsck.ext2 ${sbindir}/fsck.ext3"
+FILES_e2fsprogs-mke2fs = "${sbindir}/mke2fs ${sbindir}/mkfs.ext2 ${sbindir}/mkfs.ext3"
+
 do_compile_prepend () {
 	find ./ -print|xargs chmod u=rwX
 	( 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"
+e2pheaders = "e2p.h"
+do_stage () {
+	oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/
+	oe_libinstall -a -C lib libext2fs ${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
+}
diff --git a/e2fsprogs/e2fsprogs_1.35.oe b/e2fsprogs/e2fsprogs_1.35.oe
index 90bf367e6b..5026a72a25 100644
--- a/e2fsprogs/e2fsprogs_1.35.oe
+++ b/e2fsprogs/e2fsprogs_1.35.oe
@@ -12,9 +12,33 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
 
 inherit autotools
 
+EXTRA_OECONF = "--enable-dynamic-e2fsck"
+
 sbindir = "/sbin"
 
+PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck "
+FILES_e2fsprogs-fsck = "${sbindir}/fsck"
+FILES_e2fsprogs-e2fsck = "${sbindir}/e2fsck ${sbindir}/fsck.ext2 ${sbindir}/fsck.ext3"
+FILES_e2fsprogs-mke2fs = "${sbindir}/mke2fs ${sbindir}/mkfs.ext2 ${sbindir}/mkfs.ext3"
+
 do_compile_prepend () {
 	find ./ -print|xargs chmod u=rwX
 	( 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"
+e2pheaders = "e2p.h"
+do_stage () {
+	oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/
+	oe_libinstall -a -C lib libext2fs ${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
+}
diff --git a/e2fsprogs/e2fsprogs_1.36-WIP-0408.oe b/e2fsprogs/e2fsprogs_1.36-WIP-0408.oe
index 209b7b1008..6226eab566 100644
--- a/e2fsprogs/e2fsprogs_1.36-WIP-0408.oe
+++ b/e2fsprogs/e2fsprogs_1.36-WIP-0408.oe
@@ -18,12 +18,29 @@ EXTRA_OECONF = "--enable-dynamic-e2fsck"
 
 sbindir = "/sbin"
 
+PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck "
+FILES_e2fsprogs-fsck = "${sbindir}/fsck"
+FILES_e2fsprogs-e2fsck = "${sbindir}/e2fsck ${sbindir}/fsck.ext2 ${sbindir}/fsck.ext3"
+FILES_e2fsprogs-mke2fs = "${sbindir}/mke2fs ${sbindir}/mkfs.ext2 ${sbindir}/mkfs.ext3"
+
 do_compile_prepend () {
 	find ./ -print|xargs chmod u=rwX
 	( cd util; ${BUILD_CC} subst.c -o subst )
 }
 
-PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck "
-FILES_e2fsprogs-fsck = "${sbindir}/fsck"
-FILES_e2fsprogs-e2fsck = "${sbindir}/e2fsck ${sbindir}/fsck.ext2 ${sbindir}/fsck.ext3"
-FILES_e2fsprogs-mke2fs = "${sbindir}/mke2fs ${sbindir}/mkfs.ext2 ${sbindir}/mkfs.ext3"
+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_stage () {
+	oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/
+	oe_libinstall -a -C lib libext2fs ${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
+}