From 452799e038f2bbf14e4b62232cffe5bf50c7cec0 Mon Sep 17 00:00:00 2001
From: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
Date: Tue, 10 Sep 2019 11:59:10 -0500
Subject: [PATCH] kata-deploy: use proper kernel install script

kata deploy script setup a new GOPATH to pull
a fresh environment to install kata. This script
was using the local kernel install script and not the
one in the new environment

Fixes: #706

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
---
 release/kata-deploy-binaries.sh | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

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