fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 02:38:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: add path definition for ip6tables

Browse source
This commit is contained in:
Jan Vaclav 2025-03-11 11:18:59 +01:00
parent 10c2892d57
commit 0f469b30ad
7 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config.h.meson
View file

@ -67,6 +67,9 @@
/* Define to path of iptables binary */ /* Define to path of iptables binary */
#mesondefine IPTABLES_PATH #mesondefine IPTABLES_PATH
/* Define to path of ip6tables binary */
#mesondefine IP6TABLES_PATH
/* Define to path of nft binary */ /* Define to path of nft binary */
#mesondefine NFT_PATH #mesondefine NFT_PATH

1
contrib/fedora/rpm/NetworkManager.spec
View file

@ -597,6 +597,7 @@ Preferably use nmcli instead.
%endif %endif
-Dnft=%{_sbindir}/nft \ -Dnft=%{_sbindir}/nft \
-Diptables=%{_sbindir}/iptables \ -Diptables=%{_sbindir}/iptables \
-Dip6tables=%{_sbindir}/ip6tables \
%if %{with dhclient} %if %{with dhclient}
-Ddhclient=%{_sbindir}/dhclient \ -Ddhclient=%{_sbindir}/dhclient \
%else %else

1
contrib/fedora/rpm/build_clean.sh
View file

@ -222,6 +222,7 @@ if [[ $NO_DIST != 1 ]]; then
-Dconfig_dhcp_default=internal \ -Dconfig_dhcp_default=internal \
-Dconfig_dns_rc_manager_default=auto \ -Dconfig_dns_rc_manager_default=auto \
-Diptables=/usr/sbin/iptables \ -Diptables=/usr/sbin/iptables \
-Dip6tables=/usr/sbin/ip6tables \
-Dnft=/usr/bin/nft \ -Dnft=/usr/bin/nft \
|| die "Error meson setup" || die "Error meson setup"

1
contrib/fedora/rpm/configure-for-system.sh
View file

@ -368,6 +368,7 @@ meson setup\
$(args_enable "$P_TEST" --werror) \ $(args_enable "$P_TEST" --werror) \
-Dnft="${D_SBINDIR}/nft" \ -Dnft="${D_SBINDIR}/nft" \
-Diptables="${D_SBINDIR}/iptables" \ -Diptables="${D_SBINDIR}/iptables" \
-Dip6tables="${D_SBINDIR}/ip6tables" \
-Ddhclient="${D_SBINDIR}/dhclient" \ -Ddhclient="${D_SBINDIR}/dhclient" \
-Ddhcpcd=no \ -Ddhcpcd=no \
-Dconfig_dhcp_default="$P_DHCP_DEFAULT" \ -Dconfig_dhcp_default="$P_DHCP_DEFAULT" \

2
meson.build
View file

@ -723,6 +723,7 @@ default_paths = ['/sbin', '/usr/sbin']
# 0: cmdline option, 1: paths, 2: fallback # 0: cmdline option, 1: paths, 2: fallback
progs = [['iptables', default_paths, '/usr/sbin/iptables'], progs = [['iptables', default_paths, '/usr/sbin/iptables'],
['ip6tables', default_paths, '/usr/sbin/ip6tables'],
['nft', default_paths, '/usr/sbin/nft'], ['nft', default_paths, '/usr/sbin/nft'],
['dnsmasq', default_paths, ''], ['dnsmasq', default_paths, ''],
['modprobe', default_paths, '/sbin/modprobe'] ['modprobe', default_paths, '/sbin/modprobe']
@ -1125,6 +1126,7 @@ endif
output += '\n' output += '\n'
output += ' jansson: ' + jansson_msg + '\n' output += ' jansson: ' + jansson_msg + '\n'
output += ' iptables: ' + config_h.get('IPTABLES_PATH') + '\n' output += ' iptables: ' + config_h.get('IPTABLES_PATH') + '\n'
output += ' ip6tables: ' + config_h.get('IP6TABLES_PATH') + '\n'
output += ' nft: ' + config_h.get('NFT_PATH') + '\n' output += ' nft: ' + config_h.get('NFT_PATH') + '\n'
output += ' modprobe: ' + config_h.get('MODPROBE_PATH') + '\n' output += ' modprobe: ' + config_h.get('MODPROBE_PATH') + '\n'
output += ' modemmanager-1: ' + enable_modem_manager.to_string() + '\n' output += ' modemmanager-1: ' + enable_modem_manager.to_string() + '\n'

1
meson_options.txt
View file

@ -6,6 +6,7 @@ option('dbus_conf_dir', type: 'string', value: '', description: 'where D-Bus sys
option('kernel_firmware_dir', type: 'string', value: '/lib/firmware', description: 'where kernel firmware directory is (default is /lib/firmware)') option('kernel_firmware_dir', type: 'string', value: '/lib/firmware', description: 'where kernel firmware directory is (default is /lib/firmware)')
option('runtime_dir', type: 'string', value: '', description: 'Directory for transient runtime state [default: LOCALSTATEDIR/run or /run]') option('runtime_dir', type: 'string', value: '', description: 'Directory for transient runtime state [default: LOCALSTATEDIR/run or /run]')
option('iptables', type: 'string', value: '', description: 'path to iptables') option('iptables', type: 'string', value: '', description: 'path to iptables')
option('ip6tables', type: 'string', value: '', description: 'path to ip6tables')
option('nft', type: 'string', value: '', description: 'path to nft') option('nft', type: 'string', value: '', description: 'path to nft')
option('dnsmasq', type: 'string', value: '', description: 'path to dnsmasq') option('dnsmasq', type: 'string', value: '', description: 'path to dnsmasq')
option('modprobe', type: 'string', value: '', description: 'path to modprobe') option('modprobe', type: 'string', value: '', description: 'path to modprobe')

1
src/core/tests/test-core.c
View file

@ -36,6 +36,7 @@ test_config_h(void)
G_STMT_END G_STMT_END
ABSOLUTE_PATH(IPTABLES_PATH); ABSOLUTE_PATH(IPTABLES_PATH);
ABSOLUTE_PATH(IP6TABLES_PATH);
ABSOLUTE_PATH(NFT_PATH); ABSOLUTE_PATH(NFT_PATH);
} }