[oe-commits] org.oe.dev e2fsprogs: unbreak -native version, move common code to .inc from 1.38.bb

[hrw commit]

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

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: e09470e6a979b0419df41161d7a1b4e89fce5c79
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e09470e6a979b0419df41161d7a1b4e89fce5c79
Files:
1
packages/e2fsprogs/e2fsprogs-native_1.38.bb
packages/e2fsprogs/e2fsprogs.inc
packages/e2fsprogs/e2fsprogs_1.38.bb
Diffs:

#
# mt diff -r78bf60d0556049bd4664f4c2197ff8f6788af421 -re09470e6a979b0419df41161d7a1b4e89fce5c79
#
# 
# 
# patch "packages/e2fsprogs/e2fsprogs-native_1.38.bb"
#  from [2fd9775c29f4adc02029ee845b95dd064f500a20]
#    to [194a215a4edb95963af9fcb9b6930a82954a9287]
# 
# patch "packages/e2fsprogs/e2fsprogs.inc"
#  from [4f044f03432e593a9d31a63749800cc0dbbcccbc]
#    to [74053e769e29b3f7f7ccf89c6c51a299713f56ca]
# 
# patch "packages/e2fsprogs/e2fsprogs_1.38.bb"
#  from [6aa577ac3f2a907a4bf85d6b93eb7a1c65cd55de]
#    to [9586b51250df7775ec3746fb6eca617a1b70fa8e]
# 
============================================================
--- packages/e2fsprogs/e2fsprogs-native_1.38.bb	2fd9775c29f4adc02029ee845b95dd064f500a20
+++ packages/e2fsprogs/e2fsprogs-native_1.38.bb	194a215a4edb95963af9fcb9b6930a82954a9287
@@ -1,20 +1,13 @@ SECTION = "base"
 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
 }
============================================================
--- packages/e2fsprogs/e2fsprogs.inc	4f044f03432e593a9d31a63749800cc0dbbcccbc
+++ packages/e2fsprogs/e2fsprogs.inc	74053e769e29b3f7f7ccf89c6c51a299713f56ca
@@ -5,8 +5,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/e2fspro
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz"
 
-inherit autotools pkgconfig
+S = "${WORKDIR}/e2fsprogs-${PV}"
 
+inherit autotools
+
 EXTRA_OECONF = " --enable-dynamic-e2fsck"
 
+PARALLEL_MAKE = ""
-
============================================================
--- packages/e2fsprogs/e2fsprogs_1.38.bb	6aa577ac3f2a907a4bf85d6b93eb7a1c65cd55de
+++ packages/e2fsprogs/e2fsprogs_1.38.bb	9586b51250df7775ec3746fb6eca617a1b70fa8e
@@ -1,12 +1,9 @@ SRC_URI += "file://no-hardlinks.patch;pa
 require e2fsprogs.inc
 
 PR = "r8"
 
 SRC_URI += "file://no-hardlinks.patch;patch=1"
-S = "${WORKDIR}/e2fsprogs-${PV}"
 
-PARALLEL_MAKE = ""
-
 EXTRA_OECONF += " --sbindir=${base_sbindir}"
 
 do_compile_prepend () {