Merge ~binli/ubuntu/+source/gdm3:disable-wayland-for-huawei-hi1710 into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master

Proposed by Bin Li
Status: Rejected
Rejected by: Iain Lane
Proposed branch: ~binli/ubuntu/+source/gdm3:disable-wayland-for-huawei-hi1710
Merge into: ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master
Diff against target: 105 lines (+65/-1)
5 files modified
debian/changelog (+8/-0)
debian/gdm3.install (+1/-1)
debian/patches/data-61-gdm.rules.in.patch (+27/-0)
debian/patches/data-Makefile.am.patch (+27/-0)
debian/patches/series (+2/-0)
Reviewer Review Type Date Requested Status
Bin Li (community) Abstain
Ubuntu Desktop Pending
Review via email: mp+353981@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
Marco Trevisan (TreviƱo) (3v1n0) wrote :

LGTM

Revision history for this message
Bin Li (binli) wrote :

I found these patch was in ubuntu-desktop tree.

commit 53a5db08ae0b6e8e65b2bc0a99d374a5783a3e9b
Author: Didier Roche <email address hidden>
Date: Wed Sep 5 09:40:04 2018 +0200

    install udev rules in the correct folder

    * debian/gdm3.install:
      - install udev rules in the correct folder (following upstream build
        fixes)

commit e7c108779b23f10da71953fefa2ba5eacc76fac1
Author: Bin Li <email address hidden>
Date: Wed Aug 29 16:47:46 2018 +0800

    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

review: Abstain
Revision history for this message
Iain Lane (laney) wrote :

not needed any more, right? thanks!

Revision history for this message
Bin Li (binli) wrote :

Yes, don't need it any more.

Unmerged commits

0471261... by Bin Li

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 55a7898..64bc94a 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+gdm3 (3.29.91-1ubuntu3) bionic; urgency=medium
7+
8+ * Disable wayland for Huawei Hi1710. (LP: #1780076)
9+ + Add data-Makefile.am.patch
10+ + Add data-61-gdm.rules.in.patch
11+
12+ -- Bin Li <bin.li@canonical.com> Wed, 29 Aug 2018 22:52:22 +0800
13+
14 gdm3 (3.29.91-1ubuntu2) cosmic; urgency=medium
15
16 * debian/control.in:
17diff --git a/debian/gdm3.install b/debian/gdm3.install
18index c69747c..b7438b8 100644
19--- a/debian/gdm3.install
20+++ b/debian/gdm3.install
21@@ -3,7 +3,7 @@ lib/systemd/
22 lib/*/security/*.so
23 usr/bin/gdm-screenshot
24 usr/lib/gdm3/gdm-*
25-usr/lib/udev
26+lib/udev
27 # gets renamed to gdm3 in binary-install
28 usr/sbin/gdm
29 usr/share/pixmaps/
30diff --git a/debian/patches/data-61-gdm.rules.in.patch b/debian/patches/data-61-gdm.rules.in.patch
31new file mode 100644
32index 0000000..647f68a
33--- /dev/null
34+++ b/debian/patches/data-61-gdm.rules.in.patch
35@@ -0,0 +1,27 @@
36+From e7c108779b23f10da71953fefa2ba5eacc76fac1 Mon Sep 17 00:00:00 2001
37+From: Bin Li <binli@gnome.org>
38+Date: Wed, 29 Aug 2018 16:47:46 +0800
39+Subject: [PATCH 4/4] data: 61-gdm.rules.in
40+
41+Disable wayland for Huawei Hi1710 chipsets.
42+
43+The login screen is skewed/distorted on arm server, and I couldn't
44+find root cause, and no other developer ever has access to the hardware.
45+
46+https://gitlab.gnome.org/GNOME/mutter/issues/219
47+---
48+ data/61-gdm.rules.in | 2 ++
49+ 1 file changed, 2 insertions(+)
50+
51+diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
52+index de8e1790..c9f6110d 100644
53+--- a/data/61-gdm.rules.in
54++++ b/data/61-gdm.rules.in
55+@@ -1,2 +1,4 @@
56+ # disable Wayland on Cirrus chipsets
57+ ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="@libexecdir@/gdm-disable-wayland"
58++# disable Wayland on Hi1710 chipsets
59++ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="@libexecdir@/gdm-disable-wayland"
60+--
61+2.18.0
62+
63diff --git a/debian/patches/data-Makefile.am.patch b/debian/patches/data-Makefile.am.patch
64new file mode 100644
65index 0000000..d48b107
66--- /dev/null
67+++ b/debian/patches/data-Makefile.am.patch
68@@ -0,0 +1,27 @@
69+From 285bb5427ab515e7682e62edd3abd7d589773c78 Mon Sep 17 00:00:00 2001
70+From: Bin Li <binli@gnome.org>
71+Date: Thu, 23 Aug 2018 15:15:24 +0800
72+Subject: [PATCH 1/4] data: Makefile.am
73+
74+The $prefix was /usr in general, but rules in /usr/lib/udev/ can't
75+be loaded by udev, so just remove it.
76+---
77+ data/Makefile.am | 2 +-
78+ 1 file changed, 1 insertion(+), 1 deletion(-)
79+
80+diff --git a/data/Makefile.am b/data/Makefile.am
81+index 75a38189..7c6a2eb3 100644
82+--- a/data/Makefile.am
83++++ b/data/Makefile.am
84+@@ -154,7 +154,7 @@ if ENABLE_ARCH_PAM_CONFIG
85+ pam_files = $(pam_arch_files)
86+ endif
87+
88+-udevrulesdir = $(prefix)/lib/udev/rules.d
89++udevrulesdir = /lib/udev/rules.d
90+ udevrules_DATA = 61-gdm.rules
91+
92+ EXTRA_DIST += $(srcdir)/61-gdm.rules.in
93+--
94+2.18.0
95+
96diff --git a/debian/patches/series b/debian/patches/series
97index 8a5cba3..22134e4 100644
98--- a/debian/patches/series
99+++ b/debian/patches/series
100@@ -11,3 +11,5 @@ revert_override_LANG_with_accountservices.patch
101 ubuntu_config_error_dialog.patch
102 ubuntu_dont_set_language_env.patch
103 ubuntu_prefer_ubuntu_session_fallback.patch
104+data-Makefile.am.patch
105+data-61-gdm.rules.in.patch

Subscribers

People subscribed via source and target branches

to all changes: