Browse Source

openvswitch: conditionally select kmod-nsh

The nsh.ko requirement was introduced in kernel 4.15.  Currently there
are 3 kernel versions in base system, 4.9, 4.14, 4.19

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
lilik-openwrt-22.03
Yousong Zhou 6 years ago
parent
commit
885fc52411
1 changed files with 17 additions and 4 deletions
  1. +17
    -4
      net/openvswitch/Makefile

+ 17
- 4
net/openvswitch/Makefile View File

@ -69,9 +69,14 @@ endef
ovs_kmod_openvswitch_title:=Open vSwitch kernel datapath (upstream) ovs_kmod_openvswitch_title:=Open vSwitch kernel datapath (upstream)
ovs_kmod_openvswitch_kconfig:=CONFIG_OPENVSWITCH ovs_kmod_openvswitch_kconfig:=CONFIG_OPENVSWITCH
ovs_kmod_openvswitch_depends:=\ ovs_kmod_openvswitch_depends:=\
+kmod-lib-crc32c +kmod-mpls \
+kmod-nf-nat +IPV6:kmod-nf-nat6 \
+kmod-nf-conntrack +IPV6:kmod-nf-conntrack6
+kmod-lib-crc32c \
+kmod-mpls \
+kmod-nf-nat \
+IPV6:kmod-nf-nat6 \
+kmod-nf-conntrack \
+IPV6:kmod-nf-conntrack6 \
+(!LINUX_4_9&&!LINUX_4.14):kmod-nsh \
ovs_kmod_openvswitch_files:=$(ovs_kmod_upstream_dir)/openvswitch.ko ovs_kmod_openvswitch_files:=$(ovs_kmod_upstream_dir)/openvswitch.ko
$(eval $(call OvsKmodPackageTemplate,openvswitch)) $(eval $(call OvsKmodPackageTemplate,openvswitch))
@ -107,7 +112,15 @@ $(eval $(call OvsKmodPackageTemplate,openvswitch-geneve))
# enabled and selected on its own # enabled and selected on its own
# #
ovs_kmod_openvswitch-intree_title:=Open vSwitch kernel datapath (in tree) ovs_kmod_openvswitch-intree_title:=Open vSwitch kernel datapath (in tree)
ovs_kmod_openvswitch-intree_depends:=$(ovs_kmod_openvswitch_depends) +kmod-gre +IPV6:kmod-gre6
ovs_kmod_openvswitch-intree_depends:=\
+kmod-lib-crc32c \
+kmod-mpls \
+kmod-nf-nat \
+IPV6:kmod-nf-nat6 \
+kmod-nf-conntrack \
+IPV6:kmod-nf-conntrack6 \
+kmod-gre +IPV6:kmod-gre6 \
ovs_kmod_openvswitch-intree_files:= $(ovs_kmod_intree_dir)/openvswitch.ko ovs_kmod_openvswitch-intree_files:= $(ovs_kmod_intree_dir)/openvswitch.ko
$(eval $(call OvsKmodPackageTemplate,openvswitch-intree)) $(eval $(call OvsKmodPackageTemplate,openvswitch-intree))


Loading…
Cancel
Save