[oe-commits] org.oe.dev e2fsprogs: some unification

[Laibsch commit]

e2fsprogs: some unification

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 30678c3702a1cc07bf12d5baa269e50027d8b34f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=30678c3702a1cc07bf12d5baa269e50027d8b34f
Files:
1
packages/e2fsprogs/e2fsprogs.inc
packages/e2fsprogs/e2fsprogs_1.33.bb
packages/e2fsprogs/e2fsprogs_1.34.bb
packages/e2fsprogs/e2fsprogs_1.35.bb
packages/e2fsprogs/e2fsprogs_1.38.bb
Diffs:

#
# mt diff -r48044373e4a3e89c420126217b7e41d2dcdba666 -r30678c3702a1cc07bf12d5baa269e50027d8b34f
#
# 
# 
# add_file "packages/e2fsprogs/e2fsprogs.inc"
#  content [e0a653d2001afe19cb1492f83fb4c38abbe54619]
# 
# patch "packages/e2fsprogs/e2fsprogs_1.33.bb"
#  from [14f62e622c8d6bc1d550cb756f1620c0d2e4a675]
#    to [2589d07f34e82b51ee20415d98942abb2e476571]
# 
# patch "packages/e2fsprogs/e2fsprogs_1.34.bb"
#  from [7c5744660d0fca086b40c874718dc971bab116bd]
#    to [c92b6c7d02a47ec008b266164479537cf1358790]
# 
# patch "packages/e2fsprogs/e2fsprogs_1.35.bb"
#  from [7c5744660d0fca086b40c874718dc971bab116bd]
#    to [c92b6c7d02a47ec008b266164479537cf1358790]
# 
# patch "packages/e2fsprogs/e2fsprogs_1.38.bb"
#  from [5268ccc0e91bf00b7db84a561ea0cac985d48671]
#    to [96e045c447328dcb8f1a92f84e585f3a38459264]
# 
============================================================
--- packages/e2fsprogs/e2fsprogs.inc	e0a653d2001afe19cb1492f83fb4c38abbe54619
+++ packages/e2fsprogs/e2fsprogs.inc	e0a653d2001afe19cb1492f83fb4c38abbe54619
@@ -0,0 +1,12 @@
+DESCRIPTION = "EXT2 Filesystem Utilities"
+HOMEPAGE = "http://e2fsprogs.sf.net"
+LICENSE = "GPL"
+SECTION = "base"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz"
+
+inherit autotools
+
+EXTRA_OECONF = " --enable-dynamic-e2fsck"
+
+
============================================================
--- packages/e2fsprogs/e2fsprogs_1.33.bb	14f62e622c8d6bc1d550cb756f1620c0d2e4a675
+++ packages/e2fsprogs/e2fsprogs_1.33.bb	2589d07f34e82b51ee20415d98942abb2e476571
@@ -1,20 +1,12 @@
-DESCRIPTION = "EXT2 Filesystem Utilities"
-SECTION = "base"
-LICENSE = "GPL"
-PRIORITY = "optional"
-DEPENDS = ""
+require e2fsprogs.inc
+
 PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
-	   file://ln.patch;patch=1 \
+SRC_URI += "file://ln.patch;patch=1 \
 	   file://configure.patch;patch=1 \
 	   file://compile-subst.patch;patch=1 \
 	   file://m4.patch;patch=1"
 
-inherit autotools
-
-EXTRA_OECONF = "--enable-dynamic-e2fsck"
-
 sbindir = "/sbin"
 
 PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck "
============================================================
--- packages/e2fsprogs/e2fsprogs_1.34.bb	7c5744660d0fca086b40c874718dc971bab116bd
+++ packages/e2fsprogs/e2fsprogs_1.34.bb	c92b6c7d02a47ec008b266164479537cf1358790
@@ -1,20 +1,13 @@
-DESCRIPTION = "EXT2 Filesystem Utilities"
-LICENSE = "GPL"
-SECTION = "base"
-PRIORITY = "optional"
+require e2fsprogs.inc
+
 PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
-	   file://ln.patch;patch=1 \
+SRC_URI += "file://ln.patch;patch=1 \
 	   file://configure.patch;patch=1 \
 	   file://compile-subst.patch;patch=1 \
 	   file://m4.patch;patch=1 \
 	   file://ldflags.patch;patch=1"
 
-inherit autotools
-
-EXTRA_OECONF = "--enable-dynamic-e2fsck"
-
 sbindir = "/sbin"
 
 PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck "
============================================================
--- packages/e2fsprogs/e2fsprogs_1.35.bb	7c5744660d0fca086b40c874718dc971bab116bd
+++ packages/e2fsprogs/e2fsprogs_1.35.bb	c92b6c7d02a47ec008b266164479537cf1358790
@@ -1,20 +1,13 @@
-DESCRIPTION = "EXT2 Filesystem Utilities"
-LICENSE = "GPL"
-SECTION = "base"
-PRIORITY = "optional"
+require e2fsprogs.inc
+
 PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
-	   file://ln.patch;patch=1 \
+SRC_URI += "file://ln.patch;patch=1 \
 	   file://configure.patch;patch=1 \
 	   file://compile-subst.patch;patch=1 \
 	   file://m4.patch;patch=1 \
 	   file://ldflags.patch;patch=1"
 
-inherit autotools
-
-EXTRA_OECONF = "--enable-dynamic-e2fsck"
-
 sbindir = "/sbin"
 
 PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck "
============================================================
--- packages/e2fsprogs/e2fsprogs_1.38.bb	5268ccc0e91bf00b7db84a561ea0cac985d48671
+++ packages/e2fsprogs/e2fsprogs_1.38.bb	96e045c447328dcb8f1a92f84e585f3a38459264
@@ -1,19 +1,14 @@
-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 += " --sbindir=${base_sbindir}"
 
-EXTRA_OECONF = "--enable-dynamic-e2fsck --sbindir=${base_sbindir}"
-
 do_compile_prepend () {
 	find ./ -print|xargs chmod u=rwX
 	( cd util; ${BUILD_CC} subst.c -o subst )