4 files changed, 6 insertions, 14 deletions

diff --git a/recipes-core/kata-containers/kata-agent_git.bb b/recipes-core/kata-containers/kata-agent_git.bb
index de28235c..3ad94783 100644
--- a/recipes-core/kata-containers/kata-agent_git.bb
+++ b/recipes-core/kata-containers/kata-agent_git.bb
@@ -12,8 +12,6 @@ RDEPENDS:${PN}-dev:append = "bash"
 
 SKIP_RECIPE[kata-agent] ?= "kata containers are currently broken, patches accepted"
 
-S = "${WORKDIR}/git"
-
 inherit go
 
 do_compile() {
@@ -30,10 +28,10 @@ do_compile() {
 
 do_install() {
         mkdir -p ${D}/${bindir}/
-        cp ${WORKDIR}/git/src/${GO_IMPORT}/kata-agent ${D}/${bindir}
+        cp ${UNPACKDIR}/git/src/${GO_IMPORT}/kata-agent ${D}/${bindir}
 
         mkdir -p ${D}/${systemd_unitdir}/system
-        cp ${WORKDIR}/git/src/${GO_IMPORT}/kata-agent.service ${D}/${systemd_unitdir}/system
+        cp ${UNPACKDIR}/git/src/${GO_IMPORT}/kata-agent.service ${D}/${systemd_unitdir}/system
 }
 
 deltask compile_ptest_base
diff --git a/recipes-core/kata-containers/kata-proxy_git.bb b/recipes-core/kata-containers/kata-proxy_git.bb
index d835e4d2..03784ae8 100644
--- a/recipes-core/kata-containers/kata-proxy_git.bb
+++ b/recipes-core/kata-containers/kata-proxy_git.bb
@@ -13,8 +13,6 @@ SKIP_RECIPE[kata-proxy] ?= "kata containers are currently broken, patches accept
 
 RDEPENDS:${PN}-dev:append = "bash"
 
-S = "${WORKDIR}/git"
-
 inherit go
 
 do_compile() {
@@ -31,7 +29,7 @@ do_compile() {
 
 do_install() {
         mkdir -p ${D}/${libexecdir}/kata-containers
-        cp ${WORKDIR}/git/src/${GO_IMPORT}/kata-proxy ${D}/${libexecdir}/kata-containers
+        cp ${UNPACKDIR}/git/src/${GO_IMPORT}/kata-proxy ${D}/${libexecdir}/kata-containers
 }
 
 deltask compile_ptest_base
diff --git a/recipes-core/kata-containers/kata-runtime_git.bb b/recipes-core/kata-containers/kata-runtime_git.bb
index c0d7c4cb..30ed4229 100644
--- a/recipes-core/kata-containers/kata-runtime_git.bb
+++ b/recipes-core/kata-containers/kata-runtime_git.bb
@@ -21,8 +21,6 @@ DEPENDS += "yq-native"
 
 SKIP_RECIPE[kata-runtime] ?= "kata containers are currently broken, patches accepted"
 
-S = "${WORKDIR}/git"
-
 inherit go
 
 do_compile() {
@@ -41,10 +39,10 @@ do_compile() {
 
 do_install() {
         mkdir -p ${D}/${bindir}
-        cp ${WORKDIR}/git/src/${GO_IMPORT}/kata-runtime ${D}/${bindir}
+        cp ${UNPACKDIR}/git/src/${GO_IMPORT}/kata-runtime ${D}/${bindir}
         
         mkdir -p ${D}/${datadir}/defaults/kata-containers/
-        cp ${WORKDIR}/git/src/${GO_IMPORT}/cli/config/configuration-qemu.toml ${D}/${datadir}/defaults/kata-containers/configuration.toml
+        cp ${UNPACKDIR}/git/src/${GO_IMPORT}/cli/config/configuration-qemu.toml ${D}/${datadir}/defaults/kata-containers/configuration.toml
 
         sed -e 's|/usr/bin/qemu-lite-system-x86_64|/usr/bin/qemu-system-x86_64|' -i ${D}/${datadir}/defaults/kata-containers/configuration.toml
         sed -e 's|/usr/share/kata-containers/vmlinuz.container|/var/lib/hyper/kernel|' -i ${D}/${datadir}/defaults/kata-containers/configuration.toml
diff --git a/recipes-core/kata-containers/kata-shim_git.bb b/recipes-core/kata-containers/kata-shim_git.bb
index 8a7cb78a..b8c7540c 100644
--- a/recipes-core/kata-containers/kata-shim_git.bb
+++ b/recipes-core/kata-containers/kata-shim_git.bb
@@ -12,8 +12,6 @@ SKIP_RECIPE[kata-shim] ?= "kata containers are currently broken, patches accepte
 
 RDEPENDS:${PN}-dev:append = "bash"
 
-S = "${WORKDIR}/git"
-
 inherit go
 
 do_compile() {
@@ -30,7 +28,7 @@ do_compile() {
 
 do_install() {
         mkdir -p ${D}/${libexecdir}/kata-containers
-        cp ${WORKDIR}/git/src/${GO_IMPORT}/kata-shim ${D}/${libexecdir}/kata-containers
+        cp ${UNPACKDIR}/git/src/${GO_IMPORT}/kata-shim ${D}/${libexecdir}/kata-containers
 }
 
 deltask compile_ptest_base