4 files changed, 24 insertions, 64 deletions
diff --git a/recipes/sysfsutils/sysfsutils.inc b/recipes/sysfsutils/sysfsutils.inc
new file mode 100644
index 0000000000..b6e3eb66d3
--- /dev/null
+++ b/recipes/sysfsutils/sysfsutils.inc
@@ -0,0 +1,16 @@
+DESCRIPTION = "System Utilities Based on Sysfs"
+HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html"
+LICENSE = "GPLv2"
+INC_PR = "r3"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz"
+
+inherit autotools autotools_stage
+
+PACKAGES = "libsysfs libsysfs-dbg libsysfs-dev \
+	    ${PN} ${PN}-dbg ${PN}-doc ${PN}-locale"
+
+FILES_libsysfs = "${libdir}/*.so.*"
+FILES_libsysfs-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
+		     ${libdir}/*.a"
+FILES_libsysfs-dbg += "${libdir}/.debug"
diff --git a/recipes/sysfsutils/sysfsutils_1.3.0.bb b/recipes/sysfsutils/sysfsutils_1.3.0.bb
index 11e4ca7e9a..3339a089e4 100644
--- a/recipes/sysfsutils/sysfsutils_1.3.0.bb
+++ b/recipes/sysfsutils/sysfsutils_1.3.0.bb
@@ -1,22 +1,5 @@
-PR = "r2"
-SECTION = "base"
-DESCRIPTION = "System Utilities Based on Sysfs"
-HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html"
-LICENSE = "GPLv2"
-SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz"
+require sysfsutils.inc
 
-S = "${WORKDIR}/sysfsutils-${PV}"
+PR = "${INC_PR}"
 
-inherit autotools
-
-includedir += "/sysfs"
-
-PACKAGES_prepend = "libsysfs "
-FILES_libsysfs = "${libdir}/*.so.1.0.3"
-
-do_stage () {
-	oe_libinstall -a -so -C lib libsysfs ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/sysfs
-	install -m 0644 ${S}/include/dlist.h ${STAGING_INCDIR}/sysfs
-	install -m 0644 ${S}/include/libsysfs.h ${STAGING_INCDIR}/sysfs
-}
+includedir .= "/sysfs"
diff --git a/recipes/sysfsutils/sysfsutils_2.0.0.bb b/recipes/sysfsutils/sysfsutils_2.0.0.bb
index f59dfa0feb..c2557c1e15 100644
--- a/recipes/sysfsutils/sysfsutils_2.0.0.bb
+++ b/recipes/sysfsutils/sysfsutils_2.0.0.bb
@@ -1,24 +1,3 @@
-DESCRIPTION = "System Utilities Based on Sysfs"
-HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html"
-LICENSE = "GPLv2"
-PR = "r2"
+require sysfsutils.inc
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz"
-S = "${WORKDIR}/sysfsutils-${PV}"
-
-inherit autotools
-
-includedir += "/sysfs"
-
-do_stage () {
-	oe_libinstall -a -so -C lib libsysfs ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/sysfs
-	install -m 0644 ${S}/include/dlist.h ${STAGING_INCDIR}/sysfs
-	install -m 0644 ${S}/include/libsysfs.h ${STAGING_INCDIR}/sysfs
-}
-
-PACKAGES_prepend = "libsysfs libsysfs-dbg libsysfs-dev "
-FILES_libsysfs = "${libdir}/*.so.*"
-FILES_libsysfs-dev = "${libdir}/* ${includedir}"
-FILES_libsysfs-dbg += "${libdir}/.debug"
-FILES_${PN}-dbg += "${bindir}/.debug"
+PR = "${INC_PR}"
diff --git a/recipes/sysfsutils/sysfsutils_2.1.0.bb b/recipes/sysfsutils/sysfsutils_2.1.0.bb
index 4f540d5181..02d936f688 100644
--- a/recipes/sysfsutils/sysfsutils_2.1.0.bb
+++ b/recipes/sysfsutils/sysfsutils_2.1.0.bb
@@ -1,22 +1,4 @@
-DESCRIPTION = "System Utilities Based on Sysfs"
-HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html"
-LICENSE = "GPLv2"
-PR = "r1"
+require sysfsutils.inc
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz \
-	   file://get_mnt_path_check.patch;patch=1"
-
-inherit autotools
-
-do_stage () {
-	autotools_stage_all
-}
-
-PACKAGES = "libsysfs libsysfs-dbg libsysfs-dev \
-	    ${PN} ${PN}-dbg ${PN}-doc ${PN}-locale"
-
-FILES_libsysfs = "${libdir}/*.so.*"
-FILES_libsysfs-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
-		     ${libdir}/*.a"
-FILES_libsysfs-dbg += "${libdir}/.debug"
-FILES_${PN}-dbg += "${bindir}/.debug"
+PR = "${INC_PR}"
+SRC_URI += "file://get_mnt_path_check.patch;patch=1"