Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable caching of p4lang packages #20761

Merged
merged 1 commit into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions rules/p4lang.dep
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,21 @@ DEP_FILES += $(shell git ls-files $(SPATH))
$(P4LANG_PI)_CACHE_MODE := GIT_CONTENT_SHA
$(P4LANG_PI)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
$(P4LANG_PI)_DEP_FILES := $(DEP_FILES)

SPATH := $($(P4LANG_BMV2)_SRC_PATH)
DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/p4lang.mk rules/p4lang.dep
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
DEP_FILES += $(shell git ls-files $(SPATH))

$(P4LANG_BMV2)_CACHE_MODE := GIT_CONTENT_SHA
$(P4LANG_BMV2)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
$(P4LANG_BMV2)_DEP_FILES := $(DEP_FILES)

SPATH := $($(P4LANG_P4C)_SRC_PATH)
DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/p4lang.mk rules/p4lang.dep
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
DEP_FILES += $(shell git ls-files $(SPATH))

$(P4LANG_P4C)_CACHE_MODE := GIT_CONTENT_SHA
$(P4LANG_P4C)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
$(P4LANG_P4C)_DEP_FILES := $(DEP_FILES)
11 changes: 4 additions & 7 deletions rules/p4lang.mk
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,10 @@ export P4LANG_PI_VERSION
export P4LANG_PI_VERSION_FULL

P4LANG_PI = p4lang-pi_$(P4LANG_PI_VERSION_FULL)_$(CONFIGURED_ARCH).deb
$(P4LANG_PI)_SRC_PATH = $(SRC_PATH)/p4lang
$(P4LANG_PI)_DEPENDS = $(PROTOBUF) $(PROTOBUF_LITE) $(PROTOC32) $(PYTHON3_PROTOBUF) $(GRPC) $(GRPC_CPP) $(PYTHON3_GRPC) $(PROTOBUF_DEV) $(PROTOC_DEV) $(PROTOBUF_COMPILER) $(GRPC_DEV) $(GRPC_CPP_DEV) $(GRPC_COMPILER)
$(P4LANG_PI)_RDEPENDS = $(PROTOBUF) $(PROTOBUF_LITE) $(PROTOC32) $(PYTHON3_PROTOBUF) $(GRPC) $(GRPC_CPP) $(PYTHON3_GRPC) $(PROTOBUF_DEV) $(PROTOC_DEV) $(PROTOBUF_COMPILER) $(GRPC_DEV) $(GRPC_CPP_DEV) $(GRPC_COMPILER)


P4LANG = $(P4LANG_PI)
$(P4LANG)_SRC_PATH = $(SRC_PATH)/p4lang
SONIC_MAKE_DEBS += $(P4LANG)
SONIC_MAKE_DEBS += $(P4LANG_PI)

# p4lang-bmv2

Expand All @@ -25,7 +22,7 @@ export P4LANG_BMV2_VERSION
export P4LANG_BMV2_VERSION_FULL

P4LANG_BMV2 = p4lang-bmv2_$(P4LANG_BMV2_VERSION_FULL)_$(CONFIGURED_ARCH).deb
$(P4LANG_BMV2)_SRC_PATH = $(SRC_PATH)/p4lang
$(P4LANG_BMV2)_SRC_PATH = $($(P4LANG_PI)_SRC_PATH)
$(P4LANG_BMV2)_DEPENDS = $(P4LANG_PI)
$(P4LANG_BMV2)_RDEPENDS = $(P4LANG_PI)
SONIC_MAKE_DEBS += $(P4LANG_BMV2)
Expand All @@ -39,7 +36,7 @@ export P4LANG_P4C_VERSION
export P4LANG_P4C_VERSION_FULL

P4LANG_P4C = p4lang-p4c_$(P4LANG_P4C_VERSION_FULL)_$(CONFIGURED_ARCH).deb
$(P4LANG_P4C)_SRC_PATH = $(SRC_PATH)/p4lang
$(P4LANG_P4C)_SRC_PATH = $($(P4LANG_PI)_SRC_PATH)
$(P4LANG_P4C)_DEPENDS = $(P4LANG_BMV2)
$(P4LANG_P4C)_RDEPENDS = $(P4LANG_BMV2)
SONIC_MAKE_DEBS += $(P4LANG_P4C)
Loading