From 76fdab1485c702b6f16a5397021528d9f6524bbf Mon Sep 17 00:00:00 2001 From: Fabian Seidl <fabian.b.seidl@stud.h-da.de> Date: Wed, 4 May 2022 11:34:00 +0000 Subject: [PATCH] Problem with the installation of tools using Makefile on controller layer See merge request danet/gosdn!300 --- controller/Makefile | 2 +- go.mod | 2 +- go.sum | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/controller/Makefile b/controller/Makefile index 52a101ee3..1ca977f2b 100644 --- a/controller/Makefile +++ b/controller/Makefile @@ -1,6 +1,6 @@ MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) MAKEFILE_DIR := $(dir $(MAKEFILE_PATH)) -TOOLS_DIR:= build-tools +TOOLS_DIR:= ../build-tools GOSDN_PRG := $(MAKEFILE_DIR)$(TOOLS_DIR) GOBIN := $(GOSDN_PRG) diff --git a/go.mod b/go.mod index 866ab3d64..9718a98b6 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa ) -require github.com/sethvargo/go-password v0.2.0 // indirect +require github.com/sethvargo/go-password v0.2.0 require ( github.com/Microsoft/go-winio v0.5.1 // indirect diff --git a/go.sum b/go.sum index 2c50c5676..edc081bb5 100644 --- a/go.sum +++ b/go.sum @@ -1054,6 +1054,7 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161/go.mod h1:wM7WEvslTq+iOEAMDLSzhVuOt5BRZ05WirO+b09GHQU= github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b/go.mod h1:5XA7W9S6mni3h5uvOC75dA3m9CCCaS83lltmc0ukdi4= +github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tjfoc/gmsm v1.4.0/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -- GitLab