SHA256
1
0
forked from pool/gdm

Accepting request 595020 from home:zhangxiaofei:branches:GNOME:Factory

- Rename gdm-disable-wayland-on-mgag200-chipsets.patch to
  gdm-disable-wayland-on-unsupported-chipsets.patch: add rules for
  ASPEED ast drivers (boo#1088539).

OBS-URL: https://build.opensuse.org/request/show/595020
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=392
This commit is contained in:
Dominique Leuenberger 2018-04-13 06:49:32 +00:00 committed by Git OBS Bridge
parent eb23acaf59
commit 3523ad412f
3 changed files with 16 additions and 6 deletions

View File

@ -1,8 +1,8 @@
Index: gdm-3.28.0/data/61-gdm.rules
Index: b/data/61-gdm.rules
===================================================================
--- gdm-3.28.0.orig/data/61-gdm.rules
+++ gdm-3.28.0/data/61-gdm.rules
@@ -1,2 +1,14 @@
--- a/data/61-gdm.rules 2018-02-20 02:16:32.000000000 +0800
+++ b/data/61-gdm.rules 2018-04-08 20:31:18.860133428 +0800
@@ -1,2 +1,17 @@
-# disable Wayland on Cirrus chipsets
+# Disable Wayland on specific chipsets
+
@ -18,3 +18,6 @@ Index: gdm-3.28.0/data/61-gdm.rules
+ATTR{vendor}=="0x102b", ATTR{device}=="0x0534", RUN+="/bin/sh -c '/bin/mkdir /run/gdm ; /usr/bin/printf \"[daemon]\nWaylandEnable=false\" >> /run/gdm/custom.conf'"
+ATTR{vendor}=="0x102b", ATTR{device}=="0x0536", RUN+="/bin/sh -c '/bin/mkdir /run/gdm ; /usr/bin/printf \"[daemon]\nWaylandEnable=false\" >> /run/gdm/custom.conf'"
+ATTR{vendor}=="0x102b", ATTR{device}=="0x0538", RUN+="/bin/sh -c '/bin/mkdir /run/gdm ; /usr/bin/printf \"[daemon]\nWaylandEnable=false\" >> /run/gdm/custom.conf'"
+
+# ASPEED Technology, Inc.
+ATTR{vendor}=="0x1a03", ATTR{device}=="0x2000", RUN+="/bin/sh -c '/bin/mkdir /run/gdm ; /usr/bin/printf \"[daemon]\nWaylandEnable=false\" >> /run/gdm/custom.conf'"

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Apr 8 12:33:28 UTC 2018 - fezhang@suse.com
- Rename gdm-disable-wayland-on-mgag200-chipsets.patch to
gdm-disable-wayland-on-unsupported-chipsets.patch: add rules for
ASPEED ast drivers (boo#1088539).
-------------------------------------------------------------------
Thu Mar 22 20:20:46 CET 2018 - hpj@suse.com

View File

@ -40,8 +40,8 @@ Source6: gdmflexiserver-wrapper
Source7: X11-displaymanager-gdm
# GDM does not boostrap using gnome-autogen.sh, but has it's own bootstrap script
Source8: autogen.sh
# PATCH-FIX-UPSTREAM gdm-disable-wayland-on-mgag200-chipsets.patch bgo#794106 bsc#1083609 yfjiang@suse.com -- Disable Wayland on mgag200 chipsets
Patch1: gdm-disable-wayland-on-mgag200-chipsets.patch
# PATCH-FIX-UPSTREAM gdm-disable-wayland-on-unsupported-chipsets.patch bgo#794106 bsc#1083609 boo#1088539 yfjiang@suse.com -- Disable Wayland on unsupported chipsets
Patch1: gdm-disable-wayland-on-unsupported-chipsets.patch
# WARNING: do not remove/significantly change patch3 without updating the relevant patch in accountsservice too
# PATCH-FIX-OPENSUSE gdm-sysconfig-settings.patch bnc432360 bsc#919723 hpj@novell.com -- Read autologin options from /etc/sysconfig/displaymanager; note that accountsservice has a similar patch (accountsservice-sysconfig.patch)
Patch3: gdm-sysconfig-settings.patch