Skip to content

Commit

Permalink
Made changes to fix the build isssue caused by the ygot community cha…
Browse files Browse the repository at this point in the history
…nges (#43)
  • Loading branch information
mbalachandar authored Mar 20, 2020
1 parent 2412c85 commit 3b17782
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions Makefile
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

0 comments on commit 3b17782

Please sign in to comment.