e2fsprogs: Sync with OE, add -native version

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1218 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 37 insertions, 10 deletions

diff --git a/meta/packages/e2fsprogs/e2fsprogs-native_1.38.bb b/meta/packages/e2fsprogs/e2fsprogs-native_1.38.bb
new file mode 100644
index 0000000000..8d1d580c90
--- /dev/null
+++ b/meta/packages/e2fsprogs/e2fsprogs-native_1.38.bb
@@ -0,0 +1,20 @@
+SECTION = "base"
+require e2fsprogs_${PV}.bb
+inherit native
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+PACKAGES = ""
+DEPENDS = ""
+
+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/meta/packages/e2fsprogs/e2fsprogs.inc b/meta/packages/e2fsprogs/e2fsprogs.inc
new file mode 100644
index 0000000000..b6bb469cd3
--- /dev/null
+++ b/meta/packages/e2fsprogs/e2fsprogs.inc
@@ -0,0 +1,12 @@
+DESCRIPTION = "EXT2 Filesystem Utilities"
+HOMEPAGE = "http://e2fsprogs.sf.net"
+LICENSE = "GPL"
+SECTION = "base"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz"
+
+inherit autotools
+
+EXTRA_OECONF = " --enable-dynamic-e2fsck"
+
+
diff --git a/meta/packages/e2fsprogs/e2fsprogs_1.38.bb b/meta/packages/e2fsprogs/e2fsprogs_1.38.bb
index ec28bff31a..a909419437 100644
--- a/meta/packages/e2fsprogs/e2fsprogs_1.38.bb
+++ b/meta/packages/e2fsprogs/e2fsprogs_1.38.bb
@@ -1,18 +1,13 @@
-DESCRIPTION = "EXT2 Filesystem Utilities"
-HOMEPAGE = "http://e2fsprogs.sourceforge.net"
-LICENSE = "GPL"
-SECTION = "base"
+require e2fsprogs.inc
+
 PR = "r6"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
-        file://no-hardlinks.patch;patch=1"
+SRC_URI += "file://no-hardlinks.patch;patch=1"
 S = "${WORKDIR}/e2fsprogs-${PV}"
 
 PARALLEL_MAKE = ""
 
-inherit autotools
-
-EXTRA_OECONF = "--enable-dynamic-e2fsck --sbindir=${base_sbindir}"
+EXTRA_OECONF += " --sbindir=${base_sbindir}"
 
 do_compile_prepend () {
         find ./ -print|xargs chmod u=rwX
@@ -49,4 +44,4 @@ FILES_e2fsprogs-fsck = "${base_sbindir}/fsck"
 FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
 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"
\ No newline at end of file
+FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"