[oe-commits] org.oe.dev e2fsprogs-libs: unify

[Laibsch commit]

e2fsprogs-libs: unify

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 04cf024760eec1220c6eca0c88919cc328a9ea22
ViewMTN: http://monotone.openembedded.org/revision.psp?id=04cf024760eec1220c6eca0c88919cc328a9ea22
Files:
1
packages/e2fsprogs-libs/e2fsprogs-libs.inc
packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb
packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb
packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb
Diffs:

#
# mt diff -r30678c3702a1cc07bf12d5baa269e50027d8b34f -r04cf024760eec1220c6eca0c88919cc328a9ea22
#
# 
# 
# add_file "packages/e2fsprogs-libs/e2fsprogs-libs.inc"
#  content [91a6d92b6249f2c667ce99d42b43641d0c27b4e6]
# 
# patch "packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb"
#  from [b7ab7826e8e52c0dd647c8a6d5bf130cdbb27dd8]
#    to [3a936f26cf6d0c8a0fc613dcc7d894936009ad08]
# 
# patch "packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb"
#  from [f174b7dc3e53bcbe83c398b0d82872f71d530f90]
#    to [b5d4bbfd61a08cd20e33bb524ac045ee1fc80566]
# 
# patch "packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb"
#  from [cbb73d158e61c93291a12ff75fe57877c6fc028a]
#    to [202a4233c61e8d266b09dc59b72879d7b109b35e]
# 
============================================================
--- packages/e2fsprogs-libs/e2fsprogs-libs.inc	91a6d92b6249f2c667ce99d42b43641d0c27b4e6
+++ packages/e2fsprogs-libs/e2fsprogs-libs.inc	91a6d92b6249f2c667ce99d42b43641d0c27b4e6
@@ -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/
+}
============================================================
--- packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb	b7ab7826e8e52c0dd647c8a6d5bf130cdbb27dd8
+++ packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb	3a936f26cf6d0c8a0fc613dcc7d894936009ad08
@@ -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
============================================================
--- packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb	f174b7dc3e53bcbe83c398b0d82872f71d530f90
+++ packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb	b5d4bbfd61a08cd20e33bb524ac045ee1fc80566
@@ -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}"
+SRC_URI += "file://ldflags.patch;patch=1"
 
-inherit autotools
-
 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/
-}
============================================================
--- packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb	cbb73d158e61c93291a12ff75fe57877c6fc028a
+++ packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb	202a4233c61e8d266b09dc59b72879d7b109b35e
@@ -1,38 +1,10 @@
-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}"
+SRC_URI += "file://ldflags.patch;patch=1"
 
-inherit autotools
-
 EXTRA_OECONF=" --enable-elf-shlibs "
 
 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/
-}