Revert OL modifications

This commit is contained in:
Andrew Lukoshko 2025-08-07 11:54:19 +00:00
parent 425fca4ce4
commit 8e57e95658
2 changed files with 1 additions and 43 deletions

View File

@ -1,37 +0,0 @@
From 37c6a13fd6b605206120f99bc145d1a65a1404d1 Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Tue, 4 Apr 2023 07:40:14 -0700
Subject: [PATCH] Disable Wayland on Matrox chipsets
Orabug: 34816116
Signed-off-by: Alex Burmashev <alexander.burmashev@oracle.com>
Signed-off-by: Darren Archibald <darren.archibald@oracle.com>
---
data/61-gdm.rules.in | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
index 7fb3d61..81a9269 100644
--- a/data/61-gdm.rules.in
+++ b/data/61-gdm.rules.in
@@ -18,6 +18,16 @@ ATTR{vendor}=="0x1234", ATTR{device}=="0x1111", RUN+="/usr/bin/touch /run/udev/g
# disable Wayland on Hi1710 chipsets
ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", GOTO="gdm_disable_wayland"
+# disable Wayland on Matrox chipsets
+ATTR{vendor}=="0x102b", ATTR{device}=="0x0522", GOTO="gdm_disable_wayland"
+ATTR{vendor}=="0x102b", ATTR{device}=="0x0524", GOTO="gdm_disable_wayland"
+ATTR{vendor}=="0x102b", ATTR{device}=="0x0530", GOTO="gdm_disable_wayland"
+ATTR{vendor}=="0x102b", ATTR{device}=="0x0532", GOTO="gdm_disable_wayland"
+ATTR{vendor}=="0x102b", ATTR{device}=="0x0533", GOTO="gdm_disable_wayland"
+ATTR{vendor}=="0x102b", ATTR{device}=="0x0534", GOTO="gdm_disable_wayland"
+ATTR{vendor}=="0x102b", ATTR{device}=="0x0536", GOTO="gdm_disable_wayland"
+ATTR{vendor}=="0x102b", ATTR{device}=="0x0538", GOTO="gdm_disable_wayland"
+
LABEL="gdm_pci_device_end"
# disable Wayland if modesetting is disabled
--
2.31.1

View File

@ -11,7 +11,7 @@
Name: gdm
Epoch: 1
Version: 40.1
Release: 30.0.1%{?dist}
Release: 30%{?dist}
Summary: The GNOME Display Manager
License: GPLv2+
@ -79,8 +79,6 @@ Patch99930001: 0001-data-add-system-dconf-databases-to-gdm-profile.patch
Patch99950001: 0001-data-Disable-network-configuration-on-login-screen.patch
#Oracle patches
Patch1000000: orabug34816116-Disable-Wayland-on-Matrox-chipsets.patch
BuildRequires: accountsservice-devel
BuildRequires: audit-libs-devel >= %{libauditver}
@ -370,9 +368,6 @@ dconf update || :
%{_libdir}/pkgconfig/gdm-pam-extensions.pc
%changelog
* Tue Aug 05 2025 EL Errata <el-errata_ww@oracle.com> - 40.1-30.0.1
- Disable Wayland on Matrox [Orabug: 34816116]
* Fri Jun 20 2025 Joan Torres <joantolo@redhat.com> - 40.1-30
- Fix leak on new connections
Resolves: RHEL-98725