Skip to content

To fix the build issue caused by the ygot community changes #43

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Mar 20, 2020
Merged

To fix the build issue caused by the ygot community changes #43

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ MAIN_TARGET = sonic-mgmt-framework_1.0-01_amd64.deb

GO_DEPS_LIST = github.com/gorilla/mux \
github.com/Workiva/go-datastructures/queue \
github.com/openconfig/goyang \
github.com/openconfig/ygot/ygot \
github.com/go-redis/redis \
github.com/golang/glog \
github.com/pkg/profile \
Expand All @@ -52,6 +50,10 @@ GO_DEPS_LIST = github.com/gorilla/mux \
github.com/facette/natsort \
github.com/philopon/go-toposort

# GO_DEPS_LIST_2 includes "download only" dependencies.
# They are patched, compiled and installed explicitly later.
GO_DEPS_LIST_2 = github.com/openconfig/goyang \
github.com/openconfig/ygot/ygot

REST_BIN = $(BUILD_DIR)/rest_server/main
CERTGEN_BIN = $(BUILD_DIR)/rest_server/generate_cert
Expand All @@ -62,7 +64,7 @@ all: build-deps go-deps go-pkg-version go-patch translib rest-server cli
build-deps:
mkdir -p $(BUILD_DIR)

go-deps: $(GO_DEPS_LIST)
go-deps: $(GO_DEPS_LIST) $(GO_DEPS_LIST_2)

go-pkg-version: go-deps
cd $(BUILD_GOPATH)/src/github.com/go-redis/redis; git checkout d19aba07b47683ef19378c4a4d43959672b7cec8 2>/dev/null ; true; \
Expand All @@ -85,6 +87,9 @@ $(GO) install -v -gcflags "-N -l" $(BUILD_GOPATH)/src/github.com/philopon/go-top
$(GO_DEPS_LIST):
$(GO) get -v $@

$(GO_DEPS_LIST_2):
$(GO) get -v -d $@

cli: rest-server
$(MAKE) -C src/CLI

Expand Down