Commit ca79d239 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'next'

parents 37d2ab56 19428369

package/Config.in

+5 −0
Original line number Diff line number Diff line
@@ -189,6 +189,9 @@ source "package/cramfs/Config.in" 
source "package/curlftpfs/Config.in"

source "package/dosfstools/Config.in"

source "package/e2fsprogs/Config.in"

source "package/exfat/Config.in"

source "package/exfat-utils/Config.in"

source "package/f2fs-tools/Config.in"

source "package/flashbench/Config.in"

source "package/genext2fs/Config.in"

source "package/genromfs/Config.in"
@@ -674,6 +677,7 @@ source "package/netsnmp/Config.in" 
source "package/netstat-nat/Config.in"

source "package/network-manager/Config.in"

source "package/nfacct/Config.in"

source "package/nmap/Config.in"

source "package/noip/Config.in"

source "package/ngircd/Config.in"

source "package/ngrep/Config.in"
@@ -728,6 +732,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS 
source "package/wget/Config.in"

endif

source "package/wireless_tools/Config.in"

source "package/wireshark/Config.in"

source "package/wpa_supplicant/Config.in"

source "package/xinetd/Config.in"

source "package/xl2tp/Config.in"

package/connman/connman.mk

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#

#######################################################



CONNMAN_VERSION = 1.10

CONNMAN_VERSION = 1.11

CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman/

CONNMAN_DEPENDENCIES = libglib2 dbus iptables gnutls

CONNMAN_INSTALL_STAGING = YES

package/exfat-utils/Config.in

0 → 100644
+11 −0
Original line number Diff line number Diff line 
config BR2_PACKAGE_EXFAT_UTILS

	bool "exfat-utils"

	depends on BR2_LARGEFILE

	depends on BR2_USE_WCHAR

	help

	  exFAT filesystem utilities.



	  http://code.google.com/p/exfat/



comment "exfat-utils requires a toolchain with LARGEFILE and WCHAR support"

	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR

package/exfat-utils/exfat-utils.mk

0 → 100644
+24 −0
Original line number Diff line number Diff line 
#############################################################

#

# exfat-utils

#

#############################################################



EXFAT_UTILS_VERSION = 1.0.1

EXFAT_UTILS_SITE = http://exfat.googlecode.com/files

EXFAT_UTILS_DEPENDENCIES = host-scons

EXFAT_UTILS_LICENSE = GPLv3+

EXFAT_UTILS_LICENSE_FILES = COPYING



define EXFAT_UTILS_BUILD_CMDS

	(cd $(@D); \

		$(TARGET_CONFIGURE_OPTS) $(SCONS))

endef



define EXFAT_UTILS_INSTALL_TARGET_CMDS

	(cd $(@D); \

		$(TARGET_CONFIGURE_OPTS) $(SCONS) \

		DESTDIR=$(TARGET_DIR)/usr/bin install)

endef



$(eval $(generic-package))

package/exfat/Config.in

0 → 100644
+15 −0
Original line number Diff line number Diff line 
config BR2_PACKAGE_EXFAT

	bool "exFAT (FUSE)"

	depends on BR2_LARGEFILE # libfuse

	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse

	depends on BR2_USE_MMU # libfuse

	depends on BR2_USE_WCHAR

	select BR2_PACKAGE_LIBFUSE

	help

	  A full-featured exFAT file system implementation for GNU/Linux

	  and other Unix-like systems as a FUSE module.



	  http://code.google.com/p/exfat/



comment "exfat requires a toolchain with LARGEFILE, WCHAR and threads support"

	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR