merge of 'e7503adc20d2a854905f468365cd82066ebed0d5'

     and 'f380086d173615489f21da520bb5d47e43ad2e47'

5 files changed, 31 insertions, 54 deletions

diff --git a/packages/e2fsprogs/e2fsprogs.inc b/packages/e2fsprogs/e2fsprogs.inc
index 6c3b287a39..b6bb469cd3 100644
--- a/packages/e2fsprogs/e2fsprogs.inc
+++ b/packages/e2fsprogs/e2fsprogs.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://e2fsprogs.sf.net"
 LICENSE = "GPL"
 SECTION = "base"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz"
 
 inherit autotools
 
diff --git a/packages/fuse/fuse-module_2.5.3.bb b/packages/fuse/fuse-module_2.5.3.bb
index 4d582107bb..4c71b0b9f9 100644
--- a/packages/fuse/fuse-module_2.5.3.bb
+++ b/packages/fuse/fuse-module_2.5.3.bb
@@ -1,36 +1,29 @@
-HOMEPAGE = "http://fuse.sf.net"
-DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
+require fuse.inc
 
-LICENSE = "GPL"
-
-
-DEPENDS = "fakeroot-native"
 RRECOMMENDS = "fuse"
-
 PR = "r1"
 
-SRC_URI="${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz"
 S = "${WORKDIR}/fuse-${PV}"
-
-inherit autotools pkgconfig module
+FILES_${PN} = "/dev ${base_libdir}/modules ${sysconfdir}"
 EXTRA_OECONF = "  --with-kernel=${STAGING_KERNEL_DIR}"
 
+inherit module
+
 do_configure() {
-cd ${S} ; oe_runconf
+	cd ${S} ; oe_runconf
 }
 
 do_compile(){
-LDFLAGS=""
-cd ${S}/kernel
-oe_runmake
+	LDFLAGS=""
+	cd ${S}/kernel
+	oe_runmake
 }
 
 fakeroot do_install() {
-LDFLAGS=""
-install -d ${D}${sysconfdir}/udev/rules.d/
-install -m 644 util/udev.rules ${D}${sysconfdir}/udev/rules.d/
-cd ${S}/kernel
-oe_runmake install DESTDIR=${D}
+	LDFLAGS=""
+	install -d ${D}${sysconfdir}/udev/rules.d/
+	install -m 644 util/udev.rules ${D}${sysconfdir}/udev/rules.d/
+	cd ${S}/kernel
+	oe_runmake install DESTDIR=${D}
 }
 
-FILES_${PN} = "/dev ${base_libdir}/modules ${sysconfdir}"
diff --git a/packages/fuse/fuse.inc b/packages/fuse/fuse.inc
new file mode 100644
index 0000000000..abc408561a
--- /dev/null
+++ b/packages/fuse/fuse.inc
@@ -0,0 +1,13 @@
+DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
+HOMEPAGE = "http://fuse.sf.net"
+LICENSE = "GPL"
+DEPENDS = "fakeroot-native"
+RRECOMMENDS_fuse = "fuse-module kernel-module-fuse"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz"
+
+inherit autotools pkgconfig
+
+fakeroot do_install() {
+	oe_runmake install DESTDIR=${D}
+}
diff --git a/packages/fuse/fuse_2.5.3.bb b/packages/fuse/fuse_2.5.3.bb
index b423e962ae..1f43ac8859 100644
--- a/packages/fuse/fuse_2.5.3.bb
+++ b/packages/fuse/fuse_2.5.3.bb
@@ -1,31 +1,17 @@
-HOMEPAGE = "http://fuse.sf.net"
-DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
-
-LICENSE_${PN} = "LGPL"
+require fuse.inc
 
 PR = "r1"
 
-DEPENDS = "fakeroot-native"
-RRECOMMENDS_${PN} = "fuse-module kernel-module-fuse"
-
 #package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils 
 PACKAGES += "fuse-utils"
 FILES_${PN} = "${libdir}/*.so*"
 FILES_${PN}-dev += "${libdir}/*.la"
 FILES_fuse-utils = "${bindir} ${base_sbindir}"
 DEBIAN_NOAUTONAME_fuse-utils = "1"
-
-SRC_URI="${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz"
-
-inherit autotools pkgconfig
 EXTRA_OECONF = " --disable-kernel-module"
 
-fakeroot do_install() {
-oe_runmake install DESTDIR=${D}
-}
-
 fakeroot do_stage() {
-autotools_stage_all
+	autotools_stage_all
 }
 
 
diff --git a/packages/fuse/fuse_2.6.0.bb b/packages/fuse/fuse_2.6.0.bb
index 74dd994720..2d5809cd00 100644
--- a/packages/fuse/fuse_2.6.0.bb
+++ b/packages/fuse/fuse_2.6.0.bb
@@ -1,30 +1,15 @@
-DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
-HOMEPAGE = "http://fuse.sf.net"
-LICENSE = "LGPL"
+require fuse.inc
 
-PR = "r0"
+SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1" 
 
-DEPENDS = "fakeroot-native"
-RRECOMMENDS_${PN} = "fuse-module kernel-module-fuse"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz \
-	   file://not-run-updaterc.d-on-host.patch;patch=1" 
-
-
-inherit autotools pkgconfig
 EXTRA_OECONF = " --disable-kernel-module"
 
-fakeroot do_install() {
-	oe_runmake install DESTDIR=${D}
-}
-
 #package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils
 PACKAGES =+ "lib${PN} libulockmgr"
 FILES_${PN}-dev += 	"${libdir}/*.la"
 FILES_lib${PN} = 	"${libdir}/libfuse*.so.*"
 FILES_libulockmgr = 	"${libdir}/libulockmgr.so.*"
 
-
 fakeroot do_stage() {
 	autotools_stage_all
 }