diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index ee3cd0aaa..2b738ce3c 100644 --- a/net/openvswitch/Makefile +++ b/net/openvswitch/Makefile @@ -29,8 +29,6 @@ PKG_BUILD_PARALLEL:=1 PKG_FIXUP:=autoreconf PKG_INSTALL:=1 -SUPPORTED_KERNELS:=LINUX_3_18||LINUX_4_1||LINUX_4_3||LINUX_4_4||LINUX_4_9 - include $(INCLUDE_DIR)/package.mk include ../../lang/python/python-package.mk @@ -55,7 +53,7 @@ endef define Package/openvswitch-base $(call Package/openvswitch/Default) TITLE:=Open vSwitch Userspace Package (base) - DEPENDS:=+libpcap +libopenssl +librt +kmod-openvswitch @($(SUPPORTED_KERNELS)) + DEPENDS:=+libpcap +libopenssl +librt +kmod-openvswitch endef define Package/openvswitch-base/description @@ -138,8 +136,7 @@ define KernelPackage/openvswitch CONFIG_OPENVSWITCH_GENEVE=n DEPENDS:= \ @IPV6 +kmod-gre +kmod-lib-crc32c +kmod-mpls \ - +kmod-vxlan +kmod-nf-nat +kmod-nf-nat6 \ - @($(SUPPORTED_KERNELS)) + +kmod-vxlan +kmod-nf-nat +kmod-nf-nat6 FILES:= $(LINUX_DIR)/net/openvswitch/openvswitch.ko AUTOLOAD:=$(call AutoLoad,21,openvswitch) endef @@ -149,7 +146,7 @@ define KernelPackage/openvswitch/description module. Furthermore, it supports OpenFlow. endef -CONFIGURE_ARGS += --with-linux=$(LINUX_DIR) --with-rundir=/var/run +CONFIGURE_ARGS += --with-rundir=/var/run CONFIGURE_ARGS += --enable-ndebug CONFIGURE_ARGS += --disable-ssl CONFIGURE_ARGS += --enable-shared diff --git a/net/openvswitch/patches/0005-disable-module-build.patch b/net/openvswitch/patches/0005-disable-module-build.patch deleted file mode 100644 index 43d498694..000000000 --- a/net/openvswitch/patches/0005-disable-module-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7cf69704374e363fdda227803be3849233ba96f3 Mon Sep 17 00:00:00 2001 -From: Dario Ernst -Date: Fri, 25 Nov 2016 15:33:48 +0100 -Subject: [PATCH 4/4] disable-module-build - ---- - datapath/linux/Makefile.main.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/datapath/linux/Makefile.main.in b/datapath/linux/Makefile.main.in -index 7d18253..e5555a7 100644 ---- a/datapath/linux/Makefile.main.in -+++ b/datapath/linux/Makefile.main.in -@@ -68,7 +68,7 @@ ifeq (,$(wildcard $(CONFIG_FILE))) - endif - - default: -- $(MAKE) -C $(KSRC) M=$(builddir) modules -+ @echo skipping module build - - modules_install: - $(MAKE) -C $(KSRC) M=$(builddir) modules_install --- -2.9.3 -