e2fsprogs: unbreak -native version, move common code to .inc from 1.38.bb

diff --git a/packages/e2fsprogs/e2fsprogs-native_1.38.bb b/packages/e2fsprogs/e2fsprogs-native_1.38.bb
index 8d1d580..dcb5c41 100644 (file)
--- a/packages/e2fsprogs/e2fsprogs-native_1.38.bb
+++ b/packages/e2fsprogs/e2fsprogs-native_1.38.bb
@@ -1,20 +1,13 @@
 SECTION = "base"
-require e2fsprogs_${PV}.bb
+require e2fsprogs.inc
 inherit native
 
+EXTRA_OECONF = ""
+
 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
+        oe_runmake install
 }

diff --git a/packages/e2fsprogs/e2fsprogs.inc b/packages/e2fsprogs/e2fsprogs.inc
index cd8014a..f209baf 100644 (file)
--- a/packages/e2fsprogs/e2fsprogs.inc
+++ b/packages/e2fsprogs/e2fsprogs.inc
@@ -5,8 +5,10 @@ SECTION = "base"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz"
 
-inherit autotools pkgconfig
+S = "${WORKDIR}/e2fsprogs-${PV}"
 
-EXTRA_OECONF = " --enable-dynamic-e2fsck"
+inherit autotools
 
+EXTRA_OECONF = " --enable-dynamic-e2fsck"
 
+PARALLEL_MAKE = ""

diff --git a/packages/e2fsprogs/e2fsprogs_1.38.bb b/packages/e2fsprogs/e2fsprogs_1.38.bb
index 32e5f7b..2e8bf3d 100644 (file)
--- a/packages/e2fsprogs/e2fsprogs_1.38.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.38.bb
@@ -3,9 +3,6 @@ require e2fsprogs.inc
 PR = "r8"
 
 SRC_URI += "file://no-hardlinks.patch;patch=1"
-S = "${WORKDIR}/e2fsprogs-${PV}"
-
-PARALLEL_MAKE = ""
 
 EXTRA_OECONF += " --sbindir=${base_sbindir}"