Skip to content

Commit b19dd06

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 d6a3943 commit b19dd06

File tree

1 file changed

+21
-15
lines changed

1 file changed

+21
-15
lines changed

kernel/ovpn-dco/Makefile

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,39 @@ include $(TOPDIR)/rules.mk
99
include $(INCLUDE_DIR)/kernel.mk
1010

1111
PKG_NAME:=ovpn-dco
12-
PKG_VERSION:=0.2.20250801
12+
PKG_VERSION:=2025071800
13+
PKG_VERSION_PREFIX:=net-6.16.0-rc6
14+
PKG_VERSION_FULL:=$(PKG_VERSION_PREFIX)-$(PKG_VERSION)
1315
PKG_RELEASE:=1
1416

1517
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
16-
PKG_SOURCE_URL= \
17-
https://build.openvpn.net/downloads/releases \
18-
https://codeload.github.com/OpenVPN/ovpn-dco/tar.gz/v$(PKG_VERSION)?
19-
PKG_HASH:=542677e69266e99babb560408b61705ef38a7c469eb820a81f609171faa61b20
18+
PKG_SOURCE_URL=https://codeload.github.com/OpenVPN/ovpn-backports/tar.gz/ovpn-net-next/$(PKG_VERSION_FULL)?
19+
PKG_HASH:=8b893dd093a5549b34f8375e594024a0d4e2ab5f833c955e7aec1077c1ece754
20+
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/ovpn-backports-ovpn-net-next-$(PKG_VERSION_FULL)
21+
PKG_BUILD_PARALLEL:=1
2022

2123
PKG_MAINTAINER:=Jianhui Zhao <zhaojh329@gmail.com>
2224
PKG_LICENSE:=GPL-2.0-only
2325

2426

2527
include $(INCLUDE_DIR)/package.mk
2628

27-
define KernelPackage/ovpn-dco-v2
29+
define KernelPackage/ovpn
2830
SUBMENU:=Network Support
2931
TITLE:=OpenVPN data channel offload
3032
DEPENDS:= \
3133
+kmod-udptunnel4 +IPV6:kmod-udptunnel6 \
3234
+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)
35+
# Note: TCP requires STREAM_PARSER but it can't be selected by out-of-tree
36+
# modules, so pull in AF_KCM for now. This needs to be patched on kernel
37+
# side.
38+
#KCONFIG:=CONFIG_STREAM_PARSER=y
39+
KCONFIG:=CONFIG_AF_KCM
40+
FILES:=$(PKG_BUILD_DIR)/drivers/net/ovpn/ovpn.ko
41+
AUTOLOAD:=$(call AutoLoad,30,ovpn)
3542
endef
3643

37-
define KernelPackage/ovpn-dco-v2/description
44+
define KernelPackage/ovpn/description
3845
This module enhances the performance of the OpenVPN userspace software
3946
by offloading the data channel processing to kernelspace.
4047
endef
@@ -46,20 +53,19 @@ NOSTDINC_FLAGS += \
4653
-include $(PKG_BUILD_DIR)/linux-compat.h
4754

4855
EXTRA_KCONFIG:= \
49-
CONFIG_OVPN_DCO_V2=m
56+
CONFIG_OVPN=m
5057

51-
PKG_EXTMOD_SUBDIRS = drivers/net/ovpn-dco
58+
PKG_EXTMOD_SUBDIRS = drivers/net/ovpn
5259

5360
MAKE_OPTS:= \
54-
$(KERNEL_MAKE_FLAGS) \
55-
M="$(PKG_BUILD_DIR)/drivers/net/ovpn-dco" \
61+
M="$(PKG_BUILD_DIR)/$(PKG_EXTMOD_SUBDIRS)" \
5662
NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
5763
$(EXTRA_KCONFIG)
5864

5965
define Build/Compile
60-
$(MAKE) -C "$(LINUX_DIR)" \
66+
+$(KERNEL_MAKE) $(PKG_JOBS) \
6167
$(MAKE_OPTS) \
6268
modules
6369
endef
6470

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

0 commit comments

Comments
 (0)