From 8dfe37252b3b3506cc5e6846564839cb4e3f8c0f Mon Sep 17 00:00:00 2001
From: Serge Hallyn <shallyn@cisco.com>
Date: Wed, 17 Jul 2019 14:25:48 -0500
Subject: [PATCH 1/2] remove obsolete fifo-wait.go

Signed-off-by: Serge Hallyn <shallyn@cisco.com>
---
 cmd/create.go    |  5 +++++
 cmd/fifo-wait.go | 48 ------------------------------------------------
 2 files changed, 5 insertions(+), 48 deletions(-)
 delete mode 100644 cmd/fifo-wait.go

diff --git a/cmd/create.go b/cmd/create.go
index 7c418f2b..6e6ed4b6 100644
--- a/cmd/create.go
+++ b/cmd/create.go
@@ -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
diff --git a/cmd/fifo-wait.go b/cmd/fifo-wait.go
deleted file mode 100644
index be3b4006..00000000
--- a/cmd/fifo-wait.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package main
-
-import (
-	"os"
-	"os/exec"
-
-	"github.com/pkg/errors"
-	"github.com/urfave/cli"
-)
-
-const (
-	SYNC_FIFO_PATH    = "/syncfifo"
-	SYNC_FIFO_CONTENT = "meshuggah rocks"
-)
-
-var fifoWaitCmd = cli.Command{
-	Name:   "fifo-wait",
-	Action: doFifoWait,
-	Hidden: true,
-}
-
-func doFifoWait(ctx *cli.Context) error {
-	syncPipe, err := os.Open(SYNC_FIFO_PATH)
-	if err != nil {
-		return errors.Wrapf(err, "couldn't open %s", SYNC_FIFO_PATH)
-	}
-	defer syncPipe.Close()
-
-	fi, err := syncPipe.Stat()
-	if err != nil {
-		return errors.Wrapf(err, "couldn't stat %s", SYNC_FIFO_PATH)
-	}
-
-	if fi.Mode()&os.ModeNamedPipe == 0 {
-		return errors.Errorf("%s exists and is not a named pipe", SYNC_FIFO_PATH)
-	}
-
-	_, err = syncPipe.WriteString(SYNC_FIFO_CONTENT)
-	if err != nil {
-		return errors.Wrapf(err, "could write to fifo")
-	}
-
-	cmd := exec.Command(ctx.Args().Get(0), ctx.Args().Tail()...)
-	cmd.Stdin = os.Stdin
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	return cmd.Run()
-}

From 6c06c4795ed76c735b89b7d40b5eb751e7d47859 Mon Sep 17 00:00:00 2001
From: Serge Hallyn <shallyn@cisco.com>
Date: Wed, 17 Jul 2019 14:28:55 -0500
Subject: [PATCH 2/2] drop static / foreign building

Signed-off-by: Serge Hallyn <shallyn@cisco.com>
---
 Makefile     |  7 +-----
 stacker.yaml | 68 ----------------------------------------------------
 2 files changed, 1 insertion(+), 74 deletions(-)
 delete mode 100644 stacker.yaml

diff --git a/Makefile b/Makefile
index 2501602d..86a92d71 100644
--- a/Makefile
+++ b/Makefile
@@ -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
@@ -25,4 +21,3 @@ vendorup:
 .PHONY: clean
 clean:
 	-rm -f crio-lxc
-	stacker clean --all
diff --git a/stacker.yaml b/stacker.yaml
deleted file mode 100644
index 91ce28b1..00000000
--- a/stacker.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-build:
-    from:
-        type: docker
-        url: docker://ubuntu:bionic
-
-    import:
-        - https://dl.google.com/go/go1.12.5.linux-amd64.tar.gz
-        - https://github.com/lxc/lxc/archive/lxc-3.0.4.tar.gz
-
-    run: |
-        sed -i 's/# deb-src/deb-src/g' /etc/apt/sources.list
-
-        apt-get update
-        apt-get -y install \
-            make git gcc pkg-config
-
-        apt-get -y build-dep lxc
-        apt -y install libssl-dev
-
-        cd /usr/local
-        tar xvf /stacker/go1.12.5.linux-amd64.tar.gz
-        cd -
-
-        tar xvf /stacker/lxc-3.0.4.tar.gz
-        cd lxc-lxc-3.0.4
-        ./autogen.sh
-
-        ./configure \
-            --enable-static \
-            --enable-shared \
-            --disable-tools \
-            --disable-commands \
-            --disable-doc \
-            --disable-rpath \
-            --with-distro=ubuntu \
-            --enable-pam \
-            --enable-caps \
-            --enable-seccomp \
-            --enable-cgroups \
-            --enable-selinux \
-            --enable-apparmor \
-            --enable-openssl \
-            --prefix=/usr
-
-        make -j$(cat /proc/cpuinfo | grep ^processor | wc -l)
-        make install
-
-        sed -i 's/@DLOG_LIBS@/-ldl/g' /usr/lib/pkgconfig/lxc.pc
-
-    build_only: true
-
-do_build:
-    from:
-        type: built
-        tag: build
-
-    binds:
-        - ${{PWD}} -> /go/src/crio-lxc
-
-    run: |
-        export GO111MODULE=on
-        export HOME=/var/tmp
-        export PATH=$PATH:/usr/local/go/bin
-
-        cd /go/src/crio-lxc
-        make crio-lxc
-
-    build_only: true