vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge branch 'pr-149'

Browse source 
LGTMs: @mrunalp @rhatdan
Closes #149
This commit is contained in:
Aleksa Sarai 2016-11-01 00:14:11 +11:00
commit 2d80c8822f
No known key found for this signature in database
GPG key ID: 9E18AA267DDB8DB4
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -4,7 +4,7 @@ conmon/conmon
conmon/conmon.o conmon/conmon.o
pause/pause pause/pause
pause/pause.o pause/pause.o
/docs/ocid.8 /docs/*.[58]
/docs/ocid.conf.5 /docs/*.[58].gz
vendor/src/github.com/kubernetes-incubator/cri-o vendor/src/github.com/kubernetes-incubator/cri-o
ocid.conf ocid.conf

12
Makefile
View file

@ -40,11 +40,12 @@ conmon:
pause: pause:
make -C $@ make -C $@
GO_SRC = $(shell find . -name \*.go) GO_SRC = $(shell find . -name \*.go)
ocid: $(GO_SRC) ${OCID_LINK}
ocid: $(GO_SRC) | ${OCID_LINK}
go build --tags "$(BUILDTAGS)" -o $@ ./cmd/server/ go build --tags "$(BUILDTAGS)" -o $@ ./cmd/server/
ocic: $(GO_SRC) ocic: $(GO_SRC) | ${OCID_LINK}
go build -o $@ ./cmd/client/ go build -o $@ ./cmd/client/
ocid.conf: ocid ocid.conf: ocid
@ -99,11 +100,12 @@ install: all
install -m 644 $(wildcard docs/*.8) $(PREFIX)/share/man/man8 install -m 644 $(wildcard docs/*.8) $(PREFIX)/share/man/man8
install -d $(PREFIX)/share/man/man5 install -d $(PREFIX)/share/man/man5
install -m 644 $(wildcard docs/*.5) $(PREFIX)/share/man/man5 install -m 644 $(wildcard docs/*.5) $(PREFIX)/share/man/man5
install -D -m 644 ocid.service $(PREFIX)/lib/systemd/system
install -D -m 644 ocid.conf $(DESTDIR)/etc install -D -m 644 ocid.conf $(DESTDIR)/etc
install.systemd:
install -D -m 644 ocid.service $(PREFIX)/lib/systemd/system
uninstall: uninstall:
rm -f $(PREFIX)/lib/systemd/system/ocid.service
rm -f ${INSTALLDIR}/{ocid,ocic} rm -f ${INSTALLDIR}/{ocid,ocic}
rm -f $(PREFIX)/libexec/ocid/{conmon,pause} rm -f $(PREFIX)/libexec/ocid/{conmon,pause}
for i in $(wildcard docs/*.8); do \ for i in $(wildcard docs/*.8); do \

0
ocid.service → contrib/systemd/ocid.service
View file