From 39c2c411c1ef3cc988b011735be9a46339f96f2d Mon Sep 17 00:00:00 2001
From: Margarita Manterola <marga@kinvolk.io>
Date: Thu, 17 Sep 2020 16:03:28 +0200
Subject: [PATCH] app-emulation/qemu: Fix building errors

The qemu update caused several errors:

* We currently don't have Python 3.8 available in the SDK, so adding it in
  the PYTHON_COMPAT field causes a build failure.
* The manifest needed to be updated
* A patch file was missing

This commit fixes these errors and makes the package build.
---
 .../app-emulation/qemu/Manifest               |  3 +-
 .../qemu/files/qemu-5.0.0-epoll-strace.patch  | 50 +++++++++++++++++++
 .../app-emulation/qemu/qemu-5.0.0.ebuild      |  2 +-
 3 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/qemu/files/qemu-5.0.0-epoll-strace.patch

diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu/Manifest
index 911250c7ed..fa5828b787 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu/Manifest
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu/Manifest
@@ -1,2 +1 @@
-DIST qemu-4.2.0-patches-r1.tar.xz 14552 BLAKE2B e8832ce5b7ccda02dcd63fa60a458322a36ba754c8bc682839de4ee33cf21a83cde434bdc062916d3c83e81026b68ebf2fbe099dc6c54c191875f830d95c63ae SHA512 7495e4c9ca80fd25a1bc8244b384f88f3bc6d7190e2840b1614e3bc6fd51938e42792c6a4dbdb2d400a45532e558814462647f35d5ab21e175bec84868a4161d
-DIST qemu-4.2.0.tar.xz 62222068 BLAKE2B 27c9fbcd5093af425764674817ab9299224bd03f37b5983786f6f437fff1fab3b7da247c55c4ca8b8c42726b9867005944a2f7f04f2d0d94d753961615f901ef SHA512 2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56
+DIST qemu-5.0.0.tar.xz 62426192 BLAKE2B 785d02ef79c95b5c4f0556186054885f9893d4e8a9f4b4f2d6199a4e1ae9c31d7c79dd900305469217f85d61bbe74134b601d5c6c1b0eee2b74792d010f1fd63 SHA512 21ef0cbe107c468a40f0fa2635db2a40048c8790b629dfffca5cd62bb1b502ea8eb133bfc40df5ecf1489e2bffe87f6829aee041cb8a380ff04a8afa23b39fcf
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu/files/qemu-5.0.0-epoll-strace.patch b/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu/files/qemu-5.0.0-epoll-strace.patch
new file mode 100644
index 0000000000..c0f9a2e008
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu/files/qemu-5.0.0-epoll-strace.patch
@@ -0,0 +1,50 @@
+https://lists.nongnu.org/archive/html/qemu-devel/2020-04/msg02643.html
+
+From 6bce23d8daf96a7faa9288e7414948cda31ddaa2 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Thu, 16 Apr 2020 18:55:49 +0100
+Subject: [PATCH] linux-user/strace.list: fix epoll_create{,1} -strace output
+
+Fix syscall name and parameters priinter.
+
+Before the change:
+
+```
+$ alpha-linux-user/qemu-alpha -strace -L /usr/alpha-unknown-linux-gnu/ /tmp/a
+...
+1274697 %s(%d)(2097152,274903156744,274903156760,274905840712,274877908880,274903235616) = 3
+1274697 exit_group(0)
+```
+
+After the change:
+
+```
+$ alpha-linux-user/qemu-alpha -strace -L /usr/alpha-unknown-linux-gnu/ /tmp/a
+...
+1273719 epoll_create1(2097152) = 3
+1273719 exit_group(0)
+```
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ linux-user/strace.list | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/linux-user/strace.list
++++ b/linux-user/strace.list
+@@ -125,10 +125,10 @@
+ { TARGET_NR_dup3, "dup3" , "%s(%d,%d,%d)", NULL, NULL },
+ #endif
+ #ifdef TARGET_NR_epoll_create
+-{ TARGET_NR_epoll_create, "%s(%d)", NULL, NULL, NULL },
++{ TARGET_NR_epoll_create, "epoll_create", "%s(%d)", NULL, NULL },
+ #endif
+ #ifdef TARGET_NR_epoll_create1
+-{ TARGET_NR_epoll_create1, "%s(%d)", NULL, NULL, NULL },
++{ TARGET_NR_epoll_create1, "epoll_create1", "%s(%d)", NULL, NULL },
+ #endif
+ #ifdef TARGET_NR_epoll_ctl
+ { TARGET_NR_epoll_ctl, "epoll_ctl" , NULL, NULL, NULL },
+-- 
+2.26.2
+
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu/qemu-5.0.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu/qemu-5.0.0.ebuild
index 31bb16d731..c20240f773 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu/qemu-5.0.0.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu/qemu-5.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="ncurses,readline"
 
 PLOCALES="bg de_DE fr_FR hu it tr zh_CN"