Bin Li has proposed merging ~binli/ubuntu/+source/gdm3:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic.
Commit message:
* Add patches to disable wayland for Huawei Hi1710 chipsets.(LP: #1780076)
- data-61-gdm.rules.in.patch
- data-Makefile.am.patch
- install-udev-rules-in-the-correct-folder.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/354933
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~binli/ubuntu/+source/gdm3:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index abf7f96..ccb8795 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gdm3 (3.28.3-0ubuntu18.04.2) UNRELEASED; urgency=medium
+
+ * Add patches to disable wayland for Huawei Hi1710 chipsets.(LP: #1780076)
+ - data-61-gdm.rules.in.patch
+ - data-Makefile.am.patch
+ - install-udev-rules-in-the-correct-folder.patch
+
+ -- Bin Li <[email protected]> Fri, 14 Sep 2018 17:25:51 +0800
+
gdm3 (3.28.3-0ubuntu18.04.1) bionic; urgency=medium
[ Iain Lane ]
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..77146bf
--- /dev/null
+++ b/debian/patches/data-61-gdm.rules.in.patch
@@ -0,0 +1,23 @@
+From: Bin Li <[email protected]>
+Date: Wed, 29 Aug 2018 16:47:46 +0800
+Subject: 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 de8e179..c9f6110 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"
diff --git a/debian/patches/data-Makefile.am.patch b/debian/patches/data-Makefile.am.patch
new file mode 100644
index 0000000..461f07b
--- /dev/null
+++ b/debian/patches/data-Makefile.am.patch
@@ -0,0 +1,23 @@
+From: Bin Li <[email protected]>
+Date: Thu, 23 Aug 2018 15:15:24 +0800
+Subject: 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 a56f32d..774f2cb 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -160,7 +160,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
diff --git a/debian/patches/install-udev-rules-in-the-correct-folder.patch b/debian/patches/install-udev-rules-in-the-correct-folder.patch
new file mode 100644
index 0000000..5834c0a
--- /dev/null
+++ b/debian/patches/install-udev-rules-in-the-correct-folder.patch
@@ -0,0 +1,24 @@
+From: Didier Roche <[email protected]>
+Date: Wed, 5 Sep 2018 09:40:04 +0200
+Subject: install udev rules in the correct folder
+
+* debian/gdm3.install:
+ - install udev rules in the correct folder (following upstream build
+ fixes)
+---
+ debian/gdm3.install | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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/series b/debian/patches/series
index 8a5cba3..188025d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,6 @@ 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
+install-udev-rules-in-the-correct-folder.patch
--
ubuntu-desktop mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
