summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-vesa/0001-Refuse-to-run-on-UEFI-machines.patch52
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.4.0.bb4
2 files changed, 56 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa/0001-Refuse-to-run-on-UEFI-machines.patch b/meta/recipes-graphics/xorg-driver/xf86-video-vesa/0001-Refuse-to-run-on-UEFI-machines.patch
new file mode 100644
index 0000000000..9e01770667
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vesa/0001-Refuse-to-run-on-UEFI-machines.patch
@@ -0,0 +1,52 @@
1From 2645e0aa9c17c2c966a0533e52ad00510311483e Mon Sep 17 00:00:00 2001
2From: Adam Jackson <ajax@redhat.com>
3Date: Wed, 29 Aug 2018 11:04:23 -0400
4Subject: [PATCH] Refuse to run on UEFI machines
5
6No possible good can come of this.
7
8v2: Check for .../efi-framebuffer.0 ("is there an EFI framebuffer")
9instead of /sys/firmware/efi ("is this an EFI machine"). Suggested by
10Peter Jones.
11
12Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/driver/xf86-video-vesa]
13
14Reviewed-by: Peter Jones <pjones@redhat.com>
15Signed-off-by: Adam Jackson <ajax@redhat.com>
16Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
17---
18 src/vesa.c | 11 +++++++++--
19 1 file changed, 9 insertions(+), 2 deletions(-)
20
21diff --git a/src/vesa.c b/src/vesa.c
22index 9b65b9b..af750e2 100644
23--- a/src/vesa.c
24+++ b/src/vesa.c
25@@ -43,7 +43,7 @@
26 #endif
27
28 #include <string.h>
29-
30+#include <unistd.h>
31 #include "vesa.h"
32
33 /* All drivers initialising the SW cursor need this */
34@@ -450,7 +450,14 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev,
35 intptr_t match_data)
36 {
37 ScrnInfoPtr pScrn;
38-
39+
40+#ifdef __linux__
41+ if (access("/sys/devices/platform/efi-framebuffer.0", F_OK) == 0) {
42+ ErrorF("vesa: Refusing to run on UEFI\n");
43+ return FALSE;
44+ }
45+#endif
46+
47 pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL,
48 NULL, NULL, NULL, NULL, NULL);
49 if (pScrn != NULL) {
50--
512.20.1
52
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.4.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.4.0.bb
index 9a110148d8..f6aa54456c 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.4.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.4.0.bb
@@ -17,3 +17,7 @@ RRECOMMENDS_${PN} += "xserver-xorg-module-libint10"
17 17
18SRC_URI[md5sum] = "8134201beaf6f77150c7809c3cc802e6" 18SRC_URI[md5sum] = "8134201beaf6f77150c7809c3cc802e6"
19SRC_URI[sha256sum] = "bf443c94d7bf6cd4e248f8a3147f4647be04dc4c80250d9405006263bbdee38c" 19SRC_URI[sha256sum] = "bf443c94d7bf6cd4e248f8a3147f4647be04dc4c80250d9405006263bbdee38c"
20
21SRC_URI += " \
22 file://0001-Refuse-to-run-on-UEFI-machines.patch \
23 "