mirror of
https://github.com/espressif/openthread.git
synced 2026-10-04 14:57:38 +00:00
[nat64] change BORDER_ROUTING_NAT64 to NAT64_BORDER_ROUTING (#8047)
We decided to rename BORDER_ROUTING_NAT64 to NAT64_BORDER_ROUTING so the flag won't be confusing since we have NAT64_TRANSLATOR which does not depends on the border routing manager.
This commit is contained in:
@@ -37,8 +37,6 @@ readonly OT_BUILD_OPTIONS=(
|
||||
"-DOT_BORDER_AGENT=ON"
|
||||
"-DOT_BORDER_ROUTER=ON"
|
||||
"-DOT_BORDER_ROUTING=ON"
|
||||
"-DOT_BORDER_ROUTING_NAT64=ON"
|
||||
"-DOT_NAT64_TRANSLATOR=ON"
|
||||
"-DOT_COAP=ON"
|
||||
"-DOT_COAP_BLOCK=ON"
|
||||
"-DOT_COAP_OBSERVE=ON"
|
||||
@@ -64,6 +62,8 @@ readonly OT_BUILD_OPTIONS=(
|
||||
"-DOT_LOG_LEVEL_DYNAMIC=ON"
|
||||
"-DOT_MAC_FILTER=ON"
|
||||
"-DOT_MTD_NETDIAG=ON"
|
||||
"-DOT_NAT64_BORDER_ROUTING=ON"
|
||||
"-DOT_NAT64_TRANSLATOR=ON"
|
||||
"-DOT_NEIGHBOR_DISCOVERY_AGENT=ON"
|
||||
"-DOT_PING_SENDER=ON"
|
||||
"-DOT_PLATFORM=external"
|
||||
|
||||
@@ -95,7 +95,7 @@ build_all_features()
|
||||
|
||||
local options_1_3=(
|
||||
"-DOPENTHREAD_CONFIG_BACKBONE_ROUTER_ENABLE=1"
|
||||
"-DOPENTHREAD_CONFIG_BORDER_ROUTING_NAT64_ENABLE=1"
|
||||
"-DOPENTHREAD_CONFIG_NAT64_BORDER_ROUTING_ENABLE=1"
|
||||
"-DOPENTHREAD_CONFIG_NAT64_TRANSLATOR_ENABLE=1"
|
||||
"-DOPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE=1"
|
||||
"-DOPENTHREAD_CONFIG_DUA_ENABLE=1"
|
||||
|
||||
@@ -57,7 +57,7 @@ build_all_features()
|
||||
local options=(
|
||||
"-DOT_BACKBONE_ROUTER=ON"
|
||||
"-DOT_BORDER_ROUTING=ON"
|
||||
"-DOT_BORDER_ROUTING_NAT64=ON"
|
||||
"-DOT_NAT64_BORDER_ROUTING=ON"
|
||||
"-DOT_NAT64_TRANSLATOR=ON"
|
||||
"-DOT_CSL_RECEIVER=ON"
|
||||
"-DOT_MLR=ON"
|
||||
|
||||
+2
-2
@@ -83,8 +83,6 @@ readonly OT_CLANG_TIDY_BUILD_OPTS=(
|
||||
'-DOT_BORDER_AGENT=ON'
|
||||
'-DOT_BORDER_ROUTER=ON'
|
||||
'-DOT_BORDER_ROUTING=ON'
|
||||
'-DOT_BORDER_ROUTING_NAT64=ON'
|
||||
'-DOT_NAT64_TRANSLATOR=ON'
|
||||
'-DOT_CHANNEL_MANAGER=ON'
|
||||
'-DOT_CHANNEL_MONITOR=ON'
|
||||
'-DOT_CHILD_SUPERVISION=ON'
|
||||
@@ -114,6 +112,8 @@ readonly OT_CLANG_TIDY_BUILD_OPTS=(
|
||||
'-DOT_LINK_METRICS_SUBJECT=ON'
|
||||
'-DOT_MAC_FILTER=ON'
|
||||
'-DOT_MTD_NETDIAG=ON'
|
||||
'-DOT_NAT64_BORDER_ROUTING=ON'
|
||||
'-DOT_NAT64_TRANSLATOR=ON'
|
||||
'-DOT_NETDATA_PUBLISHER=ON'
|
||||
'-DOT_PING_SENDER=ON'
|
||||
'-DOT_REFERENCE_DEVICE=ON'
|
||||
|
||||
+2
-2
@@ -297,9 +297,9 @@ do_build_otbr_docker()
|
||||
fi
|
||||
|
||||
if [[ ${NAT64} == 1 ]]; then
|
||||
otbr_options+=("-DOTBR_BORDER_ROUTING_NAT64=ON")
|
||||
otbr_options+=("-DOT_NAT64_BORDER_ROUTING=ON")
|
||||
else
|
||||
otbr_options+=("-DOTBR_BORDER_ROUTING_NAT64=OFF")
|
||||
otbr_options+=("-DOT_NAT64_BORDER_ROUTING=OFF")
|
||||
fi
|
||||
|
||||
local otbr_docker_image=${OTBR_DOCKER_IMAGE:-otbr-ot12-backbone-ci}
|
||||
|
||||
Reference in New Issue
Block a user