From 0c06e0356ee7c2b980c415c38cf8f9ab3b50c0e5 Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Tue, 4 Dec 2018 09:00:04 -0600 Subject: [PATCH 1/2] snap: remove QEMU_ARCH variable QEMU_ARCH variable is not needed Signed-off-by: Julio Montes --- snap/snapcraft.yaml.in | 1 - 1 file changed, 1 deletion(-) diff --git a/snap/snapcraft.yaml.in b/snap/snapcraft.yaml.in index bdf0f97c3..d92800f68 100644 --- a/snap/snapcraft.yaml.in +++ b/snap/snapcraft.yaml.in @@ -25,7 +25,6 @@ parts: unset GOROOT export GOPATH=$(realpath ../go) cd ${GOPATH}/src/github.com/${SNAPCRAFT_PROJECT_NAME}/runtime - QEMU_ARCH=$(arch) make \ PREFIX=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr make install \ From 1270003af95cf8b5ba58e1736622cfb607d9a996 Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Mon, 3 Dec 2018 12:14:05 -0600 Subject: [PATCH 2/2] snap: skip go version check Right golang version is installed before building kata-containers, skip go version check to avoid including extra build dependencies. fixes #265 Signed-off-by: Julio Montes --- snap/snapcraft.yaml.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/snap/snapcraft.yaml.in b/snap/snapcraft.yaml.in index d92800f68..9acea3f4b 100644 --- a/snap/snapcraft.yaml.in +++ b/snap/snapcraft.yaml.in @@ -26,10 +26,12 @@ parts: export GOPATH=$(realpath ../go) cd ${GOPATH}/src/github.com/${SNAPCRAFT_PROJECT_NAME}/runtime make \ - PREFIX=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr + PREFIX=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr \ + SKIP_GO_VERSION_CHECK=1 make install \ PREFIX=/usr \ - DESTDIR=${SNAPCRAFT_PART_INSTALL} + DESTDIR=${SNAPCRAFT_PART_INSTALL} \ + SKIP_GO_VERSION_CHECK=1 sed -i -e '/^image =/d' ${SNAPCRAFT_PART_INSTALL}/usr/share/defaults/${SNAPCRAFT_PROJECT_NAME}/configuration.toml proxy: