diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2012-09-03 21:33:25 +0200 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-09-03 21:59:03 +0200 |
commit | 32a0454d3c495b12824ef4a0d0341237302d148a (patch) | |
tree | 9acc870d089b0028cecdfb1846b828ae4bd38910 /package/libfuse | |
parent | f9686563b4fd3eed22e26105f7c440f0b74fcac1 (diff) | |
parent | dafa32b3bd75e9d155d075c796fa5b0ecbb9b11b (diff) | |
download | buildroot-32a0454d3c495b12824ef4a0d0341237302d148a.tar.gz buildroot-32a0454d3c495b12824ef4a0d0341237302d148a.zip |
Merge branch 'next'
Conflicts:
package/e2fsprogs/e2fsprogs.mk
package/libfuse/libfuse.mk
package/multimedia/mpd/mpd.mk
package/smartmontools/smartmontools.mk
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/libfuse')
-rw-r--r-- | package/libfuse/libfuse.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk index 246697fdd4..c8c01303d3 100644 --- a/package/libfuse/libfuse.mk +++ b/package/libfuse/libfuse.mk @@ -4,9 +4,11 @@ # ############################################################# -LIBFUSE_VERSION = 2.9.0 +LIBFUSE_VERSION = 2.9.1 LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz LIBFUSE_SITE = http://downloads.sourceforge.net/project/fuse/fuse-2.X/$(LIBFUSE_VERSION) +LIBFUSE_LICENSE = GPLv2 LGPLv2.1 +LIBFUSE_LICENSE_FILES = COPYING COPYING.LIB LIBFUSE_INSTALL_STAGING = YES LIBFUSE_CONF_OPT= --disable-nls \ |