From cffe51f497033702f90ad0fbf1f40ca76c56efbf Mon Sep 17 00:00:00 2001 From: Aloys Augustin Date: Tue, 7 Jul 2020 16:28:50 +0200 Subject: [PATCH] Build system update - Add top level Makefile - Fix image build --- Makefile | 11 +++++++++++ .../etc}/service/calico-vpp-agent/log/run | 0 .../etc}/service/calico-vpp-agent/run | 0 vpp-manager/Makefile | 4 ++-- 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 Makefile rename {etc => calico-vpp-agent/etc}/service/calico-vpp-agent/log/run (100%) rename {etc => calico-vpp-agent/etc}/service/calico-vpp-agent/run (100%) diff --git a/Makefile b/Makefile new file mode 100644 index 000000000..30aaf8366 --- /dev/null +++ b/Makefile @@ -0,0 +1,11 @@ +.PHONY: all build image + +all: image + +build: + $(MAKE) -C calico-vpp-agent $@ + $(MAKE) -C vpp-manager $@ + +image: + $(MAKE) -C calico-vpp-agent $@ + $(MAKE) -C vpp-manager $@ diff --git a/etc/service/calico-vpp-agent/log/run b/calico-vpp-agent/etc/service/calico-vpp-agent/log/run similarity index 100% rename from etc/service/calico-vpp-agent/log/run rename to calico-vpp-agent/etc/service/calico-vpp-agent/log/run diff --git a/etc/service/calico-vpp-agent/run b/calico-vpp-agent/etc/service/calico-vpp-agent/run similarity index 100% rename from etc/service/calico-vpp-agent/run rename to calico-vpp-agent/etc/service/calico-vpp-agent/run diff --git a/vpp-manager/Makefile b/vpp-manager/Makefile index 6d904c4f8..b8d600006 100644 --- a/vpp-manager/Makefile +++ b/vpp-manager/Makefile @@ -1,6 +1,6 @@ -.PHONY: all build image +.PHONY: all build image imageonly vpp -VPPLINK_DIR=$(shell go list -f '{{.Dir}}' -m github.com/calico-vpp/vpplink) +VPPLINK_DIR="../vpplink" IMAGE_DIR=images/ubuntu/ all: image