mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 13:09:50 +00:00
xf86-video-vesa: update 2.4.0 -> 2.5.0
(From OE-Core rev: 4b0afd5440ed49513844f98553816dc6925e9b89) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
b6da9774f3
commit
6d3c1edca5
-52
@@ -1,52 +0,0 @@
|
|||||||
From 2645e0aa9c17c2c966a0533e52ad00510311483e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Adam Jackson <ajax@redhat.com>
|
|
||||||
Date: Wed, 29 Aug 2018 11:04:23 -0400
|
|
||||||
Subject: [PATCH] Refuse to run on UEFI machines
|
|
||||||
|
|
||||||
No possible good can come of this.
|
|
||||||
|
|
||||||
v2: Check for .../efi-framebuffer.0 ("is there an EFI framebuffer")
|
|
||||||
instead of /sys/firmware/efi ("is this an EFI machine"). Suggested by
|
|
||||||
Peter Jones.
|
|
||||||
|
|
||||||
Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/driver/xf86-video-vesa]
|
|
||||||
|
|
||||||
Reviewed-by: Peter Jones <pjones@redhat.com>
|
|
||||||
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
|
||||||
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
|
|
||||||
---
|
|
||||||
src/vesa.c | 11 +++++++++--
|
|
||||||
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/vesa.c b/src/vesa.c
|
|
||||||
index 9b65b9b..af750e2 100644
|
|
||||||
--- a/src/vesa.c
|
|
||||||
+++ b/src/vesa.c
|
|
||||||
@@ -43,7 +43,7 @@
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <string.h>
|
|
||||||
-
|
|
||||||
+#include <unistd.h>
|
|
||||||
#include "vesa.h"
|
|
||||||
|
|
||||||
/* All drivers initialising the SW cursor need this */
|
|
||||||
@@ -450,7 +450,14 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev,
|
|
||||||
intptr_t match_data)
|
|
||||||
{
|
|
||||||
ScrnInfoPtr pScrn;
|
|
||||||
-
|
|
||||||
+
|
|
||||||
+#ifdef __linux__
|
|
||||||
+ if (access("/sys/devices/platform/efi-framebuffer.0", F_OK) == 0) {
|
|
||||||
+ ErrorF("vesa: Refusing to run on UEFI\n");
|
|
||||||
+ return FALSE;
|
|
||||||
+ }
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL,
|
|
||||||
NULL, NULL, NULL, NULL, NULL);
|
|
||||||
if (pScrn != NULL) {
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
||||||
+1
-5
@@ -15,9 +15,5 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
|
|||||||
|
|
||||||
RRECOMMENDS_${PN} += "xserver-xorg-module-libint10"
|
RRECOMMENDS_${PN} += "xserver-xorg-module-libint10"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "8134201beaf6f77150c7809c3cc802e6"
|
SRC_URI[sha256sum] = "1f1624f3c73906801ad1bc98335a2cb5676a7a4d18e5374d9a1d18464e54c659"
|
||||||
SRC_URI[sha256sum] = "bf443c94d7bf6cd4e248f8a3147f4647be04dc4c80250d9405006263bbdee38c"
|
|
||||||
|
|
||||||
SRC_URI += " \
|
|
||||||
file://0001-Refuse-to-run-on-UEFI-machines.patch \
|
|
||||||
"
|
|
||||||
Reference in New Issue
Block a user