Skip to content

Commit 9621c00

Browse files
committed
ovpn-dco: switch to the new source
The ovpn kernel module is is part of the Linux kernel starting from version 6.16. Switch to the new officially maintained backports source: https://github.com/OpenVPN/ovpn-backports Signed-off-by: Qingfang Deng <dqfext@gmail.com>
1 parent d83488b commit 9621c00

File tree

1 file changed

+19
-14
lines changed

1 file changed

+19
-14
lines changed

kernel/ovpn-dco/Makefile

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,39 @@
88
include $(TOPDIR)/rules.mk
99
include $(INCLUDE_DIR)/kernel.mk
1010

11-
PKG_NAME:=ovpn-dco
12-
PKG_VERSION:=0.2.20250801
11+
PKG_NAME:=ovpn-backports
12+
PKG_VERSION:=6.17.0.2025112700
1313
PKG_RELEASE:=1
1414

1515
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
1616
PKG_SOURCE_URL= \
1717
https://build.openvpn.net/downloads/releases \
18-
https://codeload.github.com/OpenVPN/ovpn-dco/tar.gz/v$(PKG_VERSION)?
19-
PKG_HASH:=542677e69266e99babb560408b61705ef38a7c469eb820a81f609171faa61b20
18+
https://swupdate.openvpn.net/community/releases
19+
PKG_HASH:=4fd482fce3a2782aae2d518455c91760598fa56882bbd7fbd58306672b5baaea
20+
PKG_BUILD_PARALLEL:=1
2021

2122
PKG_MAINTAINER:=Jianhui Zhao <zhaojh329@gmail.com>
2223
PKG_LICENSE:=GPL-2.0-only
2324

2425

2526
include $(INCLUDE_DIR)/package.mk
2627

27-
define KernelPackage/ovpn-dco-v2
28+
define KernelPackage/ovpn
2829
SUBMENU:=Network Support
2930
TITLE:=OpenVPN data channel offload
3031
DEPENDS:= \
3132
+kmod-udptunnel4 +IPV6:kmod-udptunnel6 \
3233
+kmod-crypto-chacha20poly1305 +kmod-crypto-lib-chacha20 +kmod-crypto-lib-poly1305
33-
FILES:=$(PKG_BUILD_DIR)/drivers/net/ovpn-dco/ovpn-dco-v2.ko
34-
AUTOLOAD:=$(call AutoLoad,30,ovpn-dco-v2)
34+
# Note: TCP requires STREAM_PARSER but it can't be selected by out-of-tree
35+
# modules, so pull in AF_KCM for now. This needs to be patched on kernel
36+
# side.
37+
#KCONFIG:=CONFIG_STREAM_PARSER=y
38+
KCONFIG:=CONFIG_AF_KCM
39+
FILES:=$(PKG_BUILD_DIR)/drivers/net/ovpn/ovpn.ko
40+
AUTOLOAD:=$(call AutoLoad,30,ovpn)
3541
endef
3642

37-
define KernelPackage/ovpn-dco-v2/description
43+
define KernelPackage/ovpn/description
3844
This module enhances the performance of the OpenVPN userspace software
3945
by offloading the data channel processing to kernelspace.
4046
endef
@@ -46,20 +52,19 @@ NOSTDINC_FLAGS += \
4652
-include $(PKG_BUILD_DIR)/linux-compat.h
4753

4854
EXTRA_KCONFIG:= \
49-
CONFIG_OVPN_DCO_V2=m
55+
CONFIG_OVPN=m
5056

51-
PKG_EXTMOD_SUBDIRS = drivers/net/ovpn-dco
57+
PKG_EXTMOD_SUBDIRS = drivers/net/ovpn
5258

5359
MAKE_OPTS:= \
54-
$(KERNEL_MAKE_FLAGS) \
55-
M="$(PKG_BUILD_DIR)/drivers/net/ovpn-dco" \
60+
M="$(PKG_BUILD_DIR)/$(PKG_EXTMOD_SUBDIRS)" \
5661
NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
5762
$(EXTRA_KCONFIG)
5863

5964
define Build/Compile
60-
$(MAKE) -C "$(LINUX_DIR)" \
65+
+$(KERNEL_MAKE) $(PKG_JOBS) \
6166
$(MAKE_OPTS) \
6267
modules
6368
endef
6469

65-
$(eval $(call KernelPackage,ovpn-dco-v2))
70+
$(eval $(call KernelPackage,ovpn))

0 commit comments

Comments
 (0)