Skip to content

Commit bd29591

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 b1cfb71 commit bd29591

File tree

1 file changed

+21
-14
lines changed

1 file changed

+21
-14
lines changed

kernel/ovpn-dco/Makefile

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

1111
PKG_NAME:=ovpn-dco
12-
PKG_VERSION:=0.2.20241216
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=https://codeload.github.com/OpenVPN/ovpn-dco/tar.gz/v$(PKG_VERSION)?
17-
PKG_HASH:=0b30b8973b362b80a05f278ae217f01a2a2417e16e9c68c486960275a55306cc
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
1822

1923
PKG_MAINTAINER:=Jianhui Zhao <zhaojh329@gmail.com>
2024
PKG_LICENSE:=GPL-2.0-only
2125

2226

2327
include $(INCLUDE_DIR)/package.mk
2428

25-
define KernelPackage/ovpn-dco-v2
29+
define KernelPackage/ovpn
2630
SUBMENU:=Network Support
2731
TITLE:=OpenVPN data channel offload
28-
DEPENDS:=+kmod-crypto-aead +kmod-udptunnel4 +IPV6:kmod-udptunnel6
29-
FILES:=$(PKG_BUILD_DIR)/drivers/net/ovpn-dco/ovpn-dco-v2.ko
30-
AUTOLOAD:=$(call AutoLoad,30,ovpn-dco-v2)
32+
DEPENDS:=+kmod-crypto-aead +kmod-udptunnel4 +IPV6:kmod-udptunnel6 +kmod-tls
33+
FILES:=$(PKG_BUILD_DIR)/drivers/net/ovpn/ovpn.ko
34+
AUTOLOAD:=$(call AutoLoad,30,ovpn)
35+
# Note: TCP requires STREAM_PARSER but it can't be selected by out-of-tree
36+
# modules, so pull in kmod-tls for now. This needs to be patched on kernel
37+
# side.
38+
#KCONFIG:=CONFIG_STREAM_PARSER=y
3139
endef
3240

33-
define KernelPackage/ovpn-dco-v2/description
41+
define KernelPackage/ovpn/description
3442
This module enhances the performance of the OpenVPN userspace software
3543
by offloading the data channel processing to kernelspace.
3644
endef
@@ -42,20 +50,19 @@ NOSTDINC_FLAGS += \
4250
-include $(PKG_BUILD_DIR)/linux-compat.h
4351

4452
EXTRA_KCONFIG:= \
45-
CONFIG_OVPN_DCO_V2=m
53+
CONFIG_OVPN=m
4654

47-
PKG_EXTMOD_SUBDIRS = drivers/net/ovpn-dco
55+
PKG_EXTMOD_SUBDIRS = drivers/net/ovpn
4856

4957
MAKE_OPTS:= \
50-
$(KERNEL_MAKE_FLAGS) \
51-
M="$(PKG_BUILD_DIR)/drivers/net/ovpn-dco" \
58+
M="$(PKG_BUILD_DIR)/$(PKG_EXTMOD_SUBDIRS)" \
5259
NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
5360
$(EXTRA_KCONFIG)
5461

5562
define Build/Compile
56-
$(MAKE) -C "$(LINUX_DIR)" \
63+
+$(KERNEL_MAKE) $(PKG_JOBS) \
5764
$(MAKE_OPTS) \
5865
modules
5966
endef
6067

61-
$(eval $(call KernelPackage,ovpn-dco-v2))
68+
$(eval $(call KernelPackage,ovpn))

0 commit comments

Comments
 (0)