Re: [Merge] ~vanvugt/ubuntu/+source/gdm3:fix-lp1705369-eoan into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master
Review: Approve I indeed can't reproduce the issue anymore in eoan, with the patch removed. Let's merge this then, thanks! -- https://code.launchpad.net/~vanvugt/ubuntu/+source/gdm3/+git/gdm3/+merge/369024 Your team Ubuntu Desktop is requested to review the proposed merge of ~vanvugt/ubuntu/+source/gdm3:fix-lp1705369-eoan 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] ~vanvugt/ubuntu/+source/gdm3:fix-lp1705369-eoan into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master
The proposal to merge ~vanvugt/ubuntu/+source/gdm3:fix-lp1705369-eoan into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~vanvugt/ubuntu/+source/gdm3/+git/gdm3/+merge/369024 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~vanvugt/ubuntu/+source/gdm3:fix-lp1705369-eoan 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] ~vanvugt/ubuntu/+source/gdm3:fix-lp1705369-eoan into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master
The proposal to merge ~vanvugt/ubuntu/+source/gdm3:fix-lp1705369-eoan into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master has been updated. Commit message changed to: Remove revert_nvidia_wayland_blacklist.patch That patch was removing the upstream fix for LP: #1705369. And the bug which the patch was meant to solve doesn't seem to exist any more. If it did still exist then it should probably be solved in a different way anyway. Now Nvidia desktops with multiple GPUs get a working login screen. Closes: https://bugs.launchpad.net/bugs/1705369 For more details, see: https://code.launchpad.net/~vanvugt/ubuntu/+source/gdm3/+git/gdm3/+merge/369024 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~vanvugt/ubuntu/+source/gdm3:fix-lp1705369-eoan 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] ~vanvugt/ubuntu/+source/gdm3:fix-lp1705369-eoan into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master
Daniel van Vugt has proposed merging
~vanvugt/ubuntu/+source/gdm3:fix-lp1705369-eoan into
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master.
Commit message:
Remove revert_nvidia_wayland_blacklist.patch
That patch was completely removing the upstream fix for LP: #1705369.
The bug which the patch was meant to solve doesn't seem to exist any more,
and even if it did it is lower priority affecting 1 person vs 52 people.
Now Nvidia desktops with multiple GPUs get a working login screen.
Closes: https://bugs.launchpad.net/bugs/1705369
Requested reviews:
Didier Roche (didrocks)
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1705369 in gnome-shell (Ubuntu): "Ubuntu boots to blank screen when
using Nvidia (on a desktop with an unused Intel GPU)"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1705369
For more details, see:
https://code.launchpad.net/~vanvugt/ubuntu/+source/gdm3/+git/gdm3/+merge/369024
Separately I am also pursuing a fix to mutter!625 upstream. If that fix lands
then this one won't be required. Although it doesn't hurt if both land...
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~vanvugt/ubuntu/+source/gdm3:fix-lp1705369-eoan into
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index 6f83e1c..381eb51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gdm3 (3.32.0-1ubuntu2) eoan; urgency=medium
+
+ * Remove revert_nvidia_wayland_blacklist.patch because it was causing a
+much greater problem (LP: #1705369) than it was meant to solve (which
+doesn't seem to exist any more either).
+
+ -- Daniel van Vugt Wed, 19 Jun 2019 15:47:11 +0800
+
gdm3 (3.32.0-1ubuntu1) disco; urgency=medium
* Merge with Debian. Remaining changes:
diff --git a/debian/patches/series b/debian/patches/series
index bdcdb4c..6055234 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,5 +12,4 @@ ubuntu/revert_override_LANG_with_accountservices.patch
ubuntu/config_error_dialog.patch
ubuntu/dont_set_language_env.patch
ubuntu/prefer_ubuntu_session_fallback.patch
-ubuntu/revert_nvidia_wayland_blacklist.patch
ubuntu/gdm3.service-wait-for-drm-device-before-trying-to-start-i.patch
diff --git a/debian/patches/ubuntu/revert_nvidia_wayland_blacklist.patch b/debian/patches/ubuntu/revert_nvidia_wayland_blacklist.patch
deleted file mode 100644
index 3f95c1d..000
--- a/debian/patches/ubuntu/revert_nvidia_wayland_blacklist.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Didier Roche
-Date: Thu, 11 Oct 2018 17:45:57 +0100
-Subject: Revert nvidia from wayland blacklist
-
-With some nvidia hardware using binary driver, if gdm GNOME Shell
-instance is running under Xorg, after logged in, turn into an infinite
-restart CPU loop, spiking processor usage to 100%.
-This is due to an invalid paint context.
-As on ubuntu, our main user session is using Xorg, having GDM using
-Wayland is fine, as checked with usptream. So, we can revert nvidia from
-the blacklist for now.
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1797355
-Bug: https://gitlab.gnome.org/GNOME/gdm/issues/429
- data/61-gdm.rules.in | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
-index ad5b87d..c9f6110 100644
a/data/61-gdm.rules.in
-+++ b/data/61-gdm.rules.in
-@@ -2,5 +2,3 @@
- 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"
--# disable Wayland when using the proprietary nvidia driver
--DRIVER=="nvidia", RUN+="@libexecdir@/gdm-disable-wayland"
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gdm3:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/gdm3:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gdm3/+git/gdm3/+merge/356861 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gdm3:ubuntu/master 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] ~3v1n0/ubuntu/+source/gdm3:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gdm3:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1794280 in gdm3 (Ubuntu): "gdm doesn't start on a fresh installation of
Cosmic Desktop"
https://bugs.launchpad.net/ubuntu/+source/gdm3/+bug/1794280
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gdm3/+git/gdm3/+merge/356861
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gdm3:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index 29491af..9b30904 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gdm3 (3.30.1-1ubuntu4) UNRELEASED; urgency=medium
+
+ * d/p/u/gdm3.service-wait-for-drm-device-before-trying-to-start-i.patch:
+- Wait for the first valid gdm device on pre-start (LP: #1794280)
++ debian/control:
+ - Add build-depends on libgudev-1.0-dev
+
+ -- Marco Trevisan (Treviño) Tue, 16 Oct 2018 14:08:32 -0500
+
gdm3 (3.30.1-1ubuntu3) cosmic; urgency=medium
* Build-Depend on gjs so that we don't produce uninstallable packages
diff --git a/debian/patches/series b/debian/patches/series
index b7dd121..cab417d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ ubuntu_config_error_dialog.patch
ubuntu_dont_set_language_env.patch
ubuntu_prefer_ubuntu_session_fallback.patch
ubuntu_revert_nvidia_wayland_blacklist.patch
+ubuntu/gdm3.service-wait-for-drm-device-before-trying-to-start-i.patch
diff --git a/debian/patches/ubuntu/gdm3.service-wait-for-drm-device-before-trying-to-start-i.patch b/debian/patches/ubuntu/gdm3.service-wait-for-drm-device-before-trying-to-start-i.patch
new file mode 100644
index 000..b33510e
--- /dev/null
+++ b/debian/patches/ubuntu/gdm3.service-wait-for-drm-device-before-trying-to-start-i.patch
@@ -0,0 +1,169 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
+Date: Tue, 16 Oct 2018 20:59:23 +0200
+Subject: gdm3.service: wait for drm device before trying to start it
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gdm3/+bug/1794280
+Forwarded: not-needed
+---
+ configure.ac | 1 +
+ data/Makefile.am | 1 +
+ data/gdm.service.in | 4 +++
+ utils/Makefile.am| 9 +
+ utils/gdm-wait-for-drm.c | 85
+ 5 files changed, 100 insertions(+)
+ create mode 100644 utils/gdm-wait-for-drm.c
+
+diff --git a/configure.ac b/configure.ac
+index f763632..37fa2ec 100644
+--- a/configure.ac
b/configure.ac
+@@ -76,6 +76,7 @@ PKG_CHECK_MODULES(COMMON,
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-unix-2.0 >= $GLIB_REQUIRED_VERSION
++gudev-1.0
+ )
+ AC_SUBST(COMMON_CFLAGS)
+ AC_SUBST(COMMON_LIBS)
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 4aae042..f5b185a 100644
+--- a/data/Makefile.am
b/data/Makefile.am
+@@ -208,6 +208,7 @@ systemdsystemunit =
+ gdm.service: $(srcdir)/gdm.service.in
+ $(AM_V_GEN)sed \
+ -e 's,[@]sbindir[@],$(sbindir),g' \
++ -e 's,[@]libexecdir[@],$(libexecdir),g' \
+ -e 's,[@]GDM_INITIAL_VT[@],$(GDM_INITIAL_VT),g' \
+ -e 's,[@]LANG_CONFIG_FILE[@],$(LANG_CONFIG_FILE),g' \
+ -e 's,[@]PLYMOUTH_QUIT_SERVICE[@],$(PLYMOUTH_QUIT_SERVICE),g' \
+diff --git a/data/gdm.service.in b/data/gdm.service.in
+index 446e173..89c0bbc 100644
+--- a/data/gdm.service.in
b/data/gdm.service.in
+@@ -32,3 +32,7 @@ StandardError=inherit
+ EnvironmentFile=-@LANG_CONFIG_FILE@
+ ExecReload=/usr/share/gdm/generate-config
+ ExecReload=/bin/kill -SIGHUP $MAINPID
++ExecStartPre=@libexecdir@/gdm-wait-for-drm
++
++[Install]
++Alias=display-manager.service
+diff --git a/utils/Makefile.am b/utils/Makefile.am
+index babe890..3eb43c3 100644
+--- a/utils/Makefile.am
b/utils/Makefile.am
+@@ -35,6 +35,7 @@ bin_PROGRAMS = \
+
+ libexec_PROGRAMS = \
+ gdm-disable-wayland \
++ gdm-wait-for-drm \
+ $(NULL)
+
+ gdmflexiserver_LDADD = \
+@@ -63,6 +64,14 @@ gdm_disable_wayland_SOURCES = \
+ gdm-disable-wayland.c \
+ $(NULL)
+
++gdm_wait_for_drm_LDADD = \
++ $(COMMON_LIBS) \
++ $(NULL)
++
++gdm_wait_for_drm_SOURCES = \
++ gdm-wait-for-drm.c \
++ $(NULL)
++
+ CLEANFILES = \
+ $(NULL)
+
+diff --git a/utils/gdm-wait-for-drm.c b/utils/gdm-wait-for-drm.c
+new file mode 100644
+index 000..741134e
+--- /dev/null
b/utils/gdm-wait-for-drm.c
+@@ -0,0 +1,85 @@
++#include
++#include
++
++static gboolean
++handle_device (GUdevDevice *device)
++{
++const gchar * const * tags;
++tags = g_udev_device_get_tags (device);
++g_debug ("%s\n", g_udev_device_get_name (device));
++if (g_strv_contains (tags, "master-of-seat"))
++{
++g_debug ("is seat master\n");
++r
Re: [Merge] ~binli/ubuntu/+source/gdm3:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
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
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:bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
ok, let's head over there, thanks -- 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
[Merge] ~binli/ubuntu/+source/gdm3:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
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
[Merge] ~binli/ubuntu/+source/gdm3:bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
The proposal to merge ~binli/ubuntu/+source/gdm3:bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic has been updated. Status: Needs review => Rejected For more details, see: 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:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
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
> 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
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: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: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
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
[Merge] ~binli/ubuntu/+source/gdm3:disable-wayland-for-huawei-hi1710 into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master
The proposal to merge ~binli/ubuntu/+source/gdm3:disable-wayland-for-huawei-hi1710 into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master has been updated. Status: Needs review => Rejected 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. -- 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
not needed any more, right? thanks! -- 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
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
Re: [Merge] ~binli/ubuntu/+source/gdm3:disable-wayland-for-huawei-hi1710 into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master
LGTM -- 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
[Merge] ~dgadomski/ubuntu/+source/gdm3/+git/lp1782152:unblock-sigusr1 into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
The proposal to merge ~dgadomski/ubuntu/+source/gdm3/+git/lp1782152:unblock-sigusr1 into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~dgadomski/ubuntu/+source/gdm3/+git/lp1782152/+merge/353089 -- 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] ~dgadomski/ubuntu/+source/gdm3/+git/lp1782152:unblock-sigusr1 into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
I just pushed this branch without ce4a95af00d3f2174bf10827e75b54bf5fde2154 and added a changelog entry for that change on top. Thanks! -- https://code.launchpad.net/~dgadomski/ubuntu/+source/gdm3/+git/lp1782152/+merge/353089 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] ~dgadomski/ubuntu/+source/gdm3/+git/lp1782152:bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
Review: Needs Information Thanks! I've seen that there's a new release 3.28.3 out now - should we take that instead of 509381a? In any event there was just a security update so this will need to be rebased - and that update included in git probably since the security team usually ignore teams' packaging repositories. :( -- https://code.launchpad.net/~dgadomski/ubuntu/+source/gdm3/+git/lp1782152/+merge/352976 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] ~dgadomski/ubuntu/+source/gdm3/+git/lp1782152:bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
Okey dokey, 3.28.3 is in ubuntu/bionic now, waiting for you to rebase. I don't necessarily have to review the rebase, so feel free to merge and upload yourself if you want. Or if you do want a review, let me know. -- https://code.launchpad.net/~dgadomski/ubuntu/+source/gdm3/+git/lp1782152/+merge/352976 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] ~dgadomski/ubuntu/+source/gdm3/+git/lp1782152:unblock-sigusr1 into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
Review: Needs Fixing You don't need unblock-sigusr1.patch any more. It's in this release: Applying patch unblock-sigusr1.patch patching file daemon/gdm-session-worker-job.c Hunk #1 FAILED at 117. 1 out of 1 hunk FAILED -- rejects in file daemon/gdm-session-worker-job.c patching file daemon/gdm-session-worker.c Hunk #1 FAILED at 2025. Hunk #2 FAILED at 2147. 2 out of 2 hunks FAILED -- rejects in file daemon/gdm-session-worker.c Patch unblock-sigusr1.patch can be reverse-applied Have you tested this update? -- https://code.launchpad.net/~dgadomski/ubuntu/+source/gdm3/+git/lp1782152/+merge/353089 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] ~dgadomski/ubuntu/+source/gdm3/+git/lp1782152:unblock-sigusr1 into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
Dariusz Gadomski has proposed merging
~dgadomski/ubuntu/+source/gdm3/+git/lp1782152:unblock-sigusr1 into
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic.
Commit message:
[ Alberto Milone ]
* ubuntu_nvidia_prime.patch:
- Run scripts for Prime before and after Gdm sessions (LP: #1778011).
[ Dariusz Gadomski ]
* debian/patches/unblock-sigusr1.patch:
- Unblock SIGUSR1 before PAM. (LP: #1782152)
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1778011 in nvidia-prime (Ubuntu): "SRU: PRIME Power Saving mode draws
too much power"
https://bugs.launchpad.net/ubuntu/+source/nvidia-prime/+bug/1778011
Bug #1782152 in gdm3 (Ubuntu): "GDM blocks SIGUSR1 used in PAM scripts"
https://bugs.launchpad.net/ubuntu/+source/gdm3/+bug/1782152
For more details, see:
https://code.launchpad.net/~dgadomski/ubuntu/+source/gdm3/+git/lp1782152/+merge/353089
Rebased on top of 3.28.3.
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~dgadomski/ubuntu/+source/gdm3/+git/lp1782152:unblock-sigusr1 into
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic.
diff --git a/debian/patches/series b/debian/patches/series
index 8a5cba3..ed7aa6c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ revert_override_LANG_with_accountservices.patch
ubuntu_config_error_dialog.patch
ubuntu_dont_set_language_env.patch
ubuntu_prefer_ubuntu_session_fallback.patch
+unblock-sigusr1.patch
diff --git a/debian/patches/ubuntu_nvidia_prime.patch b/debian/patches/ubuntu_nvidia_prime.patch
index d2588b1..bf60c76 100644
--- a/debian/patches/ubuntu_nvidia_prime.patch
+++ b/debian/patches/ubuntu_nvidia_prime.patch
@@ -1,24 +1,25 @@
From: Tim Lunn
Date: Sat, 22 Mar 2014 10:23:12 +1100
-Subject: Add hook to run prime-offload (as root) move Prime helpers into the
- gdm-x-session wrapper
-
++Subject: Add hooks to run prime scripts (as root) before and after a
++ gdm-session
+
++This allows enabling and disabling the dGPU on log out.
---
- common/gdm-common.c| 2 +-
- daemon/gdm-display.c | 1 +
- daemon/gdm-x-session.c | 10 ++
- data/Makefile.am | 24
- data/Prime | 6 ++
- data/PrimeOff | 6 ++
+ common/gdm-common.c|2 +-
+ daemon/gdm-session.c |6 ++
+ daemon/gdm-x-session.c |5 +
+ data/Makefile.am | 24
+ data/Prime |6 ++
+ data/PrimeOff |6 ++
6 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 data/Prime
create mode 100644 data/PrimeOff
-Index: gdm3-3.26.0/common/gdm-common.c
+Index: gdm3-3.28.2/common/gdm-common.c
===
gdm3-3.26.0.orig/common/gdm-common.c 2017-09-14 08:24:10.584748891 -0400
-+++ gdm3-3.26.0/common/gdm-common.c 2017-09-14 08:24:10.580748834 -0400
-@@ -677,7 +677,7 @@ gdm_run_script (const char *dir,
+--- gdm3-3.28.2.orig/common/gdm-common.c
gdm3-3.28.2/common/gdm-common.c
+@@ -706,7 +706,7 @@
goto out;
}
@@ -27,23 +28,28 @@ Index: gdm3-3.26.0/common/gdm-common.c
display_name,
display_hostname,
display_x11_authority_file);
-Index: gdm3-3.26.0/daemon/gdm-x-session.c
+Index: gdm3-3.28.2/daemon/gdm-session.c
===
gdm3-3.26.0.orig/daemon/gdm-x-session.c 2017-09-14 08:24:10.584748891 -0400
-+++ gdm3-3.26.0/daemon/gdm-x-session.c 2017-09-14 08:24:10.580748834 -0400
-@@ -172,6 +172,11 @@ on_x_server_finished (GSubprocess *subp
- if (cancelled) {
- goto out;
- }
-+gdm_run_script (GDMCONFDIR "/PrimeOff", "root",
-+ state->display_name,
-+ NULL, /* hostname */
-+ state->auth_file);
+--- gdm3-3.28.2.orig/daemon/gdm-session.c
gdm3-3.28.2/daemon/gdm-session.c
+@@ -2865,6 +2865,12 @@
+
+ g_list_free_full (self->priv->outside_connections, g_object_unref);
+ self->priv->outside_connections = NULL;
+
++/* Run PrimeOff after the session is closed */
++gdm_run_script (GDMCONFDIR "/PrimeOff", "root",
++NULL,
++NULL,
++NULL);
+ }
- if (g_subprocess_get_if_exited (subprocess)) {
- int exit_status;
-@@ -614,6 +619,11 @@ spawn_session (State*state,
+ void
+Index: gdm3-3.28.2/daemon/gdm-x-session.c
+===
+--- gdm3-3.28.2.orig/daemon/gdm-x-session.c
gdm3-3.28.2/daemon/gdm-x-session.c
+@@ -614,6 +614,11 @@
g_debug ("Running X session");
@@ -55,11 +61,11 @@
Re: [Merge] ~dgadomski/ubuntu/+source/gdm3/+git/lp1782152:unblock-sigusr1 into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
Please make sure to update the changelog too -- https://code.launchpad.net/~dgadomski/ubuntu/+source/gdm3/+git/lp1782152/+merge/353089 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] ~dgadomski/ubuntu/+source/gdm3/+git/lp1782152:bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
I've done the gbp import-dsc and I'll do the "new upstream version" part now - then if you'd please rebase this branch I can merge it. -- https://code.launchpad.net/~dgadomski/ubuntu/+source/gdm3/+git/lp1782152/+merge/352976 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] ~dgadomski/ubuntu/+source/gdm3/+git/lp1782152:bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
(An advantage of taking the new upstream release is that we can then use the SRU exception to not have to verify that fix explicitly.) -- https://code.launchpad.net/~dgadomski/ubuntu/+source/gdm3/+git/lp1782152/+merge/352976 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] ~dgadomski/ubuntu/+source/gdm3/+git/lp1782152:bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
Dariusz Gadomski has proposed merging
~dgadomski/ubuntu/+source/gdm3/+git/lp1782152:bionic into
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic.
Commit message:
[ Alberto Milone ]
* ubuntu_nvidia_prime.patch:
- Run scripts for Prime before and after Gdm sessions (LP: #1778011).
[ Dariusz Gadomski ]
* debian/patches/unblock-sigusr1.patch:
- Unblock SIGUSR1 before PAM. (LP: #1782152)
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1778011 in nvidia-prime (Ubuntu): "SRU: PRIME Power Saving mode draws
too much power"
https://bugs.launchpad.net/ubuntu/+source/nvidia-prime/+bug/1778011
Bug #1782152 in gdm3 (Ubuntu): "GDM blocks SIGUSR1 used in PAM scripts"
https://bugs.launchpad.net/ubuntu/+source/gdm3/+bug/1782152
For more details, see:
https://code.launchpad.net/~dgadomski/ubuntu/+source/gdm3/+git/lp1782152/+merge/352976
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~dgadomski/ubuntu/+source/gdm3/+git/lp1782152:bionic into
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index 9908170..d8bac21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+gdm3 (3.28.2-0ubuntu1.4) bionic; urgency=medium
+
+ [ Alberto Milone ]
+ * ubuntu_nvidia_prime.patch:
+- Run scripts for Prime before and after Gdm sessions (LP: #1778011).
+
+ [ Dariusz Gadomski ]
+ * debian/patches/unblock-sigusr1.patch:
+- Unblock SIGUSR1 before PAM. (LP: #1782152)
+
+ -- Dariusz Gadomski Mon, 13 Aug 2018 14:37:55 +0200
+
gdm3 (3.28.2-0ubuntu1.3) bionic; urgency=medium
* debian/patches/daemon-gdm-session-record.c-open-close-the-utmp-database.patch:
diff --git a/debian/patches/series b/debian/patches/series
index cad9b06..2044149 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,3 +25,4 @@ revert_override_LANG_with_accountservices.patch
ubuntu_config_error_dialog.patch
ubuntu_dont_set_language_env.patch
ubuntu_prefer_ubuntu_session_fallback.patch
+unblock-sigusr1.patch
diff --git a/debian/patches/ubuntu_nvidia_prime.patch b/debian/patches/ubuntu_nvidia_prime.patch
index d2588b1..bf60c76 100644
--- a/debian/patches/ubuntu_nvidia_prime.patch
+++ b/debian/patches/ubuntu_nvidia_prime.patch
@@ -1,24 +1,25 @@
From: Tim Lunn
Date: Sat, 22 Mar 2014 10:23:12 +1100
-Subject: Add hook to run prime-offload (as root) move Prime helpers into the
- gdm-x-session wrapper
-
++Subject: Add hooks to run prime scripts (as root) before and after a
++ gdm-session
+
++This allows enabling and disabling the dGPU on log out.
---
- common/gdm-common.c| 2 +-
- daemon/gdm-display.c | 1 +
- daemon/gdm-x-session.c | 10 ++
- data/Makefile.am | 24
- data/Prime | 6 ++
- data/PrimeOff | 6 ++
+ common/gdm-common.c|2 +-
+ daemon/gdm-session.c |6 ++
+ daemon/gdm-x-session.c |5 +
+ data/Makefile.am | 24
+ data/Prime |6 ++
+ data/PrimeOff |6 ++
6 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 data/Prime
create mode 100644 data/PrimeOff
-Index: gdm3-3.26.0/common/gdm-common.c
+Index: gdm3-3.28.2/common/gdm-common.c
===
gdm3-3.26.0.orig/common/gdm-common.c 2017-09-14 08:24:10.584748891 -0400
-+++ gdm3-3.26.0/common/gdm-common.c 2017-09-14 08:24:10.580748834 -0400
-@@ -677,7 +677,7 @@ gdm_run_script (const char *dir,
+--- gdm3-3.28.2.orig/common/gdm-common.c
gdm3-3.28.2/common/gdm-common.c
+@@ -706,7 +706,7 @@
goto out;
}
@@ -27,23 +28,28 @@ Index: gdm3-3.26.0/common/gdm-common.c
display_name,
display_hostname,
display_x11_authority_file);
-Index: gdm3-3.26.0/daemon/gdm-x-session.c
+Index: gdm3-3.28.2/daemon/gdm-session.c
===
gdm3-3.26.0.orig/daemon/gdm-x-session.c 2017-09-14 08:24:10.584748891 -0400
-+++ gdm3-3.26.0/daemon/gdm-x-session.c 2017-09-14 08:24:10.580748834 -0400
-@@ -172,6 +172,11 @@ on_x_server_finished (GSubprocess *subp
- if (cancelled) {
- goto out;
- }
-+gdm_run_script (GDMCONFDIR "/PrimeOff", "root",
-+ state->display_name,
-+ NULL, /* hostname */
-+ state->auth_file);
+--- gdm3-3.28.2.orig/daemon/gdm-session.c
gdm3-3.28.2/daemon/gdm-session.c
+@@ -2865,6 +2865,12 @@
+
+ g_list_free_full (self->priv->outside_connections, g_object_unref);
+ self->priv->outside_connections = NULL;
+
++/* Run PrimeOff after the session is closed */
++gdm_run_script (GDMCONFDIR "/PrimeOff", &q
[Merge] ~canonical-desktop-team/ubuntu/+source/gdm3:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master
Marco Trevisan (Treviño) has proposed merging ~canonical-desktop-team/ubuntu/+source/gdm3:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master. Requested reviews: Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #678421 in gdm (Ubuntu): "Error message for a faulty ~/.profile script" https://bugs.launchpad.net/ubuntu/+source/gdm/+bug/678421 Bug #952185 in Light Display Manager: "~/.pam_environment not parsed by default" https://bugs.launchpad.net/lightdm/+bug/952185 Bug #1262068 in nvidia-prime (Ubuntu): "nvidia-prime should support gdm also" https://bugs.launchpad.net/ubuntu/+source/nvidia-prime/+bug/1262068 Bug #1662031 in Ubuntu GNOME: "Switching language and format broken" https://bugs.launchpad.net/ubuntu-gnome/+bug/1662031 Bug #1766137 in gdm3 (Ubuntu): "[regression] Password accepted but login fails (blank purple screen and mouse pointer only)" https://bugs.launchpad.net/ubuntu/+source/gdm3/+bug/1766137 Bug #1776487 in gdm3 (Ubuntu): "Logging out does not decrease the number of logged in users" https://bugs.launchpad.net/ubuntu/+source/gdm3/+bug/1776487 For more details, see: https://code.launchpad.net/~canonical-desktop-team/ubuntu/+source/gdm3/+git/gdm3/+merge/349818 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~canonical-desktop-team/ubuntu/+source/gdm3:ubuntu/master 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
Re: GDM3
On dim., 2011-07-31 at 04:05 -0400, Jeremy Bicha wrote: A perpetual goal of the Desktop Team is to try to reduce our patch delta with upstream. GDM is one of the most heavily patched components in Ubuntu that now is no longer being shipped by default on the main CD. I'd like to see us at least reduce our delta with Debian to make our maintenance easier. Hey, We started on that this cycle and dropped for example gdmsetup and some other of your custome hacks, we can probably do better still though! Is Debian's renaming to gdm3 permanent? Using the same package names makes looking at a diff quite a bit simpler, so I'd like to see us follow Debian's naming practice. Yes, they said they would keep the source name like to avoid upgrading users from one version to the new one, we could rename the source but we shouldn't i.e rename the etc directory and break configs. -- Sebastien Bacher -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
GDM3
A perpetual goal of the Desktop Team is to try to reduce our patch delta with upstream. GDM is one of the most heavily patched components in Ubuntu that now is no longer being shipped by default on the main CD. I'd like to see us at least reduce our delta with Debian to make our maintenance easier. Is Debian's renaming to gdm3 permanent? Using the same package names makes looking at a diff quite a bit simpler, so I'd like to see us follow Debian's naming practice. Jeremy Bicha -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
