Skip to content

Commit

Permalink
Merge pull request #16 from hallyn/2019-07-17/nostatic
Browse files Browse the repository at this point in the history
[RFC] drop static linking
  • Loading branch information
hallyn authored Jul 19, 2019
2 parents caf9042 + 6c06c47 commit 644759c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 122 deletions.
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@ TEST?=$(patsubst test/%.bats,%,$(wildcard test/*.bats))
CRIO_REPO?=~/packages/cri-o

crio-lxc: $(GO_SRC)
go build -tags static_build -ldflags "-X main.version=$(COMMIT)" -o crio-lxc ./cmd

.PHONY: foreign
foreign: $(GO_SRC)
stacker build --substitute PWD=$$PWD
go build -ldflags "-X main.version=$(COMMIT)" -o crio-lxc ./cmd

# make test TEST=basic will run only the basic test.
.PHONY: check
Expand All @@ -25,4 +21,3 @@ vendorup:
.PHONY: clean
clean:
-rm -f crio-lxc
stacker clean --all
5 changes: 5 additions & 0 deletions cmd/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ func ensureShell(rootfs string) {
}
}

const (
SYNC_FIFO_PATH = "/syncfifo"
SYNC_FIFO_CONTENT = "meshuggah rocks"
)

func emitFifoWaiter(file string) error {
fifoWaiter := fmt.Sprintf(`#!/bin/sh
stat /syncfifo
Expand Down
48 changes: 0 additions & 48 deletions cmd/fifo-wait.go

This file was deleted.

68 changes: 0 additions & 68 deletions stacker.yaml

This file was deleted.

0 comments on commit 644759c

Please sign in to comment.