[gnome-boxes/flatpak-master-fixup: 7/8] flatpak: Ship qemu patch fixing variably sized SIOCGSTAMP with new kernels
- From: Felipe Borges <felipeborges src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-boxes/flatpak-master-fixup: 7/8] flatpak: Ship qemu patch fixing variably sized SIOCGSTAMP with new kernels
- Date: Mon, 5 Aug 2019 07:22:05 +0000 (UTC)
commit de1356f747eec9ca6d605e60589f97498af61af2
Author: Felipe Borges <felipeborges gnome org>
Date: Mon Aug 5 09:19:05 2019 +0200
flatpak: Ship qemu patch fixing variably sized SIOCGSTAMP with new kernels
build-aux/flatpak/org.gnome.Boxes.json | 4 ++++
...variable-size-SIOCGSTAMP-with-new-kernels.patch | 24 ++++++++++++++++++++++
2 files changed, 28 insertions(+)
---
diff --git a/build-aux/flatpak/org.gnome.Boxes.json b/build-aux/flatpak/org.gnome.Boxes.json
index 3e422e79..10b40c40 100644
--- a/build-aux/flatpak/org.gnome.Boxes.json
+++ b/build-aux/flatpak/org.gnome.Boxes.json
@@ -365,6 +365,10 @@
"type" : "archive",
"url" : "https://download.qemu.org/qemu-3.1.0.tar.xz",
"sha256" : "6a0508df079a0a33c2487ca936a56c12122f105b8a96a44374704bef6c69abfc"
+ },
+ {
+ "type" : "patch",
+ "path" : "qemu-3.1-handle-variable-size-SIOCGSTAMP-with-new-kernels.patch"
}
]
},
diff --git a/build-aux/flatpak/qemu-3.1-handle-variable-size-SIOCGSTAMP-with-new-kernels.patch
b/build-aux/flatpak/qemu-3.1-handle-variable-size-SIOCGSTAMP-with-new-kernels.patch
new file mode 100644
index 00000000..356378ef
--- /dev/null
+++ b/build-aux/flatpak/qemu-3.1-handle-variable-size-SIOCGSTAMP-with-new-kernels.patch
@@ -0,0 +1,24 @@
+From 1306f978cadedcfcca674faf86b8fc47b2791be3 Mon Sep 17 00:00:00 2001
+From: Felipe Borges <felipeborges gnome org>
+Date: Fri, 2 Aug 2019 15:36:25 +0200
+Subject: [PATCH] linux-user: fix to handle variably sized SIOCGSTAMP with new
+ kernels
+
+Based/backported from commit 6d5d5dde9adb5acb32e6b8e3dfbf47fff0f308d2
+---
+ linux-user/ioctls.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
+index ae8951625f..74476c99e4 100644
+--- a/linux-user/ioctls.h
++++ b/linux-user/ioctls.h
+@@ -1,3 +1,5 @@
++#include <linux/sockios.h>
++
+ /* emulated ioctl list */
+
+ IOCTL(TCGETS, IOC_R, MK_PTR(MK_STRUCT(STRUCT_termios)))
+--
+2.21.0
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]