rpms/gdm
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Backport a follow-up to the EFI patch

Browse Source 
Also add comments on the original patch, including why it's in
the downstream patches section when it's an upstream patch.
This commit is contained in:
Adam Williamson 2023-03-02 15:31:10 -08:00
parent 12ddd399d0
commit 12dc411224
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
0001-udev-Drop-duplicated-line.patch Normal file
View File

@ -0,0 +1,29 @@
From c8032c7835381278ad0a3a5de695237d6885d649 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Thu, 2 Mar 2023 14:38:16 -0500
Subject: [PATCH] udev: Drop duplicated line
commit 72bde3b3f474135e792c6c4e40932d7c82f87985 accidentally added
two checks for virtio pci devices. The latter check is too broad
and could potentially match non-graphics cards.
This commit drops it.
---
data/61-gdm.rules.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
index b829a46f8..b5a0144dd 100644
--- a/data/61-gdm.rules.in
+++ b/data/61-gdm.rules.in
@@ -9,7 +9,6 @@ ATTR{vendor}=="0x1af4", ATTR{device}=="0x1050", ATTR{subsystem_vendor}=="0x1af4"
ATTR{vendor}=="0x1b36", ATTR{device}=="0x0100", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
# qxl
ATTR{vendor}=="0x1234", ATTR{device}=="0x1111", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
-ATTR{vendor}=="0x1af4", ATTR{device}=="0x1050", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
# disable Wayland on Hi1710 chipsets
ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", GOTO="gdm_disable_wayland"
--
2.39.2

13
gdm.spec
View File

@ -11,7 +11,7 @@
Name: gdm
Epoch: 1
Version: 43.0
Release: 6%{?dist}
Release: 7%{?dist}
Summary: The GNOME Display Manager
License: GPLv2+
@ -29,7 +29,15 @@ Patch10001: 0001-pam-redhat-Remove-pam_console-from-service-files.patch
# Downstream patches
Patch70001: 0001-udev-Stick-with-wayland-on-hybrid-nvidia-with-vendor.patch
# This is an upstream patch, but it is rediffed on the above downstream
# patch and must be applied after it
# Fix things so we get Wayland on UEFI VMs
# https://bugzilla.redhat.com/show_bug.cgi?id=2172291
# https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/198
Patch70002: 0002-udev-Try-to-detect-virtual-graphics-and-EFI-better.patch
# https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/199
# Follow-up to the above to fix an erroneously-added line
Patch70003: 0001-udev-Drop-duplicated-line.patch
Patch80001: 0001-Honor-initial-setup-being-disabled-by-distro-install.patch
Patch90001: 0001-data-add-system-dconf-databases-to-gdm-profile.patch
@ -306,6 +314,9 @@ fi
%{_libdir}/pkgconfig/gdm-pam-extensions.pc
%changelog
* Thu Mar 02 2023 Adam Williamson <awilliam@redhat.com> - 43.0-7
- Backport MR #199 to fix up a mistake in the virt efi patch
* Wed Mar 01 2023 Ray Strode <rstrode@redhat.com> - 1:43.0-6
- Fix wayland on virt efi setups
Resolves: #2172291