Bin Li has proposed merging 
~binli/ubuntu/+source/gdm3:disable-wayland-for-huawei-hi1710 into 
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master.

Commit message:
* Disable wayland for Huawei Hi1710. (LP: #1780076)
  + Add data-Makefile.am.patch
  + Add data-61-gdm.rules.in.patch


Requested reviews:
  Ubuntu Desktop (ubuntu-desktop)
Related bugs:
  Bug #1780076 in gdm3 (Ubuntu): "18.04 login screen is skewed/distorted 
(incorrect stride) when using hibmc_drm graphics"
  https://bugs.launchpad.net/ubuntu/+source/gdm3/+bug/1780076

For more details, see:
https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/353981
-- 
Your team Ubuntu Desktop is requested to review the proposed merge of 
~binli/ubuntu/+source/gdm3:disable-wayland-for-huawei-hi1710 into 
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index 55a7898..64bc94a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gdm3 (3.29.91-1ubuntu3) bionic; urgency=medium
+
+  * Disable wayland for Huawei Hi1710. (LP: #1780076)
+    + Add data-Makefile.am.patch
+    + Add data-61-gdm.rules.in.patch
+
+ -- Bin Li <[email protected]>  Wed, 29 Aug 2018 22:52:22 +0800
+
 gdm3 (3.29.91-1ubuntu2) cosmic; urgency=medium
 
   * debian/control.in:
diff --git a/debian/gdm3.install b/debian/gdm3.install
index c69747c..b7438b8 100644
--- a/debian/gdm3.install
+++ b/debian/gdm3.install
@@ -3,7 +3,7 @@ lib/systemd/
 lib/*/security/*.so
 usr/bin/gdm-screenshot
 usr/lib/gdm3/gdm-*
-usr/lib/udev
+lib/udev
 # gets renamed to gdm3 in binary-install
 usr/sbin/gdm
 usr/share/pixmaps/
diff --git a/debian/patches/data-61-gdm.rules.in.patch b/debian/patches/data-61-gdm.rules.in.patch
new file mode 100644
index 0000000..647f68a
--- /dev/null
+++ b/debian/patches/data-61-gdm.rules.in.patch
@@ -0,0 +1,27 @@
+From e7c108779b23f10da71953fefa2ba5eacc76fac1 Mon Sep 17 00:00:00 2001
+From: Bin Li <[email protected]>
+Date: Wed, 29 Aug 2018 16:47:46 +0800
+Subject: [PATCH 4/4] data: 61-gdm.rules.in
+
+Disable wayland for Huawei Hi1710 chipsets.
+
+The login screen is skewed/distorted on arm server, and I couldn't
+find root cause, and no other developer ever has access to the hardware.
+
+https://gitlab.gnome.org/GNOME/mutter/issues/219
+---
+ data/61-gdm.rules.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
+index de8e1790..c9f6110d 100644
+--- a/data/61-gdm.rules.in
++++ b/data/61-gdm.rules.in
+@@ -1,2 +1,4 @@
+ # disable Wayland on Cirrus chipsets
+ ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="@libexecdir@/gdm-disable-wayland"
++# disable Wayland on Hi1710 chipsets
++ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="@libexecdir@/gdm-disable-wayland"
+-- 
+2.18.0
+
diff --git a/debian/patches/data-Makefile.am.patch b/debian/patches/data-Makefile.am.patch
new file mode 100644
index 0000000..d48b107
--- /dev/null
+++ b/debian/patches/data-Makefile.am.patch
@@ -0,0 +1,27 @@
+From 285bb5427ab515e7682e62edd3abd7d589773c78 Mon Sep 17 00:00:00 2001
+From: Bin Li <[email protected]>
+Date: Thu, 23 Aug 2018 15:15:24 +0800
+Subject: [PATCH 1/4] data: Makefile.am
+
+The $prefix was /usr in general, but rules in /usr/lib/udev/ can't
+be loaded by udev, so just remove it.
+---
+ data/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 75a38189..7c6a2eb3 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -154,7 +154,7 @@ if ENABLE_ARCH_PAM_CONFIG
+ pam_files = $(pam_arch_files)
+ endif
+ 
+-udevrulesdir = $(prefix)/lib/udev/rules.d
++udevrulesdir = /lib/udev/rules.d
+ udevrules_DATA = 61-gdm.rules
+ 
+ EXTRA_DIST += $(srcdir)/61-gdm.rules.in
+-- 
+2.18.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 8a5cba3..22134e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,5 @@ revert_override_LANG_with_accountservices.patch
 ubuntu_config_error_dialog.patch
 ubuntu_dont_set_language_env.patch
 ubuntu_prefer_ubuntu_session_fallback.patch
+data-Makefile.am.patch
+data-61-gdm.rules.in.patch
-- 
ubuntu-desktop mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop

Reply via email to