github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-26 11:13:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #241 from devimc/topic/fix-snap

Browse Source 
snap: fix build error in launchpad
This commit is contained in:
Jose Carlos Venegas Munoz
2018-11-15 12:20:41 -06:00
committed by GitHub
parent 78c4362a34 7256ff8453
commit e5a2f4aa45
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
snap/snapcraft.yaml.in
View File

@@ -27,20 +27,10 @@ parts:
cd ${GOPATH}/src/github.com/${SNAPCRAFT_PROJECT_NAME}/runtime cd ${GOPATH}/src/github.com/${SNAPCRAFT_PROJECT_NAME}/runtime
QEMU_ARCH=$(arch) QEMU_ARCH=$(arch)
make \ make \
QEMUPATH=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr/bin/qemu-system-${QEMU_ARCH} \ PREFIX=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr
PROXYPATH=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr/libexec/${SNAPCRAFT_PROJECT_NAME}/kata-proxy \
SHIMPATH=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr/libexec/${SNAPCRAFT_PROJECT_NAME}/kata-shim \
KERNELPATH=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr/share/${SNAPCRAFT_PROJECT_NAME}/vmlinuz.container \
INITRDPATH=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr/share/${SNAPCRAFT_PROJECT_NAME}/kata-containers-initrd.img \
CONFIG_PATH=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr/share/defaults/${SNAPCRAFT_PROJECT_NAME}/configuration.toml
make install \ make install \
PREFIX=/usr \ PREFIX=/usr \
DESTDIR=${SNAPCRAFT_PART_INSTALL} \ DESTDIR=${SNAPCRAFT_PART_INSTALL}
QEMUPATH=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr/bin/qemu-system-${QEMU_ARCH} \
PROXYPATH=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr/libexec/${SNAPCRAFT_PROJECT_NAME}/kata-proxy \
SHIMPATH=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr/libexec/${SNAPCRAFT_PROJECT_NAME}/kata-shim \
KERNELPATH=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr/share/${SNAPCRAFT_PROJECT_NAME}/vmlinuz.container \
INITRDPATH=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr/share/${SNAPCRAFT_PROJECT_NAME}/kata-containers-initrd.img
sed -i -e '/^image =/d' ${SNAPCRAFT_PART_INSTALL}/usr/share/defaults/${SNAPCRAFT_PROJECT_NAME}/configuration.toml sed -i -e '/^image =/d' ${SNAPCRAFT_PART_INSTALL}/usr/share/defaults/${SNAPCRAFT_PROJECT_NAME}/configuration.toml
proxy: proxy:
@@ -84,6 +74,7 @@ parts:
plugin: make plugin: make
build-packages: build-packages:
- docker.io - docker.io
- cpio
override-build: | override-build: |
# Don't use installed GOROOT # Don't use installed GOROOT
unset GOROOT unset GOROOT