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

make: revert switch to 'go install'

Browse source 
go install acts incredibly weirdly and rarely does what you want, not to
mention that it's just bad for distribution build setups. Switch back to
go build, which works properly and doesn't have half as many issues.

Fixes: 6c9628cdb1 ("Build and install from GOPATH")
Signed-off-by: Aleksa Sarai <asarai@suse.de>
This commit is contained in:
Aleksa Sarai 2017-01-25 00:07:05 +11:00
parent 6d76ea2fa1
commit 0d7147ff5c
No known key found for this signature in database
GPG key ID: 9E18AA267DDB8DB4
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -12,3 +12,6 @@ test/bin2img/bin2img
test/copyimg/copyimg test/copyimg/copyimg
test/testdata/redis-image test/testdata/redis-image
test/checkseccomp/checkseccomp test/checkseccomp/checkseccomp
ocid
ocic
kpod

15
Makefile
View file

@ -13,8 +13,6 @@ ETCDIR ?= ${DESTDIR}/etc
ETCDIR_OCID ?= ${ETCDIR}/ocid ETCDIR_OCID ?= ${ETCDIR}/ocid
BUILDTAGS := selinux seccomp $(shell hack/btrfs_tag.sh) $(shell hack/libdm_tag.sh) BUILDTAGS := selinux seccomp $(shell hack/btrfs_tag.sh) $(shell hack/libdm_tag.sh)
BASHINSTALLDIR=${PREFIX}/share/bash-completion/completions BASHINSTALLDIR=${PREFIX}/share/bash-completion/completions
GOBINDIR := $(word 1,$(subst :, ,$(GOPATH)))
PATH := $(GOBINDIR)/bin:$(PATH)
all: binaries ocid.conf docs all: binaries ocid.conf docs
@ -60,15 +58,15 @@ checkseccomp: check-gopath
$(MAKE) -C test/$@ $(MAKE) -C test/$@
ocid: check-gopath ocid: check-gopath
$(GO) install \ $(GO) build -o $@ \
-tags "$(BUILDTAGS)" \ -tags "$(BUILDTAGS)" \
$(PROJECT)/cmd/ocid $(PROJECT)/cmd/ocid
ocic: check-gopath ocic: check-gopath
$(GO) install $(PROJECT)/cmd/ocic $(GO) build -o $@ $(PROJECT)/cmd/ocic
kpod: check-gopath kpod: check-gopath
$(GO) install $(PROJECT)/cmd/kpod $(GO) build -o $@ $(PROJECT)/cmd/kpod
ocid.conf: ocid ocid.conf: ocid
ocid --config="" config --default > ocid.conf ocid --config="" config --default > ocid.conf
@ -78,6 +76,7 @@ clean:
rm -fr test/testdata/redis-image rm -fr test/testdata/redis-image
find . -name \*~ -delete find . -name \*~ -delete
find . -name \#\* -delete find . -name \#\* -delete
rm -f ocic ocid kpod
make -C conmon clean make -C conmon clean
make -C pause clean make -C pause clean
make -C test/bin2img clean make -C test/bin2img clean
@ -113,9 +112,9 @@ docs/%.8: docs/%.8.md check-gopath
docs: $(MANPAGES) docs: $(MANPAGES)
install: check-gopath install: check-gopath
install -D -m 755 $(GOBINDIR)/bin/ocid $(BINDIR)/ocid install -D -m 755 ocid $(BINDIR)/ocid
install -D -m 755 $(GOBINDIR)/bin/ocic $(BINDIR)/ocic install -D -m 755 ocic $(BINDIR)/ocic
install -D -m 755 $(GOBINDIR)/bin/kpod $(BINDIR)/kpod install -D -m 755 kpod $(BINDIR)/kpod
install -D -m 755 conmon/conmon $(LIBEXECDIR)/ocid/conmon install -D -m 755 conmon/conmon $(LIBEXECDIR)/ocid/conmon
install -D -m 755 pause/pause $(LIBEXECDIR)/ocid/pause install -D -m 755 pause/pause $(LIBEXECDIR)/ocid/pause
install -d -m 755 $(MANDIR)/man1 install -d -m 755 $(MANDIR)/man1

4
test/helpers.bash
View file

@ -10,9 +10,9 @@ TESTDATA="${INTEGRATION_ROOT}/testdata"
OCID_ROOT=${OCID_ROOT:-$(cd "$INTEGRATION_ROOT/../.."; pwd -P)} OCID_ROOT=${OCID_ROOT:-$(cd "$INTEGRATION_ROOT/../.."; pwd -P)}
# Path of the ocid binary. # Path of the ocid binary.
OCID_BINARY=${OCID_BINARY:-${GOPATH}/bin/ocid} OCID_BINARY=${OCID_BINARY:-${OCID_ROOT}/cri-o/ocid}
# Path of the ocic binary. # Path of the ocic binary.
OCIC_BINARY=${OCIC_BINARY:-${GOPATH}/bin/ocic} OCIC_BINARY=${OCIC_BINARY:-${OCID_ROOT}/cri-o/ocic}
# Path of the conmon binary. # Path of the conmon binary.
CONMON_BINARY=${CONMON_BINARY:-${OCID_ROOT}/cri-o/conmon/conmon} CONMON_BINARY=${CONMON_BINARY:-${OCID_ROOT}/cri-o/conmon/conmon}
# Path of the pause binary. # Path of the pause binary.