Merge branch 'master' of git://nbd.name/openwrt

Config.in

@@ -46,7 +46,6 @@ menu "Target Images"
 
 			config TARGET_INITRAMFS_COMPRESSION_XZ
 				bool "xz"
-				depends !LINUX_2_6_30&&!LINUX_2_6_31&&!LINUX_2_6_32&&!LINUX_2_6_36&&!LINUX_2_6_37
 		endchoice
 
 		config EXTERNAL_CPIO
@@ -396,6 +395,21 @@ menu "Global build settings"
 		  Note that this will make the system libraries incompatible with most of the packages
 		  that are not selected during the build process
 
+	choice
+		prompt "Preferred standard C++ library"
+		default USE_LIBSTDCXX if USE_EGLIBC
+		default USE_UCLIBCXX
+		help
+		  Select the preferred standard C++ library for all packages that support this.
+
+		config USE_UCLIBCXX
+			bool "uClibc++"
+
+		config USE_LIBSTDCXX
+			bool "libstdc++"
+
+	endchoice
+
 endmenu
 
 menuconfig DEVEL

include/package-ipkg.mk

@@ -144,7 +144,7 @@ ifeq ($(DUMP),)
 			fi; \
 		done; \
 	) | sort -u > $(PKG_INFO_DIR)/$(1).provides
-	$(if $(PROVIDES),@for pkg in $(PROVIDES); do cp $(PKG_INFO_DIR)/$(1).provides $(PKG_INFO_DIR)/$$pkg.provides; done)
+	$(if $(PROVIDES),@for pkg in $(PROVIDES); do cp $(PKG_INFO_DIR)/$(1).provides $(PKG_INFO_DIR)/$$$$pkg.provides; done)
 	$(CheckDependencies)
 
 	$(RSTRIP) $$(IDIR_$(1))

include/package.mk

@@ -5,6 +5,8 @@
 # See /LICENSE for more information.
 #
 
+__package_mk:=1
+
 all: $(if $(DUMP),dumpinfo,compile)
 
 PKG_BUILD_DIR ?= $(BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
@@ -31,7 +33,7 @@ ifneq ($(PREV_STAMP_PREPARED),)
   STAMP_PREPARED:=$(PREV_STAMP_PREPARED)
   CONFIG_AUTOREBUILD:=
 else
-  STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),)))
+  STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),))$(call confvar,$(PKG_PREPARED_DEPENDS)))
 endif
 STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured$(if $(DUMP),,_$(call confvar,$(PKG_CONFIG_DEPENDS)))
 STAMP_CONFIGURED_WILDCARD=$(patsubst %_$(call confvar,$(PKG_CONFIG_DEPENDS)),%_*,$(STAMP_CONFIGURED))

include/uclibc++.mk

@@ -0,0 +1,16 @@
+ifndef DUMP
+  ifdef __package_mk
+    $(error uclibc++.mk must be included before package.mk)
+  endif
+endif
+
+PKG_PREPARED_DEPENDS += CONFIG_USE_UCLIBCXX
+CXX_DEPENDS = +USE_UCLIBCXX:uclibcxx +USE_LIBSTDCXX:libstdcpp
+
+ifneq ($(CONFIG_USE_UCLIBCXX),)
+ ifneq ($(CONFIG_CCACHE),)
+  TARGET_CXX_NOCACHE="g++-uc"
+ else
+  TARGET_CXX="g++-uc"
+ endif
+endif

package/fuse/Makefile

@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=fuse
-PKG_VERSION:=2.8.5
+PKG_VERSION:=2.9.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_MD5SUM:=8aa2fd689de00b73963620483084ae3b
+PKG_MD5SUM:=894ee11674f89a915ae87524aed55bc4
 
 PKG_INSTALL:=1
 
@@ -45,21 +45,6 @@ $(call Package/fuse/Default/description)
  - ulockmgr_server
 endef
 
-define KernelPackage/fuse
-  $(call Package/fuse/Default)
-  SUBMENU:=Filesystems
-  TITLE+= (kernel module)
-  KCONFIG:= CONFIG_FUSE_FS
-  FILES:=$(LINUX_DIR)/fs/fuse/fuse.ko
-  VERSION:=$(LINUX_VERSION)-$(LINUX_RELEASE)
-  AUTOLOAD:=$(call AutoLoad,80,fuse)
-endef
-
-define KernelPackage/fuse/description
-$(call Package/fuse/Default/description)
- This package contains the FUSE kernel module.
-endef
-
 define Package/libfuse
 $(call Package/fuse/Default)
   SECTION:=libs
@@ -121,4 +106,3 @@ endef
 
 $(eval $(call BuildPackage,fuse-utils))
 $(eval $(call BuildPackage,libfuse))
-$(eval $(call KernelPackage,fuse))

package/fuse/patches/112-no_break_on_mknod.patch

@@ -1,6 +1,6 @@
 --- a/util/Makefile.in
 +++ b/util/Makefile.in
-@@ -584,7 +584,7 @@ uninstall-am: uninstall-binPROGRAMS unin
+@@ -641,7 +641,7 @@ mount_util.c: $(top_srcdir)/lib/mount_ut
 
  install-exec-hook:
  	-chmod u+s $(DESTDIR)$(bindir)/fusermount

package/kernel/modules/fs.mk

@@ -104,6 +104,21 @@ endef
 $(eval $(call KernelPackage,fs-ext4))
 
 
+define KernelPackage/fuse
+  SUBMENU:=$(FS_MENU)
+  TITLE:=FUSE (Filesystem in Userspace) support
+  KCONFIG:= CONFIG_FUSE_FS
+  FILES:=$(LINUX_DIR)/fs/fuse/fuse.ko
+  AUTOLOAD:=$(call AutoLoad,80,fuse)
+endef
+
+define KernelPackage/fuse/description
+ Kernel module for userspace filesystem support
+endef
+
+$(eval $(call KernelPackage,fuse))
+
+
 define KernelPackage/fs-hfs
   SUBMENU:=$(FS_MENU)
   TITLE:=HFS+ filesystem support

package/ltq-tapidemo/Makefile

@@ -26,7 +26,7 @@ define Package/ltq-tapidemo
   CATEGORY:=Network
   TITLE:=TAPIdemo application for Lantiq boards
   URL:=http://www.lantiq.com/
-  DEPENDS:=+kmod-ltq-tapi +kmod-ltq-vmmc
+  DEPENDS:=+kmod-ltq-tapi +kmod-ltq-vmmc +libpthread
   MAINTAINER:=John Crispin <blogic@openwrt.org>
   MENU:=1
 endef
@@ -39,6 +39,8 @@ define Package/ltq-tapidemo/config
 	source "$(SOURCE)/Config.in"
 endef
 
+TARGET_LDFLAGS+=-lpthread
+
 CONFIGURE_ARGS += \
 	ARCH=$(LINUX_KARCH) \
 	--enable-linux-26 \