summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-05-07 17:56:50 +0000
committerKoen Kooi <koen@openembedded.org>2007-05-07 17:56:50 +0000
commit8fd5db08db6f84a1818721af9e4269f9a404ea25 (patch)
treeaf64312f1a0af3f61f2811023f672666b81ce18e
parentfb01830e8e9b67757c41c31b547fc7d39ff7778d (diff)
parentb5c35fad6b345e26547421f614fc2ac5a1f54cf6 (diff)
merge of '189bf0db22327cd99864022fed3f4e85c98cde72'
and 'adb2b82ee900910b01239587279ad8cbd3f6b150'
-rw-r--r--packages/fuse/fuse_2.6.3.bb26
-rw-r--r--packages/python/python-fuse_cvs.bb4
2 files changed, 16 insertions, 14 deletions
diff --git a/packages/fuse/fuse_2.6.3.bb b/packages/fuse/fuse_2.6.3.bb
index f85860f175..1cc9cbe57d 100644
--- a/packages/fuse/fuse_2.6.3.bb
+++ b/packages/fuse/fuse_2.6.3.bb
@@ -1,22 +1,20 @@
-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"
-PR = "r0"
+require fuse.inc
-SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz \
- file://not-run-updaterc.d-on-host.patch;patch=1"
+PR = "r2"
-inherit autotools pkgconfig
+SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1"
EXTRA_OECONF = " --disable-kernel-module"
+#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"
+
fakeroot do_stage() {
- autotools_stage_all
+ autotools_stage_all
}
-# Package the fuse utils and libs in seperate packages
-PACKAGES += "lib${PN} libulockmgr"
-FILES_${PN}-dev += "${libdir}/*.la"
-FILES_lib${PN} = "${libdir}/libfuse*.so.*"
-FILES_libulockmgr = "${libdir}/libulockmgr.so.*"
+
diff --git a/packages/python/python-fuse_cvs.bb b/packages/python/python-fuse_cvs.bb
index e803b7fc62..d017e28536 100644
--- a/packages/python/python-fuse_cvs.bb
+++ b/packages/python/python-fuse_cvs.bb
@@ -1,11 +1,15 @@
DESCRIPTION = "FUSE Python bindings."
LICENSE = "GPLv2"
+DEPENDS = "fuse"
PV = "0.0+cvs${SRCDATE}"
+PR = "r1"
+
SRC_URI = "cvs://anonymous@fuse.cvs.sourceforge.net/cvsroot/fuse;module=python"
inherit distutils
S = "${WORKDIR}/python"
+FILES_${PN}-dbg += "${libdir}/python*/site-packages/fuseparts/.debu*"