From f446d8df95c8276475830a385ca6bf0d406f86fe Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Thu, 16 Nov 2017 20:01:03 +0100 Subject: [PATCH] input: Rename to trigger Signed-off-by: Samuel Ortiz --- Makefile | 16 ++++++++-------- {input => trigger}/kicker/kicker.go | 0 {input => trigger}/virtcontainers/vc.go | 0 vc-throttler.service.in | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) rename {input => trigger}/kicker/kicker.go (100%) rename {input => trigger}/virtcontainers/vc.go (100%) diff --git a/Makefile b/Makefile index 926c32c..d18cf60 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ LIBEXECDIR = $(PREFIX)/libexec LOCALSTATEDIR = /var SOURCES = $(shell find . 2>&1 | grep -E '.*\.(c|h|go)$$') KSM_SOCKET = $(LOCALSTATEDIR)/run/ksm-throttler/ksm.sock -INPUT_DIR = $(GOPATH)/src/$(PACKAGE)/input +TRIGGER_DIR = $(GOPATH)/src/$(PACKAGE)/trigger GO = go PKGS = $(or $(PKG),$(shell cd $(BASE) && env GOPATH=$(GOPATH) $(GO) list ./... | grep -v "/vendor/")) @@ -40,12 +40,12 @@ throttler: "-X main.DefaultURI=$(KSM_SOCKET) -X main.Version=$(VERSION)" throttler.go ksm.go kicker: - $(QUIET_GOBUILD)go build -o $(INPUT_DIR)/kicker/$@ \ - -ldflags "-X main.DefaultURI=$(KSM_SOCKET)" $(INPUT_DIR)/kicker/*.go + $(QUIET_GOBUILD)go build -o $(TRIGGER_DIR)/kicker/$@ \ + -ldflags "-X main.DefaultURI=$(KSM_SOCKET)" $(TRIGGER_DIR)/kicker/*.go virtcontainers: - $(QUIET_GOBUILD)go build -o $(INPUT_DIR)/virtcontainers/vc \ - -ldflags "-X main.DefaultURI=$(KSM_SOCKET)" $(INPUT_DIR)/virtcontainers/*.go + $(QUIET_GOBUILD)go build -o $(TRIGGER_DIR)/virtcontainers/vc \ + -ldflags "-X main.DefaultURI=$(KSM_SOCKET)" $(TRIGGER_DIR)/virtcontainers/*.go binaries: throttler kicker virtcontainers @@ -90,7 +90,7 @@ all-installable: ksm-throttler virtcontainers $(UNIT_FILES) install: all-installable $(call INSTALL_EXEC,ksm-throttler,$(LIBEXECDIR)/ksm-throttler) - $(call INSTALL_EXEC,input/virtcontainers/vc,$(LIBEXECDIR)/ksm-throttler) + $(call INSTALL_EXEC,trigger/virtcontainers/vc,$(LIBEXECDIR)/ksm-throttler) $(foreach f,$(UNIT_FILES),$(call INSTALL_FILE,$f,$(UNIT_DIR))) # @@ -99,8 +99,8 @@ install: all-installable clean: rm -f ksm-throttler - rm -f $(INPUT_DIR)/kicker/kicker - rm -f $(INPUT_DIR)/virtcontainers/vc + rm -f $(TRIGGER_DIR)/kicker/kicker + rm -f $(TRIGGER_DIR)/virtcontainers/vc $(GENERATED_FILES): %: %.in Makefile @mkdir -p `dirname $@` diff --git a/input/kicker/kicker.go b/trigger/kicker/kicker.go similarity index 100% rename from input/kicker/kicker.go rename to trigger/kicker/kicker.go diff --git a/input/virtcontainers/vc.go b/trigger/virtcontainers/vc.go similarity index 100% rename from input/virtcontainers/vc.go rename to trigger/virtcontainers/vc.go diff --git a/vc-throttler.service.in b/vc-throttler.service.in index e469fc9..53b09a8 100644 --- a/vc-throttler.service.in +++ b/vc-throttler.service.in @@ -4,7 +4,7 @@ Documentation=https://github.com/kata-containers/ksm-throttler Requires=ksm-throttler.service [Service] -ExecStart=@libexecdir@/ksm-throttler/input/virtcontainers/vc -log debug +ExecStart=@libexecdir@/ksm-throttler/trigger/virtcontainers/vc -log debug Restart=always [Install]