From 9e0d36bab8491dd167080ae42766bf110d2bfa1c Mon Sep 17 00:00:00 2001 From: Dirk Opfer Date: Tue, 11 Aug 2009 07:57:07 +0200 Subject: fuse: update to 2.7.4 --- .../fuse-2.7.2/not-run-updaterc.d-on-host.patch | 15 ----------- .../fuse-2.7.4/not-run-updaterc.d-on-host.patch | 23 +++++++++++++++++ recipes/fuse/fuse-module_2.7.2.bb | 29 ---------------------- recipes/fuse/fuse-module_2.7.4.bb | 29 ++++++++++++++++++++++ recipes/fuse/fuse_2.7.2.bb | 27 -------------------- recipes/fuse/fuse_2.7.4.bb | 27 ++++++++++++++++++++ 6 files changed, 79 insertions(+), 71 deletions(-) delete mode 100644 recipes/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch create mode 100644 recipes/fuse/fuse-2.7.4/not-run-updaterc.d-on-host.patch delete mode 100644 recipes/fuse/fuse-module_2.7.2.bb create mode 100644 recipes/fuse/fuse-module_2.7.4.bb delete mode 100644 recipes/fuse/fuse_2.7.2.bb create mode 100644 recipes/fuse/fuse_2.7.4.bb (limited to 'recipes/fuse') diff --git a/recipes/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch b/recipes/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch deleted file mode 100644 index 903a8baa9e..0000000000 --- a/recipes/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch +++ /dev/null @@ -1,15 +0,0 @@ -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/recipes/fuse/fuse-2.7.4/not-run-updaterc.d-on-host.patch b/recipes/fuse/fuse-2.7.4/not-run-updaterc.d-on-host.patch new file mode 100644 index 0000000000..ab97c230d3 --- /dev/null +++ b/recipes/fuse/fuse-2.7.4/not-run-updaterc.d-on-host.patch @@ -0,0 +1,23 @@ +Index: fuse-2.7.4/util/Makefile.am +=================================================================== +--- fuse-2.7.4.orig/util/Makefile.am 2008-02-19 20:51:28.000000000 +0100 ++++ fuse-2.7.4/util/Makefile.am 2009-08-10 11:20:36.268048846 +0200 +@@ -33,10 +33,6 @@ install-exec-local: + $(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) +@@ -46,7 +42,3 @@ uninstall-local: + rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse + rm -f $(DESTDIR)$(UDEV_RULES_PATH)/99-fuse.rules + rm -f $(DESTDIR)$(INIT_D_PATH)/fuse +- @if test -x /usr/sbin/update-rc.d; then \ +- echo "/usr/sbin/update-rc.d fuse remove || true"; \ +- /usr/sbin/update-rc.d fuse remove || true; \ +- fi diff --git a/recipes/fuse/fuse-module_2.7.2.bb b/recipes/fuse/fuse-module_2.7.2.bb deleted file mode 100644 index 48cc33a338..0000000000 --- a/recipes/fuse/fuse-module_2.7.2.bb +++ /dev/null @@ -1,29 +0,0 @@ -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/recipes/fuse/fuse-module_2.7.4.bb b/recipes/fuse/fuse-module_2.7.4.bb new file mode 100644 index 0000000000..48cc33a338 --- /dev/null +++ b/recipes/fuse/fuse-module_2.7.4.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/recipes/fuse/fuse_2.7.2.bb b/recipes/fuse/fuse_2.7.2.bb deleted file mode 100644 index a1795e7f0c..0000000000 --- a/recipes/fuse/fuse_2.7.2.bb +++ /dev/null @@ -1,27 +0,0 @@ -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 -} - - diff --git a/recipes/fuse/fuse_2.7.4.bb b/recipes/fuse/fuse_2.7.4.bb new file mode 100644 index 0000000000..a1795e7f0c --- /dev/null +++ b/recipes/fuse/fuse_2.7.4.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 +} + + -- cgit 1.2.3-korg