Skip to content

Commit 2cdb54e

Browse files
committed
netfilter: fix file clash during install of kmod-iptables
A regression in openwrt#21078 caused ip_tables.ko and x_tables.ko to be installed by both kmod-nf-ipt and kmod-iptables: * check_data_file_clashes: Package kmod-nf-ipt wants to install file /Volumes/x64/openwrt/build_dir/target-x86_64_musl/root-x86/lib/modules/6.18.33/ip_tables.ko But that file is already provided by package * kmod-iptables * check_data_file_clashes: Package kmod-nf-ipt wants to install file /Volumes/x64/openwrt/build_dir/target-x86_64_musl/root-x86/lib/modules/6.18.33/x_tables.ko Remove the files from the install list of kmod-iptables, to avoid errors during installation. Fixes: openwrt#23630 Signed-off-by: Georgi Valkov <gvalkov@gmail.com>
1 parent dd45fd9 commit 2cdb54e

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

package/kernel/linux/modules/netfilter.mk

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@ define KernelPackage/iptables
6363
CONFIG_BRIDGE_NF_EBTABLES_LEGACY
6464
HIDDEN:=1
6565
DEPENDS:=@!LINUX_6_12
66-
FILES:= \
67-
$(LINUX_DIR)/net/ipv4/netfilter/ip_tables.ko \
68-
$(LINUX_DIR)/net/netfilter/x_tables.ko
66+
FILES:=
6967
AUTOLOAD:=$(call AutoProbe,$(notdir ip_tables x_tables))
7068
endef
7169

0 commit comments

Comments
 (0)