Merge pull request #11 from wigyori/master

pull req for 4.4.12, ar71xx/mediatek updates, package upgrades

diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk
index a47eea909da1712502b91411bbe9a5281d6ec8eb..4eb5e3ee9990710dc162f21c2aa9de7defcee322 100644 (file)
--- a/package/kernel/linux/modules/fs.mk
+++ b/package/kernel/linux/modules/fs.mk
@@ -26,6 +26,25 @@ endef
 
 $(eval $(call KernelPackage,fs-fscache))
 
+define KernelPackage/fs-9p
+  SUBMENU:=$(FS_MENU)
+  TITLE:=Plan 9 Resource Sharing Support
+  DEFAULT:=n
+  DEPENDS:=+kmod-9pnet
+  KCONFIG:=\
+       CONFIG_9P_FS=m \
+       CONFIG_9P_FS_POSIX_ACL=n \
+       CONFIG_9P_FS_SECURITY=n
+  FILES:=$(LINUX_DIR)/fs/9p/9p.ko
+  AUTOLOAD:=$(call AutoLoad,30,9p)
+endef
+
+define KernelPackage/fs-9p/description
+  Kernel module for Plan 9 Resource Sharing Support support
+endef
+
+$(eval $(call KernelPackage,fs-9p))
+
 define KernelPackage/fs-afs
   SUBMENU:=$(FS_MENU)
   TITLE:=Andrew FileSystem client

diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index 09fa5951ffae7ba6e4242134afd6f1311d80aa38..538520b2bf255e17977b184991019fdc9173631f 100644 (file)
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -1024,3 +1024,24 @@ define KernelPackage/mpls/description
 endef
 
 $(eval $(call KernelPackage,mpls))
+
+define KernelPackage/9pnet
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=Plan 9 Resource Sharing Support (9P2000)
+  DEPENDS:=@PCI_SUPPORT
+  KCONFIG:= \
+       CONFIG_NET_9P=m \
+       CONFIG_NET_9P_DEBUG=n \
+       CONFIG_NET_9P_VIRTIO=m
+  FILES:= \
+       $(LINUX_DIR)/net/9p/9pnet.ko \
+       $(LINUX_DIR)/net/9p/9pnet_virtio.ko
+  AUTOLOAD:=$(call AutoLoad,29,9pnet 9pnet_virtio)
+endef
+
+define KernelPackage/9pnet/description
+  Kernel support support for
+  Plan 9 resource sharing via the 9P2000 protocol.
+endef
+
+$(eval $(call KernelPackage,9pnet))

diff --git a/package/system/rpcd/Makefile b/package/system/rpcd/Makefile
index 86bd8c56863b6073682f3786ecda28bd366c218f..fdd9145a458ba02ddd8c5bd8d9c3a2dda3d58a8e 100644 (file)
--- a/package/system/rpcd/Makefile
+++ b/package/system/rpcd/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rpcd
-PKG_VERSION:=2016-04-13
+PKG_VERSION:=2016-06-06
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(OPENWRT_GIT)/project/rpcd.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)
-PKG_SOURCE_VERSION:=73aea9b8b621a1ce034bc6ee00c9d058a40c8a3d
+PKG_SOURCE_VERSION:=f8174eacef9b687a83231e58fdd1e53492e3ca84
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
 

diff --git a/target/linux/x86/kvm_guest/target.mk b/target/linux/x86/kvm_guest/target.mk
index 9970d73277bb797019a8209d021aa2552d16a400..9ebb66a5fcdaacf118056a57cda945f46ed5b592 100644 (file)
--- a/target/linux/x86/kvm_guest/target.mk
+++ b/target/linux/x86/kvm_guest/target.mk
@@ -1,4 +1,4 @@
 BOARDNAME:=KVM Guest
 FEATURES:=ext4 pci usb
-DEFAULT_PACKAGES += kmod-button-hotplug kmod-virtio-balloon kmod-virtio-net kmod-virtio-random
+DEFAULT_PACKAGES += kmod-button-hotplug kmod-virtio-balloon kmod-virtio-net kmod-virtio-random kmod-fs-9p
 CPU_TYPE := pentium4