Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

openvswitch: fix conditions for Linux 4.14

Browse source 
Condition testing for Linux version 4.14 is spelled LINUX_4_14, not
LINUX_4.14, so the checks were ineffective up to this change.
This Fixes the following error which appeared after update to 2.12.0,
when built against kernel 4.14:
Package kmod-openvswitch-intree is missing dependencies for the
following libraries:
tunnel6.ko

Signed-off-by: Lech Perczak <lech.perczak@gmail.com>
This commit is contained in:
Lech Perczak 2019-09-28 12:52:22 +02:00 committed by Yousong Zhou
parent 644b7f585e
commit ca81022a27
1 changed files with 7 additions and 7 deletions

14
net/openvswitch/Makefile
View file

@ -75,8 +75,8 @@ ovs_kmod_openvswitch_depends:=\
+IPV6:kmod-nf-nat6 \ +IPV6:kmod-nf-nat6 \
+kmod-nf-conntrack \ +kmod-nf-conntrack \
+IPV6:kmod-nf-conntrack6 \ +IPV6:kmod-nf-conntrack6 \
+(!LINUX_4_9&&!LINUX_4.14):kmod-nsh \ +(!LINUX_4_9&&!LINUX_4_14):kmod-nsh \
+(!LINUX_4_9&&!LINUX_4.14):kmod-ipt-conntrack-extra \ +(!LINUX_4_9&&!LINUX_4_14):kmod-ipt-conntrack-extra \
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))
@ -120,11 +120,11 @@ ovs_kmod_openvswitch-intree_depends:=\
+kmod-nf-nat \ +kmod-nf-nat \
+IPV6:kmod-nf-nat6 \ +IPV6:kmod-nf-nat6 \
+kmod-nf-conntrack \ +kmod-nf-conntrack \
+(IPV6&&(LINUX_4_9||LINUX_4.14)):kmod-nf-conntrack6 \ +(IPV6&&(LINUX_4_9||LINUX_4_14)):kmod-nf-conntrack6 \
+(LINUX_4_9||LINUX_4.14):kmod-gre \ +(LINUX_4_9||LINUX_4_14):kmod-gre \
+(IPV6&&(LINUX_4_9||LINUX_4.14)):kmod-gre6 \ +(IPV6&&(LINUX_4_9||LINUX_4_14)):kmod-gre6 \
+(!LINUX_4_9&&!LINUX_4.14):kmod-udptunnel4 \ +(!LINUX_4_9&&!LINUX_4_14):kmod-udptunnel4 \
+(!LINUX_4_9&&!LINUX_4.14):kmod-ipt-conntrack-extra \ +(!LINUX_4_9&&!LINUX_4_14):kmod-ipt-conntrack-extra \
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))