From 7c25b606ba43985c2cdb9118118651ae0b52b79c Mon Sep 17 00:00:00 2001
From: Julio Montes <julio.montes@intel.com>
Date: Fri, 25 Jan 2019 07:50:36 -0600
Subject: [PATCH] snap: apply patch in runtime to fix DESTDIR

This is a hotfix to fix https://github.com/kata-containers/runtime/pull/1162

Signed-off-by: Julio Montes <julio.montes@intel.com>
---
 snap/1162-runtime.patch | 27 +++++++++++++++++++++++++++
 snap/snapcraft.yaml     |  4 ++++
 2 files changed, 31 insertions(+)
 create mode 100644 snap/1162-runtime.patch

diff --git a/snap/1162-runtime.patch b/snap/1162-runtime.patch
new file mode 100644
index 0000000000..be87ee7051
--- /dev/null
+++ b/snap/1162-runtime.patch
@@ -0,0 +1,27 @@
+diff --git a/Makefile b/Makefile
+index 1c11f74..9c4709b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -248,11 +248,11 @@ ifeq (,$(findstring $(DEFAULT_HYPERVISOR),$(KNOWN_HYPERVISORS)))
+ endif
+
+ ifeq ($(DEFAULT_HYPERVISOR),$(HYPERVISOR_QEMU))
+-    DEFAULT_HYPERVISOR_CONFIG_PATH = $(CONFIG_PATH_QEMU)
++    DEFAULT_HYPERVISOR_CONFIG_FILE = $(CONFIG_FILE_QEMU)
+ endif
+
+ ifeq ($(DEFAULT_HYPERVISOR),$(HYPERVISOR_FC))
+-    DEFAULT_HYPERVISOR_CONFIG_PATH = $(CONFIG_PATH_FC)
++    DEFAULT_HYPERVISOR_CONFIG_FILE = $(CONFIG_FILE_FC)
+ endif
+
+ CONFDIR := $(DEFAULTSDIR)/$(PROJECT_DIR)
+@@ -546,7 +546,7 @@ install-bin-libexec: $(BINLIBEXECLIST)
+
+ install-configs: $(CONFIGS)
+ 	$(QUIET_INST)$(foreach f,$(CONFIGS),$(call INSTALL_CONFIG,$f,$(dir $(CONFIG_PATH))))
+-	$(QUIET_INST)ln -sf $(DEFAULT_HYPERVISOR_CONFIG_PATH) $(CONFIG_PATH)
++	$(QUIET_INST)(cd $(dir $(DESTDIR)/$(CONFIG_PATH)) && ln -sf $(DEFAULT_HYPERVISOR_CONFIG_FILE) $(CONFIG_FILE))
+
+ install-scripts: $(SCRIPTS)
+ 	$(QUIET_INST)$(foreach f,$(SCRIPTS),$(call INSTALL_EXEC,$f,$(SCRIPTS_DIR)))
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 345e829c72..a9c7d21621 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -33,6 +33,7 @@ parts:
     build-attributes: [no-patchelf]
     override-build: |
       pkg_name=runtime
+      patch1="$(realpath ../../../snap/1162-runtime.patch)"
 
       # set GOPATH
       export GOPATH=$(realpath go)
@@ -46,6 +47,9 @@ parts:
       git clone -b ${SNAPCRAFT_PROJECT_VERSION} https://github.com/kata-containers/${pkg_name} ${pkg_gopath}
       cd ${pkg_gopath}
 
+      #Issue: https://github.com/kata-containers/runtime/pull/1162
+      patch -p1 < "${patch1}"
+
       # build and install
       make \
         PREFIX=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr \