diff options
author | Rod Whitby <rod@whitby.id.au> | 2008-02-10 06:18:24 +0000 |
---|---|---|
committer | Rod Whitby <rod@whitby.id.au> | 2008-02-10 06:18:24 +0000 |
commit | 7e3bf2113c1b327e6792227ba5608fcae5e9cdfa (patch) | |
tree | 923f36c9350aca06fd7ff5b75e8ed1d5386456df | |
parent | ceef3d9e48b5c6f02166ad6f2c9d5392a9801d74 (diff) |
fuse: Update from 2.7.1 to 2.7.2 so that it builds against 2.6.24 kernel
-rw-r--r-- | packages/fuse/fuse-2.7.2/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch | 15 | ||||
-rw-r--r-- | packages/fuse/fuse-module_2.7.2.bb | 29 | ||||
-rw-r--r-- | packages/fuse/fuse_2.7.2.bb | 27 |
4 files changed, 71 insertions, 0 deletions
diff --git a/packages/fuse/fuse-2.7.2/.mtn2git_empty b/packages/fuse/fuse-2.7.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/fuse/fuse-2.7.2/.mtn2git_empty diff --git a/packages/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch b/packages/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch new file mode 100644 index 0000000000..903a8baa9e --- /dev/null +++ b/packages/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch @@ -0,0 +1,15 @@ +Index: fuse-2.7.2/util/Makefile.am +=================================================================== +--- fuse-2.7.2.orig/util/Makefile.am 2007-04-26 01:36:47.000000000 +0930 ++++ fuse-2.7.2/util/Makefile.am 2008-02-10 16:43:19.000000000 +1030 +@@ -33,10 +33,6 @@ + $(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse + $(mkdir_p) $(DESTDIR)$(INIT_D_PATH) + $(INSTALL_PROGRAM) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse +- @if test -x /usr/sbin/update-rc.d; then \ +- echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \ +- /usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true; \ +- fi + + install-data-local: + $(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH) diff --git a/packages/fuse/fuse-module_2.7.2.bb b/packages/fuse/fuse-module_2.7.2.bb new file mode 100644 index 0000000000..48cc33a338 --- /dev/null +++ b/packages/fuse/fuse-module_2.7.2.bb @@ -0,0 +1,29 @@ +require fuse.inc + +RRECOMMENDS = "fuse" +PR = "r0" + +S = "${WORKDIR}/fuse-${PV}" +FILES_${PN} = "/dev ${base_libdir}/modules ${sysconfdir}" +EXTRA_OECONF = " --enable-kernel-module --with-kernel=${STAGING_KERNEL_DIR}" + +inherit module + +do_configure() { + cd ${S} ; oe_runconf +} + +do_compile(){ + 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} +} + diff --git a/packages/fuse/fuse_2.7.2.bb b/packages/fuse/fuse_2.7.2.bb new file mode 100644 index 0000000000..a1795e7f0c --- /dev/null +++ b/packages/fuse/fuse_2.7.2.bb @@ -0,0 +1,27 @@ +require fuse.inc + +PR = "r0" + +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-dbg fuse-utils libulockmgr libulockmgr-dev libulockmgr-dbg" +FILES_${PN} += "${libdir}/libfuse.so.*" +FILES_${PN}-dev += "${libdir}/libfuse*.la" + +FILES_libulockmgr = "${libdir}/libulockmgr.so.*" +FILES_libulockmgr-dev += "${libdir}/libulock*.la" +FILES_libulockmgr-dbg += "${libdir}/.debug/libulock*" + +FILES_fuse-utils = "${bindir} ${base_sbindir}" +FILES_fuse-utils-dbg = "${bindir}/.debug ${base_sbindir}/.debug" +DEBIAN_NOAUTONAME_fuse-utils = "1" +DEBIAN_NOAUTONAME_fuse-utils-dbg = "1" + +fakeroot do_stage() { + autotools_stage_all +} + + |