mirror of
https://github.com/kiddin9/op-packages.git
synced 2026-07-28 03:01:54 +08:00
22 lines
669 B
Diff
22 lines
669 B
Diff
--- a/shortcut-fe/shortcut-fe/Makefile
|
|
+++ b/shortcut-fe/shortcut-fe/Makefile
|
|
@@ -58,7 +58,6 @@ define KernelPackage/shortcut-fe-cm
|
|
CONFIG_NF_CONNTRACK_CHAIN_EVENTS=y \
|
|
CONFIG_NF_CONNTRACK_EVENTS=y \
|
|
CONFIG_XFRM=y
|
|
- CONFLICTS:=kmod-shortcut-fe-drv
|
|
endef
|
|
|
|
define KernelPackage/shortcut-fe-cm/Description
|
|
|
|
--- a/shortcut-fe/fast-classifier/Makefile
|
|
+++ b/shortcut-fe/fast-classifier/Makefile
|
|
@@ -32,7 +32,6 @@ define KernelPackage/fast-classifier/Default
|
|
CONFIG_NF_CONNTRACK_CHAIN_EVENTS=y \
|
|
CONFIG_NF_CONNTRACK_MARK=y \
|
|
CONFIG_XFRM=y
|
|
- CONFLICTS:=kmod-shortcut-fe-drv kmod-shortcut-fe-cm
|
|
endef
|
|
|
|
define KernelPackage/fast-classifier
|