e2fsprogs-libs: unify

4 files changed, 36 insertions, 92 deletions

diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs.inc b/packages/e2fsprogs-libs/e2fsprogs-libs.inc
new file mode 100644
index 0000000000..03f9c8dc22
--- /dev/null
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs.inc
@@ -0,0 +1,31 @@
+DESCRIPTION = "EXT2 Filesystem Utilities"
+LICENSE = "GPL"
+SECTION = "base"
+PRIORITY = "optional"
+
+inherit autotools
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
+           file://configure.patch;patch=1 \
+           file://compile-subst.patch;patch=1 \
+           file://m4.patch;patch=1"
+
+S = "${WORKDIR}/e2fsprogs-libs-${PV}"
+FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss"
+
+do_stage () {
+        for i in libcom_err libss libuuid libblkid; do
+                oe_libinstall -a -C lib $i ${STAGING_LIBDIR}
+        done
+        install -d ${STAGING_INCDIR}/et \
+                   ${STAGING_INCDIR}/ss \
+                   ${STAGING_INCDIR}/uuid \
+                   ${STAGING_INCDIR}/blkid
+        install -m 0644 lib/et/com_err.h ${STAGING_INCDIR}/et/
+        install -m 0644 lib/ss/ss.h ${STAGING_INCDIR}/ss/
+        install -m 0644 lib/ss/ss_err.h ${STAGING_INCDIR}/ss/
+        install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/
+        install -m 0644 lib/uuid/uuid_types.h ${STAGING_INCDIR}/uuid/
+        install -m 0644 lib/blkid/blkid.h ${STAGING_INCDIR}/blkid/
+        install -m 0644 lib/blkid/blkid_types.h ${STAGING_INCDIR}/blkid/
+}
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb b/packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb
index 90ed15e3f0..38449667fe 100644
--- a/packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb
@@ -1,31 +1 @@
-DESCRIPTION = "EXT2 Filesystem Utilities"
-LICENSE = "GPL"
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = ""
-FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
-	   file://configure.patch;patch=1 \
-	   file://compile-subst.patch;patch=1 \
-	   file://m4.patch;patch=1"
-S = "${WORKDIR}/e2fsprogs-libs-${PV}"
-
-inherit autotools
-
-do_stage () {
-	for i in libcom_err libss libuuid libblkid; do
-		oe_libinstall -a -C lib $i ${STAGING_LIBDIR}
-	done
-	install -d ${STAGING_INCDIR}/et \
-		   ${STAGING_INCDIR}/ss \
-		   ${STAGING_INCDIR}/uuid \
-		   ${STAGING_INCDIR}/blkid
-	install -m 0644 lib/et/com_err.h ${STAGING_INCDIR}/et/
-	install -m 0644 lib/ss/ss.h ${STAGING_INCDIR}/ss/
-	install -m 0644 lib/ss/ss_err.h ${STAGING_INCDIR}/ss/
-	install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/
-	install -m 0644 lib/uuid/uuid_types.h ${STAGING_INCDIR}/uuid/
-	install -m 0644 lib/blkid/blkid.h ${STAGING_INCDIR}/blkid/
-	install -m 0644 lib/blkid/blkid_types.h ${STAGING_INCDIR}/blkid/
-}
+require e2fsprogs-libs.inc
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb b/packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb
index 4d4a432b22..738d1ee206 100644
--- a/packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb
@@ -1,37 +1,8 @@
-DESCRIPTION = "EXT2 Filesystem Utilities"
-LICENSE = "GPL"
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = ""
-FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss"
+require e2fsprogs-libs.inc
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
-	   file://configure.patch;patch=1 \
-	   file://compile-subst.patch;patch=1 \
-	   file://m4.patch;patch=1 \
-	   file://ldflags.patch;patch=1"
-S = "${WORKDIR}/e2fsprogs-libs-${PV}"
-
-inherit autotools
+SRC_URI += "file://ldflags.patch;patch=1"
 
 do_compile_prepend () {
 	find ./ -print|xargs chmod u=rwX
 	( cd util; ${BUILD_CC} subst.c -o subst )
 }
-
-do_stage () {
-	for i in libcom_err libss libuuid libblkid; do
-		oe_libinstall -a -C lib $i ${STAGING_LIBDIR}
-	done
-	install -d ${STAGING_INCDIR}/et \
-		   ${STAGING_INCDIR}/ss \
-		   ${STAGING_INCDIR}/uuid \
-		   ${STAGING_INCDIR}/blkid
-	install -m 0644 lib/et/com_err.h ${STAGING_INCDIR}/et/
-	install -m 0644 lib/ss/ss.h ${STAGING_INCDIR}/ss/
-	install -m 0644 lib/ss/ss_err.h ${STAGING_INCDIR}/ss/
-	install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/
-	install -m 0644 lib/uuid/uuid_types.h ${STAGING_INCDIR}/uuid/
-	install -m 0644 lib/blkid/blkid.h ${STAGING_INCDIR}/blkid/
-	install -m 0644 lib/blkid/blkid_types.h ${STAGING_INCDIR}/blkid/
-}
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb b/packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb
index 9809ac5a6e..0d7d25e2cc 100644
--- a/packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb
@@ -1,17 +1,6 @@
-DESCRIPTION = "EXT2 Filesystem Utilities"
-LICENSE = "GPL"
-SECTION = "base"
-PRIORITY = "optional"
-FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss"
+require e2fsprogs-libs.inc
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
-	   file://configure.patch;patch=1 \
-	   file://compile-subst.patch;patch=1 \
-	   file://m4.patch;patch=1 \
-	   file://ldflags.patch;patch=1"
-S = "${WORKDIR}/e2fsprogs-libs-${PV}"
-
-inherit autotools
+SRC_URI += "file://ldflags.patch;patch=1"
 
 EXTRA_OECONF=" --enable-elf-shlibs "
 
@@ -19,20 +8,3 @@ do_compile_prepend () {
 	find ./ -print|xargs chmod u=rwX
 	( cd util; ${BUILD_CC} subst.c -o subst )
 }
-
-do_stage () {
-	for i in libcom_err libss libuuid libblkid; do
-		oe_libinstall -a -C lib $i ${STAGING_LIBDIR}
-	done
-	install -d ${STAGING_INCDIR}/et \
-		   ${STAGING_INCDIR}/ss \
-		   ${STAGING_INCDIR}/uuid \
-		   ${STAGING_INCDIR}/blkid
-	install -m 0644 lib/et/com_err.h ${STAGING_INCDIR}/et/
-	install -m 0644 lib/ss/ss.h ${STAGING_INCDIR}/ss/
-	install -m 0644 lib/ss/ss_err.h ${STAGING_INCDIR}/ss/
-	install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/
-	install -m 0644 lib/uuid/uuid_types.h ${STAGING_INCDIR}/uuid/
-	install -m 0644 lib/blkid/blkid.h ${STAGING_INCDIR}/blkid/
-	install -m 0644 lib/blkid/blkid_types.h ${STAGING_INCDIR}/blkid/
-}