Skip to content

Commit

Permalink
Fix INCLUDE_P4RT make option
Browse files Browse the repository at this point in the history
  • Loading branch information
bocon13 committed Dec 10, 2021
1 parent afd4098 commit 90c8d9b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions Makefile.work
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
# * SHUTDOWN_BGP_ON_START: Sets admin-down state for all bgp peerings after restart.
# * INCLUDE_KUBERNETES: Allows including Kubernetes
# * INCLUDE_MUX: Include MUX feature/services for TOR switch.
# * INCLUDE_P4RT: Include P4RT feature/services.
# * ENABLE_PFCWD_ON_START: Enable PFC Watchdog (PFCWD) on server-facing ports
# * by default for TOR switch.
# * ENABLE_SYNCD_RPC: Enables rpc-based syncd builds.
Expand Down Expand Up @@ -284,6 +285,7 @@ SONIC_BUILD_INSTRUCTION := make \
INCLUDE_DHCP_RELAY=$(INCLUDE_DHCP_RELAY) \
SONIC_INCLUDE_RESTAPI=$(INCLUDE_RESTAPI) \
SONIC_INCLUDE_MUX=$(INCLUDE_MUX) \
SONIC_INCLUDE_P4RT=$(INCLUDE_P4RT) \
TELEMETRY_WRITABLE=$(TELEMETRY_WRITABLE) \
EXTRA_DOCKER_TARGETS=$(EXTRA_DOCKER_TARGETS) \
BUILD_LOG_TIMESTAMP=$(BUILD_LOG_TIMESTAMP) \
Expand Down
8 changes: 4 additions & 4 deletions slave.mk
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,10 @@ endif
# Pre-built Bazel is not available for armhf, so exclude P4RT
# TODO(PINS): Remove when Bazel binaries are available for armhf
ifeq ($(CONFIGURED_ARCH),armhf)
ifeq ($(INCLUDE_P4RT),y)
@echo "Disabling P4RT due to incompatible CPU architecture: $(CONFIGURED_ARCH)"
endif
override INCLUDE_P4RT = n
ifeq ($(INCLUDE_P4RT),y)
$(warning Disabling P4RT due to incompatible CPU architecture: $(CONFIGURED_ARCH))
endif
override INCLUDE_P4RT = n
endif

ifeq ($(SONIC_INCLUDE_MACSEC),y)
Expand Down

0 comments on commit 90c8d9b

Please sign in to comment.