Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Commit

Permalink
input: Rename to trigger
Browse files Browse the repository at this point in the history
Signed-off-by: Samuel Ortiz <[email protected]>
  • Loading branch information
Samuel Ortiz committed Nov 16, 2017
1 parent 8c5056a commit f446d8d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/"))

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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)))

#
Expand All @@ -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 $@`
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion vc-throttler.service.in
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down

0 comments on commit f446d8d

Please sign in to comment.