Re: [Merge] ~binli/ubuntu/+source/gdm3:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
Diff comments:
> 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 000..77146bf
> --- /dev/null
> +++ b/debian/patches/data-61-gdm.rules.in.patch
> @@ -0,0 +1,23 @@
> +From: Bin Li
> +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
Sorry about it, I've added them in patches one by one, but I don't why it's
missed when I pushed the branch.
Did we have method to add these items automatically when use gbp or
cherry-pick? Thanks!
> +---
> + 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"
--
https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/354933
Your team Ubuntu Desktop is subscribed to branch
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic.
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~binli/ubuntu/+source/gdm3:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
@Iain, Done, I thought I forgot commit the DEP-3 changes, and I re-added them, please help check it again, thanks! -- https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/354933 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~binli/ubuntu/+source/gdm3:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
Great! Thanks a lot! -- https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/354933 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~binli/ubuntu/+source/gdm3:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
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 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 000..77146bf
--- /dev/null
+++ b/debian/patches/data-61-gdm.rules.in.patch
@@ -0,0 +1,23 @@
+From: Bin Li
+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 000..461f07b
--- /dev/null
+++ b/debian/patches/data-Makefile.am.patch
@@ -0,0 +1,23 @@
+From: Bin Li
+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 000..5834c0a
--- /dev/null
+++ b/debian/patches/install-udev-rules-in-the-correct-folder.patch
@@ -0,0 +1,24 @@
+From: Didier Roche
+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
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~binli/ubuntu/+source/gdm3:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
> 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.:) -- https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/354933 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~binli/ubuntu/+source/gdm3:bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
@Iain, Follow the tips, I pushed a new branch, could you help me check it? Thanks! https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/354933 -- https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/354839 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~binli/ubuntu/+source/gdm3:disable-wayland-for-huawei-hi1710 into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master
Yes, don't need it any more. -- 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. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~binli/ubuntu/+source/gdm3:bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
Bin Li has proposed merging ~binli/ubuntu/+source/gdm3:bionic into
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic.
Commit message:
commit 287fe76d874f02c568a1c36660f00e7eb14f70e0 (HEAD -> bionic, binli/bionic)
Author: Bin Li
Date: Thu Sep 13 15:38:35 2018 +0800
debian/gdm3.install:
- install udev rules in the correct folder (following upstream build
fixes)
commit dd0547c1176bd3e782154483a2f42237b41d039f
Author: Bin Li
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
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
For more details, see:
https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/354839
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~binli/ubuntu/+source/gdm3:bionic into
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic.
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/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/
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~binli/ubuntu/+source/gdm3:disable-wayland-for-huawei-hi1710 into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master
Review: Abstain I found these patch was in ubuntu-desktop tree. commit 53a5db08ae0b6e8e65b2bc0a99d374a5783a3e9b Author: Didier Roche 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 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 -- 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. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~binli/ubuntu/+source/gdm3:disable-wayland-for-huawei-hi1710 into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master
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 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 000..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
+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 000..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
+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
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
