Merge pull request #708 from jcvenegas/fix706

kata-deploy: use proper kernel install script
This commit is contained in:
GabyCT 2019-09-11 09:56:24 -05:00 committed by GitHub
commit b9053f2e74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -90,18 +90,17 @@ install_image() {
#Install kernel asset #Install kernel asset
install_kernel() { install_kernel() {
go get "github.com/${project}/packaging" || true go get "github.com/${project}/packaging" || true
pushd ${GOPATH}/src/github.com/${project}/packaging >>/dev/null (
cd ${GOPATH}/src/github.com/${project}/packaging >>/dev/null
git checkout "${kata_version}-kernel-config" || git checkout "${kata_version}-kernel-config" ||
git checkout "${kata_version}" git checkout "${kata_version}"
popd >>/dev/null
pushd "${script_dir}/../kernel" >>/dev/null
info "build kernel" info "build kernel"
./build-kernel.sh setup ./kernel/build-kernel.sh setup
./build-kernel.sh build ./kernel/build-kernel.sh build
info "install kernel" info "install kernel"
DESTDIR="${destdir}" PREFIX="${prefix}" ./build-kernel.sh install DESTDIR="${destdir}" PREFIX="${prefix}" ./kernel/build-kernel.sh install
popd >>/dev/null )
} }
# Install static nemu asset # Install static nemu asset