5 files changed, 26 insertions, 41 deletions
diff --git a/packages/e2fsprogs/e2fsprogs.inc b/packages/e2fsprogs/e2fsprogs.inc
new file mode 100644
index 0000000000..6c3b287a39
--- /dev/null
+++ b/packages/e2fsprogs/e2fsprogs.inc
@@ -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"
+
+
diff --git a/packages/e2fsprogs/e2fsprogs_1.33.bb b/packages/e2fsprogs/e2fsprogs_1.33.bb
index 63732aac4b..80572a0d41 100644
--- a/packages/e2fsprogs/e2fsprogs_1.33.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.33.bb
@@ -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 "
diff --git a/packages/e2fsprogs/e2fsprogs_1.34.bb b/packages/e2fsprogs/e2fsprogs_1.34.bb
index 9171d39c6b..837cf962a0 100644
--- a/packages/e2fsprogs/e2fsprogs_1.34.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.34.bb
@@ -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 "
diff --git a/packages/e2fsprogs/e2fsprogs_1.35.bb b/packages/e2fsprogs/e2fsprogs_1.35.bb
index 9171d39c6b..837cf962a0 100644
--- a/packages/e2fsprogs/e2fsprogs_1.35.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.35.bb
@@ -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 "
diff --git a/packages/e2fsprogs/e2fsprogs_1.38.bb b/packages/e2fsprogs/e2fsprogs_1.38.bb
index ec28bff31a..a909419437 100644
--- a/packages/e2fsprogs/e2fsprogs_1.38.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.38.bb
@@ -1,18 +1,13 @@
-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 = "--enable-dynamic-e2fsck --sbindir=${base_sbindir}"
+EXTRA_OECONF += " --sbindir=${base_sbindir}"
 
 do_compile_prepend () {
 	find ./ -print|xargs chmod u=rwX
@@ -49,4 +44,4 @@ FILES_e2fsprogs-fsck = "${base_sbindir}/fsck"
 FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
 FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*"
 FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
-FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
-\ No newline at end of file
+FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"