From 49a7c0110ee75527e689ab26edeb99c346e0cf70 Mon Sep 17 00:00:00 2001
From: jikui <jikui2@huawei.com>
Date: Tue, 23 Mar 2021 17:24:05 +0800
Subject: [PATCH] kata-runtime: remove ctty to resolve build failed

reason: sync patch from
https://github.com/kata-containers/runtime/pull/3082

Signed-off-by: jikui <jikui2@huawei.com>
---
 kata-containers.spec                          |  8 ++++-
 ...-remove-ctty-to-resolve-build-failed.patch | 29 +++++++++++++++++++
 runtime/series.conf                           |  1 +
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 runtime/patches/0070-kata-runtime-remove-ctty-to-resolve-build-failed.patch

diff --git a/kata-containers.spec b/kata-containers.spec
index 73ceaa0..7fd3010 100644
--- a/kata-containers.spec
+++ b/kata-containers.spec
@@ -2,7 +2,7 @@
 %global debug_package %{nil}
 
 %define VERSION v1.11.1
-%define RELEASE 12
+%define RELEASE 13
 
 Name:           kata-containers
 Version:        %{VERSION}
@@ -91,6 +91,12 @@ install -p -m 640 -D ./runtime/cli/config/configuration-qemu.toml %{buildroot}/u
 
 
 %changelog
+* Tue Mar 23 2021 jikui <jikui2@huawei.com> - 1.11.1-13
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:remove ctty to resolve build failed
+
 * Mon Mar 22 2021 jikui <jikui2@huawei.com> - 1.11.1-12
 - Type:enhancement
 - ID:NA
diff --git a/runtime/patches/0070-kata-runtime-remove-ctty-to-resolve-build-failed.patch b/runtime/patches/0070-kata-runtime-remove-ctty-to-resolve-build-failed.patch
new file mode 100644
index 0000000..6463fc3
--- /dev/null
+++ b/runtime/patches/0070-kata-runtime-remove-ctty-to-resolve-build-failed.patch
@@ -0,0 +1,29 @@
+From 6d684a77e027e8103345cab768860533705d5ce4 Mon Sep 17 00:00:00 2001
+From: jikui <jikui2@huawei.com>
+Date: Tue, 23 Mar 2021 17:17:00 +0800
+Subject: [PATCH] kata-runtime: remove ctty to resolve build failed
+
+reason: remove ctty to resolve build failed
+
+Signed-off-by: jikui <jikui2@huawei.com>
+---
+ virtcontainers/shim.go | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/virtcontainers/shim.go b/virtcontainers/shim.go
+index b192b25..08097f0 100644
+--- a/virtcontainers/shim.go
++++ b/virtcontainers/shim.go
+@@ -219,9 +219,6 @@ func startShim(args []string, params ShimParams) (int, error) {
+ 		cmd.Stderr = f
+ 		// Create Session
+ 		cmd.SysProcAttr.Setsid = true
+-		// Set Controlling terminal to Ctty
+-		cmd.SysProcAttr.Setctty = true
+-		cmd.SysProcAttr.Ctty = int(f.Fd())
+ 	}
+ 	defer func() {
+ 		if f != nil {
+-- 
+2.25.1
+
diff --git a/runtime/series.conf b/runtime/series.conf
index a1038d9..3d6f95c 100644
--- a/runtime/series.conf
+++ b/runtime/series.conf
@@ -67,3 +67,4 @@
 0067-CVE-2020-28914-2.patch
 0068-kata-runtime-modify-make-flags.patch
 0069-kata-runtime-add-linkmode-to-resolve-build-error.patch
+0070-kata-runtime-remove-ctty-to-resolve-build-failed.patch
-- 
Gitee