mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-04-29 20:24:31 +00:00
snap: add cloud-hypervisor and experimental kernel
Add cloud-hypervisor and experimental kernel as part of the kata snap fixes #2852 Signed-off-by: Julio Montes <julio.montes@intel.com>
This commit is contained in:
parent
baf4784a29
commit
2b9f79cfc9
@ -139,7 +139,7 @@ parts:
|
|||||||
cp kata-containers*.img ${kata_image_dir}
|
cp kata-containers*.img ${kata_image_dir}
|
||||||
|
|
||||||
runtime:
|
runtime:
|
||||||
after: [godeps, image]
|
after: [godeps, image, cloud-hypervisor]
|
||||||
plugin: nil
|
plugin: nil
|
||||||
build-attributes: [no-patchelf]
|
build-attributes: [no-patchelf]
|
||||||
override-build: |
|
override-build: |
|
||||||
@ -185,6 +185,7 @@ parts:
|
|||||||
- flex
|
- flex
|
||||||
override-build: |
|
override-build: |
|
||||||
yq=${SNAPCRAFT_STAGE}/yq
|
yq=${SNAPCRAFT_STAGE}/yq
|
||||||
|
export PATH="${PATH}:${SNAPCRAFT_STAGE}"
|
||||||
export GOPATH=${SNAPCRAFT_STAGE}/gopath
|
export GOPATH=${SNAPCRAFT_STAGE}/gopath
|
||||||
kata_dir=${GOPATH}/src/github.com/${SNAPCRAFT_PROJECT_NAME}/${SNAPCRAFT_PROJECT_NAME}
|
kata_dir=${GOPATH}/src/github.com/${SNAPCRAFT_PROJECT_NAME}/${SNAPCRAFT_PROJECT_NAME}
|
||||||
versions_file="${kata_dir}/versions.yaml"
|
versions_file="${kata_dir}/versions.yaml"
|
||||||
@ -199,10 +200,17 @@ parts:
|
|||||||
kata_dir=${GOPATH}/src/github.com/${SNAPCRAFT_PROJECT_NAME}/${SNAPCRAFT_PROJECT_NAME}
|
kata_dir=${GOPATH}/src/github.com/${SNAPCRAFT_PROJECT_NAME}/${SNAPCRAFT_PROJECT_NAME}
|
||||||
|
|
||||||
cd ${kata_dir}/tools/packaging/kernel
|
cd ${kata_dir}/tools/packaging/kernel
|
||||||
|
kernel_dir_prefix="kata-linux-"
|
||||||
|
|
||||||
# Setup and build kernel
|
# Setup and build kernel
|
||||||
./build-kernel.sh -v ${kernel_version} -d setup
|
if [ "$(uname -m)" = "x86_64" ]; then
|
||||||
kernel_dir_prefix="kata-linux-"
|
kernel_version="$(${yq} r $versions_file assets.kernel-experimental.tag)"
|
||||||
|
kernel_version=${kernel_version#v}
|
||||||
|
kernel_dir_prefix="kata-linux-experimental-"
|
||||||
|
./build-kernel.sh -e -v ${kernel_version} -d setup
|
||||||
|
else
|
||||||
|
./build-kernel.sh -v ${kernel_version} -d setup
|
||||||
|
fi
|
||||||
cd ${kernel_dir_prefix}*
|
cd ${kernel_dir_prefix}*
|
||||||
make -j $(($(nproc)-1)) EXTRAVERSION=".container"
|
make -j $(($(nproc)-1)) EXTRAVERSION=".container"
|
||||||
|
|
||||||
@ -327,6 +335,22 @@ parts:
|
|||||||
# Hack: move qemu to /
|
# Hack: move qemu to /
|
||||||
"snap/kata-containers/current/": "./"
|
"snap/kata-containers/current/": "./"
|
||||||
|
|
||||||
|
cloud-hypervisor:
|
||||||
|
plugin: nil
|
||||||
|
after: [godeps]
|
||||||
|
override-build: |
|
||||||
|
export GOPATH=${SNAPCRAFT_STAGE}/gopath
|
||||||
|
yq=${SNAPCRAFT_STAGE}/yq
|
||||||
|
kata_dir=${GOPATH}/src/github.com/${SNAPCRAFT_PROJECT_NAME}/${SNAPCRAFT_PROJECT_NAME}
|
||||||
|
versions_file="${kata_dir}/versions.yaml"
|
||||||
|
version="$(${yq} r ${versions_file} assets.hypervisor.cloud_hypervisor.version)"
|
||||||
|
url="https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/${version}"
|
||||||
|
curl -L ${url}/cloud-hypervisor-static -o cloud-hypervisor
|
||||||
|
curl -LO ${url}/clh-remote
|
||||||
|
|
||||||
|
install -D cloud-hypervisor ${SNAPCRAFT_PART_INSTALL}/usr/bin/cloud-hypervisor
|
||||||
|
install -D clh-remote ${SNAPCRAFT_PART_INSTALL}/usr/bin/clh-remote
|
||||||
|
|
||||||
apps:
|
apps:
|
||||||
runtime:
|
runtime:
|
||||||
command: usr/bin/kata-runtime
|
command: usr/bin/kata-runtime
|
||||||
|
Loading…
Reference in New Issue
Block a user