diff options
| -rw-r--r-- | net/nfs-kernel-server/Makefile | 4 | ||||
| -rw-r--r-- | net/nfs-kernel-server/patches/100-nfs_utils_uclibc.patch | 36 | ||||
| -rw-r--r-- | net/nfs-kernel-server/patches/100-no_malloc_h.patch (renamed from net/nfs-kernel-server/patches/101-no_malloc_h.patch) | 0 | ||||
| -rw-r--r-- | net/openvswitch/Makefile | 34 |
4 files changed, 36 insertions, 38 deletions
diff --git a/net/nfs-kernel-server/Makefile b/net/nfs-kernel-server/Makefile index b5cfcd757..1a3468f4a 100644 --- a/net/nfs-kernel-server/Makefile +++ b/net/nfs-kernel-server/Makefile @@ -7,9 +7,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nfs-kernel-server -PKG_VERSION:=1.3.0 +PKG_VERSION:=1.3.1 PKG_RELEASE:=1 -PKG_MD5SUM:=3ac3726eda563946d1f44ac3e5b61d56 +PKG_MD5SUM:=97f157f954edb6d4d4385a0c5986f36f PKG_SOURCE_URL:=@SF/nfs PKG_SOURCE:=nfs-utils-$(PKG_VERSION).tar.bz2 diff --git a/net/nfs-kernel-server/patches/100-nfs_utils_uclibc.patch b/net/nfs-kernel-server/patches/100-nfs_utils_uclibc.patch deleted file mode 100644 index 5e4877ef4..000000000 --- a/net/nfs-kernel-server/patches/100-nfs_utils_uclibc.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/support/nfs/svc_socket.c -+++ b/support/nfs/svc_socket.c -@@ -40,10 +40,13 @@ int getservport(u_long number, const cha - char rpcdata[1024], servdata[1024]; - struct rpcent rpcbuf, *rpcp; - struct servent servbuf, *servp = NULL; -- int ret; -- -+ int ret=0; -+#ifndef __UCLIBC__ - ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof rpcdata, - &rpcp); -+#else -+ rpcp = getrpcbynumber (number); -+#endif - if (ret == 0 && rpcp != NULL) { - /* First try name. */ - ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata, ---- a/utils/mountd/cache.c -+++ b/utils/mountd/cache.c -@@ -166,6 +166,7 @@ static void auth_unix_gid(FILE *f) - pw = getpwuid(uid); - if (!pw) - rv = -1; -+#ifndef __UCLIBC__ - else { - rv = getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups); - if (rv == -1 && ngroups >= groups_len) { -@@ -180,6 +181,7 @@ static void auth_unix_gid(FILE *f) - } - } - } -+#endif - qword_printuint(f, uid); - qword_printtimefrom(f, DEFAULT_TTL); - if (rv >= 0) { diff --git a/net/nfs-kernel-server/patches/101-no_malloc_h.patch b/net/nfs-kernel-server/patches/100-no_malloc_h.patch index afe4c98e0..afe4c98e0 100644 --- a/net/nfs-kernel-server/patches/101-no_malloc_h.patch +++ b/net/nfs-kernel-server/patches/100-no_malloc_h.patch diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index 710e89845..bb5b268dd 100644 --- a/net/openvswitch/Makefile +++ b/net/openvswitch/Makefile @@ -26,6 +26,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/kernel.mk +$(call include_mk, python-package.mk) PKG_FIXUP=libtool @@ -56,6 +57,27 @@ define Package/openvswitch/description Provides the main userspace components required for Open vSwitch to function. endef +define Package/openvswitch-python + $(call Package/openvswitch/Default) + TITLE:=Open vSwitch Python Support + DEPENDS:=@PACKAGE_openvswitch +PACKAGE_openvswitch:openvswitch +python +endef + +define Package/openvswitch-python/description + Provides bindings and libraries for using Python to manipulate/work with Open vSwitch. +endef + +define Package/openvswitch-ipsec + $(call Package/openvswitch/Default) + TITLE:=Open vSwitch Userspace Package + DEPENDS:=@PACKAGE_openvswitch +PACKAGE_openvswitch:openvswitch-python +endef + +define Package/openvswitch-ipsec/description + The ovs-monitor-ipsec script provides support for encrypting GRE tunnels with + IPsec. +endef + define Package/openvswitch-benchmark $(call Package/openvswitch/Default) TITLE:=Open vSwitch Userspace Package @@ -141,6 +163,16 @@ define Package/openvswitch/install $(INSTALL_CONF) $(PKG_BUILD_DIR)/vswitchd/vswitch.ovsschema $(1)/usr/share/openvswitch/ endef +define Package/openvswitch-python/install + $(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)/ + $(CP) $(PKG_BUILD_DIR)/python/ovs/ $(1)/usr/lib/python$(PYTHON_VERSION)/ +endef + +define Package/openvswitch-ipsec/install + $(INSTALL_DIR) $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/debian/ovs-monitor-ipsec $(1)/usr/sbin/ +endef + define Package/openvswitch-benchmark/install $(INSTALL_DIR) $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/.libs/ovs-benchmark $(1)/usr/bin/ @@ -152,6 +184,8 @@ define Package/openvswitch/postinst endef $(eval $(call BuildPackage,openvswitch)) +$(eval $(call BuildPackage,openvswitch-python)) +$(eval $(call BuildPackage,openvswitch-ipsec)) $(eval $(call BuildPackage,openvswitch-benchmark)) $(eval $(call KernelPackage,openvswitch)) |