Patchwork [1/5] fuse: Upgrade recipe to version 2.8.6

login
register
mail settings
Submitter Khem Raj
Date Sept. 26, 2011, 4:24 p.m.
Message ID <1317054285-19029-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/12147/
State Superseded
Headers show

Comments

Khem Raj - Sept. 26, 2011, 4:24 p.m.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../fuse/fuse-2.8.6/define_GNU_SOURCE.patch        |   12 +++++++
 meta-oe/recipes-support/fuse/fuse_2.8.6.bb         |   34 ++++++++++++++++++++
 2 files changed, 46 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-support/fuse/fuse-2.8.6/define_GNU_SOURCE.patch
 create mode 100644 meta-oe/recipes-support/fuse/fuse_2.8.6.bb
Khem Raj - Sept. 26, 2011, 7:52 p.m.
On Mon, Sep 26, 2011 at 9:24 AM, Khem Raj <raj.khem@gmail.com> wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../fuse/fuse-2.8.6/define_GNU_SOURCE.patch        |   12 +++++++
>  meta-oe/recipes-support/fuse/fuse_2.8.6.bb         |   34 ++++++++++++++++++++
>  2 files changed, 46 insertions(+), 0 deletions(-)
>  create mode 100644 meta-oe/recipes-support/fuse/fuse-2.8.6/define_GNU_SOURCE.patch
>  create mode 100644 meta-oe/recipes-support/fuse/fuse_2.8.6.bb
>
> diff --git a/meta-oe/recipes-support/fuse/fuse-2.8.6/define_GNU_SOURCE.patch b/meta-oe/recipes-support/fuse/fuse-2.8.6/define_GNU_SOURCE.patch
> new file mode 100644
> index 0000000..c673a4c
> --- /dev/null
> +++ b/meta-oe/recipes-support/fuse/fuse-2.8.6/define_GNU_SOURCE.patch
> @@ -0,0 +1,12 @@
> +Index: fuse-2.8.6/util/fusermount.c
> +===================================================================
> +--- fuse-2.8.6.orig/util/fusermount.c  2011-09-13 00:23:14.000000000 -0700
> ++++ fuse-2.8.6/util/fusermount.c       2011-09-25 00:23:53.051019038 -0700
> +@@ -7,6 +7,7 @@
> + */
> + /* This program does the mounting and unmounting of FUSE filesystems */
> +
> ++#define _GNU_SOURCE
> + #include <config.h>
> +
> + #include "mount_util.h"
> diff --git a/meta-oe/recipes-support/fuse/fuse_2.8.6.bb b/meta-oe/recipes-support/fuse/fuse_2.8.6.bb
> new file mode 100644
> index 0000000..06eead1
> --- /dev/null
> +++ b/meta-oe/recipes-support/fuse/fuse_2.8.6.bb
> @@ -0,0 +1,34 @@
> +DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
> +HOMEPAGE = "http://fuse.sf.net"
> +SECTION = "libs"
> +LICENSE = "GPLv2&LGPLv2"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
> +                    file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a"
> +
> +PR = "r0"
> +
> +SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz"
> +
> +SRC_URI[md5sum] = "eaa32c8cef56a981656a786f258a002a"
> +SRC_URI[sha256sum] = "1ec1913e38f09b2a9ec1579e1800805b5e2c747d1dce515e316dbb665ca139d6"
> +
> +inherit autotools pkgconfig
> +
> +EXTRA_OECONF = "--disable-kernel-module"
> +
> +PACKAGES =+ "fuse-utils-dbg fuse-utils libulockmgr libulockmgr-dev libulockmgr-dbg"
> +
> +RRECOMMENDS_${PN} = "kernel-module-fuse""
> +
> +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*"
> +
> +# Forbid auto-renaming to libfuse-utils
> +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"
> --
> 1.7.5.4
>
>

A bit of self-review revealed that newly cooked
define_GNU_SOURCE.patch was not being applied which I have fixed
locally.

Patch

diff --git a/meta-oe/recipes-support/fuse/fuse-2.8.6/define_GNU_SOURCE.patch b/meta-oe/recipes-support/fuse/fuse-2.8.6/define_GNU_SOURCE.patch
new file mode 100644
index 0000000..c673a4c
--- /dev/null
+++ b/meta-oe/recipes-support/fuse/fuse-2.8.6/define_GNU_SOURCE.patch
@@ -0,0 +1,12 @@ 
+Index: fuse-2.8.6/util/fusermount.c
+===================================================================
+--- fuse-2.8.6.orig/util/fusermount.c	2011-09-13 00:23:14.000000000 -0700
++++ fuse-2.8.6/util/fusermount.c	2011-09-25 00:23:53.051019038 -0700
+@@ -7,6 +7,7 @@
+ */
+ /* This program does the mounting and unmounting of FUSE filesystems */
+ 
++#define _GNU_SOURCE
+ #include <config.h>
+ 
+ #include "mount_util.h"
diff --git a/meta-oe/recipes-support/fuse/fuse_2.8.6.bb b/meta-oe/recipes-support/fuse/fuse_2.8.6.bb
new file mode 100644
index 0000000..06eead1
--- /dev/null
+++ b/meta-oe/recipes-support/fuse/fuse_2.8.6.bb
@@ -0,0 +1,34 @@ 
+DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
+HOMEPAGE = "http://fuse.sf.net"
+SECTION = "libs"
+LICENSE = "GPLv2&LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a"
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "eaa32c8cef56a981656a786f258a002a"
+SRC_URI[sha256sum] = "1ec1913e38f09b2a9ec1579e1800805b5e2c747d1dce515e316dbb665ca139d6"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-kernel-module"
+
+PACKAGES =+ "fuse-utils-dbg fuse-utils libulockmgr libulockmgr-dev libulockmgr-dbg"
+
+RRECOMMENDS_${PN} = "kernel-module-fuse""
+
+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*"
+
+# Forbid auto-renaming to libfuse-utils
+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"