From d89cb5f03a8d4951590cee276daee6f9a269b6d0 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 10 Apr 2019 09:02:41 -0400 Subject: poky: refresh master: 8217b477a1..4e511f0abc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update poky to master HEAD. Adrian Bunk (1): bind: upgrade 9.11.5 -> 9.11.5-P4 Alexey Brodkin (1): busybox: Enable domain search list support Andre Rosa (2): lib/oe/utils: Make prune_suffix prune a suffix bitbake: utils: Make prune_suffix prune a suffix Andreas Müller (1): patch/insane: Rework patch fuzz handling Bruce Ashfield (8): poky-tiny: set 5.0 as the preferred kernel linux-yocto-rt/4.19: fix duplicate TIF_NEED_RESCHED_LAZY linux-yocto/5.0: update CGL audit configuration fragment linux-yocto-tiny/4.18: point KBRANCH to 4.18 linux-yocto/4.18: update to v4.18.33 qemumips: Enable the poweroff driver linux-yocto/5.0: tweak qemuarm -tiny configuration linux-yocto/4.18: remove versioned recipes Gianfranco Costamagna (1): kernel-dev, sdk-manual: Unified question spacing Khem Raj (2): libgcc: Create linux-musleabihf and linux-gnueabihf symlinks Revert "mdadm: fix gcc8 maybe-uninitialized/format-overflow warning" Mark Asselstine (2): go.bbclass: Export more GO* environment variables goarch.bbclass: use MACHINEOVERRIDES and simplify go_map_arm() Nathan Rossi (3): cmake-native: Enable ccmake by default and depend on ncurses ccmake.bbclass: Create a cml1 style class for the CMake curses UI devtool: standard: Handle exporting generated config fragments Nikhil Pal Singh (1): cmake: Support Eclipse and other cmake generators Ovidiu Panait (2): xf86-video-vesa: Refuse to run on UEFI machines ghostscript: Fix 3 CVEs Randy MacLeod (1): autoconf: update runtime perl module dependencies Richard Purdie (4): openssh/util-linux/python*: Ensure ptest output is unbuffered ptest-runner: Add several logging fixes oeqa/utils/qemurunner: Fix typo in previous commit linux-yocto: Drop 4.18 kernel Robert Yang (1): sstate.bbclass: Use bb.utils.to_boolean() for BB_NO_NETWORK Ross Burton (2): sanity: clarify error message if TMPDIR moves insane: fix gettext dependency warning Scott Rifenbark (2): ref-manual: Updated BB_GENERATE_MIRROR_TARBALLS overview-manual: Fixed broken link to pseudo. Tomasz Meresiński (1): systemd: fix predictable network interface names in initrd Yeoh Ee Peng (2): resulttool/manualexecution: Enable configuration options selection resulttool/manualexecution: Enable creation of configuration option file Change-Id: I988df9d6bf0dfdeaa517960fb744c7388f791cf6 Signed-off-by: Brad Bishop --- .../0001-Refuse-to-run-on-UEFI-machines.patch | 52 ++++++++++++++++++++++ .../xorg-driver/xf86-video-vesa_2.4.0.bb | 4 ++ 2 files changed, 56 insertions(+) create mode 100644 poky/meta/recipes-graphics/xorg-driver/xf86-video-vesa/0001-Refuse-to-run-on-UEFI-machines.patch (limited to 'poky/meta/recipes-graphics/xorg-driver') diff --git a/poky/meta/recipes-graphics/xorg-driver/xf86-video-vesa/0001-Refuse-to-run-on-UEFI-machines.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-vesa/0001-Refuse-to-run-on-UEFI-machines.patch new file mode 100644 index 000000000..9e0177066 --- /dev/null +++ b/poky/meta/recipes-graphics/xorg-driver/xf86-video-vesa/0001-Refuse-to-run-on-UEFI-machines.patch @@ -0,0 +1,52 @@ +From 2645e0aa9c17c2c966a0533e52ad00510311483e Mon Sep 17 00:00:00 2001 +From: Adam Jackson +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 +Signed-off-by: Adam Jackson +Signed-off-by: Ovidiu Panait +--- + 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 +- ++#include + #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 + diff --git a/poky/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.4.0.bb b/poky/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.4.0.bb index 9a110148d..f6aa54456 100644 --- a/poky/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.4.0.bb +++ b/poky/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.4.0.bb @@ -17,3 +17,7 @@ RRECOMMENDS_${PN} += "xserver-xorg-module-libint10" SRC_URI[md5sum] = "8134201beaf6f77150c7809c3cc802e6" SRC_URI[sha256sum] = "bf443c94d7bf6cd4e248f8a3147f4647be04dc4c80250d9405006263bbdee38c" + +SRC_URI += " \ + file://0001-Refuse-to-run-on-UEFI-machines.patch \ + " -- cgit v1.2.1