Ubuntu
gdm3 package

Merge ~binli/ubuntu/+source/gdm3:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic

  1. Git
  2. lp:~binli/ubuntu/+source/gdm3
  3. ubuntu/bionic
  4. Merge into ubuntu/bionic
Proposed by Bin Li
Status: Merged
Merged at revision: f7f4af3dcee2d88f60c12eb3221636013d018648
Proposed branch: ~binli/ubuntu/+source/gdm3:ubuntu/bionic
Merge into: ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
Diff against target: 109 lines (+69/-1)
5 files modified
debian/changelog (+12/-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
Iain Lane Approve
Review via email: mp+354933@code.launchpad.net

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

To post a comment you must log in.
Revision history for this message
Iain Lane (laney) wrote :

thanks, almost there, just a couple of changes to request please (see the diff comments)

review: Needs Fixing
Revision history for this message
Bin Li (binli) :
~binli/ubuntu/+source/gdm3:ubuntu/bionic updated
8217aec... by Bin Li

Fix the DEP-3 metadata

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

by the way, if you force push this branch when fixing it, there should be no need to make a new merge proposal

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

@Iain,

 Done, I thought I forgot commit the DEP-3 changes, and I re-added them, please help check it again, thanks!

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

> by the way, if you force push this branch when fixing it, there should be no
> need to make a new merge proposal
Got it.:)

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

Thanks.

I did a couple of fixes to the branch and I'll push & upload to the queue.

  - Add "[ Bin Li ]" to the changelog above your bits
  - Noted that you cherry picked the install location fix from cosmic
  - Reordered the patches so that the backports are above the distro ones
  - Squashed all the fixes together. It would probably have been better as two commits but I am too lazy to split them. :-)

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

Great! Thanks a lot!

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 abf7f96..ef9b424 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,15 @@
6+gdm3 (3.28.3-0ubuntu18.04.2) UNRELEASED; urgency=medium
7+
8+ * Add patches to disable wayland for Huawei Hi1710 chipsets.(LP: #1780076)
9+ - data-61-gdm.rules.in.patch
10+ - data-Makefile.am.patch
11+ [ Didier Roche ]
12+ * debian/gdm3.install:
13+ - install udev rules in the correct folder (following upstream build
14+ fixes)
15+
16+ -- Bin Li <bin.li@canonical.com> Fri, 14 Sep 2018 17:25:51 +0800
17+
18 gdm3 (3.28.3-0ubuntu18.04.1) bionic; urgency=medium
19
20 [ Iain Lane ]
21diff --git a/debian/gdm3.install b/debian/gdm3.install
22index c69747c..b7438b8 100644
23--- a/debian/gdm3.install
24+++ b/debian/gdm3.install
25@@ -3,7 +3,7 @@ lib/systemd/
26 lib/*/security/*.so
27 usr/bin/gdm-screenshot
28 usr/lib/gdm3/gdm-*
29-usr/lib/udev
30+lib/udev
31 # gets renamed to gdm3 in binary-install
32 usr/sbin/gdm
33 usr/share/pixmaps/
34diff --git a/debian/patches/data-61-gdm.rules.in.patch b/debian/patches/data-61-gdm.rules.in.patch
35new file mode 100644
36index 0000000..982629f
37--- /dev/null
38+++ b/debian/patches/data-61-gdm.rules.in.patch
39@@ -0,0 +1,27 @@
40+From: Bin Li <binli@gnome.org>
41+Date: Wed, 29 Aug 2018 16:47:46 +0800
42+Subject: data: 61-gdm.rules.in
43+
44+Disable wayland for Huawei Hi1710 chipsets.
45+
46+The login screen is skewed/distorted on arm server, and I couldn't
47+find root cause, and no other developer ever has access to the hardware.
48+
49+https://gitlab.gnome.org/GNOME/mutter/issues/219
50+
51+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gdm3/+bug/1780076
52+Bug: https://gitlab.gnome.org/GNOME/mutter/issues/219
53+Origin: https://gitlab.gnome.org/GNOME/gdm/merge_requests/38
54+---
55+ data/61-gdm.rules.in | 2 ++
56+ 1 file changed, 2 insertions(+)
57+
58+diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
59+index de8e179..c9f6110 100644
60+--- a/data/61-gdm.rules.in
61++++ b/data/61-gdm.rules.in
62+@@ -1,2 +1,4 @@
63+ # disable Wayland on Cirrus chipsets
64+ ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="@libexecdir@/gdm-disable-wayland"
65++# disable Wayland on Hi1710 chipsets
66++ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="@libexecdir@/gdm-disable-wayland"
67diff --git a/debian/patches/data-Makefile.am.patch b/debian/patches/data-Makefile.am.patch
68new file mode 100644
69index 0000000..379fd56
70--- /dev/null
71+++ b/debian/patches/data-Makefile.am.patch
72@@ -0,0 +1,27 @@
73+From: Bin Li <binli@gnome.org>
74+Date: Thu, 23 Aug 2018 15:15:24 +0800
75+Subject: data: Makefile.am
76+
77+The $prefix was /usr in general, but rules in /usr/lib/udev/ can't
78+be loaded by udev, so just remove it.
79+
80+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gdm3/+bug/1780076
81+Bug: https://gitlab.gnome.org/GNOME/mutter/issues/219
82+Origin: https://gitlab.gnome.org/GNOME/gdm/merge_requests/35
83+---
84+ data/Makefile.am | 2 +-
85+ 1 file changed, 1 insertion(+), 1 deletion(-)
86+
87+diff --git a/data/Makefile.am b/data/Makefile.am
88+index a56f32d..774f2cb 100644
89+--- a/data/Makefile.am
90++++ b/data/Makefile.am
91+@@ -160,7 +160,7 @@ if ENABLE_ARCH_PAM_CONFIG
92+ pam_files = $(pam_arch_files)
93+ endif
94+
95+-udevrulesdir = $(prefix)/lib/udev/rules.d
96++udevrulesdir = /lib/udev/rules.d
97+ udevrules_DATA = 61-gdm.rules
98+
99+ EXTRA_DIST += $(srcdir)/61-gdm.rules.in
100diff --git a/debian/patches/series b/debian/patches/series
101index 8a5cba3..22134e4 100644
102--- a/debian/patches/series
103+++ b/debian/patches/series
104@@ -11,3 +11,5 @@ revert_override_LANG_with_accountservices.patch
105 ubuntu_config_error_dialog.patch
106 ubuntu_dont_set_language_env.patch
107 ubuntu_prefer_ubuntu_session_fallback.patch
108+data-Makefile.am.patch
109+data-61-gdm.rules.in.patch

Subscribers

People subscribed via source and target branches

to all changes: