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

2018-10-10 Thread Iain Lane 
Review: Approve

thank you!
-- 
https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/356297
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

2018-10-10 Thread Iain Lane 
The proposal to merge ~binli/ubuntu/+source/gdm3:ubuntu/bionic into 
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/356297
-- 
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

2018-10-09 Thread Bin Li 
@Iain,

 I just found in bionic we also missed the gdm-disable-wayland binary file, I 
just cherry-picked from cosmic. Sorry about it. Thanks!
-- 
https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/356297
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

2018-10-09 Thread Bin Li 
Bin Li has proposed merging ~binli/ubuntu/+source/gdm3:ubuntu/bionic into 
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic.

Commit message:
  * Add utils-add-new-gdm-disable-wayland-binary.patch, cherry-picked
from cosmic. (LP: #1780076)


Requested reviews:
  Iain Lane (laney)
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/356297
-- 
Your team Ubuntu Desktop is subscribed to branch 
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index 4420ff4..a68a92b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gdm3 (3.28.3-0ubuntu18.04.3) UNRELEASED; urgency=medium
+
+  [Bin Li]
+  * Add utils-add-new-gdm-disable-wayland-binary.patch, cherry-picked
+from cosmic. (LP: #1780076)
+
+ -- Bin Li   Tue, 09 Oct 2018 15:26:26 +0800
+
 gdm3 (3.28.3-0ubuntu18.04.2) bionic; urgency=medium
 
   [ Bin Li ]
diff --git a/debian/patches/series b/debian/patches/series
index 60f3aeb..cc0a11d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 # Upstream backports
 data-Makefile.am.patch
 data-61-gdm.rules.in.patch
+utils-add-new-gdm-disable-wayland-binary.patch
 
 16_xserver_path.patch
 90_config_comments.patch
diff --git a/debian/patches/utils-add-new-gdm-disable-wayland-binary.patch b/debian/patches/utils-add-new-gdm-disable-wayland-binary.patch
new file mode 100644
index 000..5940e88
--- /dev/null
+++ b/debian/patches/utils-add-new-gdm-disable-wayland-binary.patch
@@ -0,0 +1,118 @@
+From: Ray Strode 
+Date: Mon, 21 May 2018 11:03:29 -0400
+Subject: utils: add new gdm-disable-wayland binary
+
+We currently disable wayland for cirrus by calling printf
+from a udev rule.  This works, but it's a little too open
+coded to easily write SELinux policy for.
+
+This commit introduces a new program, gdm-disable-wayland,
+that does the same thing, but in a dedicated binary.
+
+A future commit will change the udev rule to use the binary.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=796315
+---
+ utils/Makefile.am   | 14 
+ utils/gdm-disable-wayland.c | 53 +
+ 2 files changed, 67 insertions(+)
+ create mode 100644 utils/gdm-disable-wayland.c
+
+diff --git a/utils/Makefile.am b/utils/Makefile.am
+index ae3cc01..babe890 100644
+--- a/utils/Makefile.am
 b/utils/Makefile.am
+@@ -10,6 +10,8 @@ AM_CPPFLAGS = \
+ 	-DDATADIR=\"$(datadir)\"			\
+ 	-DGDMCONFDIR=\"$(gdmconfdir)\"			\
+ 	-DLOCALSTATEDIR=\""$(localstatedir)"\" 		\
++	-DGDM_RUN_DIR=\"$(GDM_RUN_DIR)\"		\
++	-DGDM_RUNTIME_CONF=\"$(GDM_RUNTIME_CONF)\"	\
+ 	-DGDM_SCREENSHOT_DIR=\""$(GDM_SCREENSHOT_DIR)"\"\
+ 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
+ 	$(UTILS_CFLAGS)	\
+@@ -31,6 +33,10 @@ bin_PROGRAMS = \
+ 	gdm-screenshot		\
+ 	$(NULL)
+ 
++libexec_PROGRAMS = \
++	gdm-disable-wayland	\
++	$(NULL)
++
+ gdmflexiserver_LDADD =		\
+ 	$(top_builddir)/common/libgdmcommon.la	\
+ 	$(GTK_LIBS)		\
+@@ -49,6 +55,14 @@ gdm_screenshot_LDADD =		\
+ 	$(COMMON_LIBS)		\
+ 	$(NULL)
+ 
++gdm_disable_wayland_LDADD =	\
++	$(COMMON_LIBS)		\
++	$(NULL)
++
++gdm_disable_wayland_SOURCES =	\
++	gdm-disable-wayland.c	\
++	$(NULL)
++
+ CLEANFILES = 			\
+ 	$(NULL)
+ 
+diff --git a/utils/gdm-disable-wayland.c b/utils/gdm-disable-wayland.c
+new file mode 100644
+index 000..be61c4d
+--- /dev/null
 b/utils/gdm-disable-wayland.c
+@@ -0,0 +1,53 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2018 Red Hat, Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++ *
++ */
++
++#include "config.h"
++
++#include 
++#include 
++#include 
++
++#include 
++
++int
++main (int argc, char *argv[])
++{
++g_autoptr(GKeyFile) key_file = NULL;
++g_autoptr(GError) error = NULL;
++gboolean saved_okay;
++
++setlocale (LC_ALL, "");
++
++key_file = g_key_file_new ();
++
++g_key_file_set_boolean (key_file, "daemon", "WaylandEnable", FALSE);
++
++g_mkdir_with_parents (GDM_RUN_DIR, 0711);
++
++saved_oka

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

2018-09-16 Thread Bin Li 


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

2018-09-16 Thread Bin Li 
@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

2018-09-16 Thread Bin Li 
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

2018-09-16 Thread Bin Li 
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

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

2018-09-16 Thread Iain Lane 
The proposal to merge ~binli/ubuntu/+source/gdm3:ubuntu/bionic into 
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic has been updated.

Status: Needs review => Merged

For more details, see:
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

2018-09-16 Thread Iain Lane 
Review: Approve

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. :-)
-- 
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

2018-09-16 Thread Bin Li 
> 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:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic

2018-09-16 Thread Iain Lane 
Review: Needs Fixing

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

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

Please could you add add DEP-3 metadata here so that people in the future can 
easily find out where the patch comes from? At the end of the description, add:

Bug-Ubuntu: 
Bug: ,
Origin: 

> +---
> + 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.

same here

> +---
> + 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 +-

This one should not be a Debian patch - a patch should never patch the debian/ 
directory itself. Please make this change directly.

> + 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/


-- 
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

2018-09-16 Thread Iain Lane 
by the way, if you force push this branch when fixing it, there should be no 
need to make a new merge proposal

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

When you use `gbp-pq export` to make the patch series, the commit message 
becomes the patch description. So if you have them in your commit messages in 
`patch-queue/ubuntu/bionic`, they should show up correctly. Or it's also OK to 
do it by hand if you prefer.

This isn't done automatically, no - it's something you need to do by hand.

> +---
> + 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