Xorg server removal #5485

jexposit · 2024-02-21T10:47:32Z

Drop the X.Org server dependency

Start GNOME Kiosk as a Wayland compositor and run Anaconda as a native
Wayland client.

This commit is a follow up on the work done by @Conan-Kudo [1] and
@M4rtinK [2]. Credit goes to them for the code I copied and pasted.

[1] #5401
[2] #5309

Please note that the last patch ("Drop the X.Org server dependency") is the only change intended in this PR.

I cherry picked my patches removing libxklavier and xrandr as they are required to support a Wayland session.
I'll rebase this PR once the mentioned dependencies are merged.

pep8speaks · 2024-02-21T10:47:44Z

Hello @jexposit! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2024-06-06 12:21:12 UTC

pyanaconda/core/constants.py

Conan-Kudo · 2024-02-21T11:02:20Z

Could you please use Co-authored-by: Neal Gompa <neal@gompa.dev> in your commit message instead of tagging @Conan-Kudo, since parts of #5401 are included in here and I would very much like to not to get an email every time this commit gets shuffled around.

Conan-Kudo · 2024-02-21T11:08:28Z

Please reword like so:

Start GNOME Kiosk as a Wayland compositor and run Anaconda as a native
Wayland client.

This commit is a follow up on the work done by Neal Gompa [1] and
Martin Kolman [2]. Credit goes to them for the code I copied and pasted.

[1] https://github.com/rhinstaller/anaconda/pull/5401
[2] https://github.com/rhinstaller/anaconda/pull/5309

Co-authored-by: Neal Gompa <neal@gompa.dev>
Co-authored-by: Martin Kolman <mkolman@redhat.com>

Conan-Kudo · 2024-02-21T11:14:47Z

Thanks! I really didn't want an email every time this commit got refreshed, cherry-picked, or forked. 😅

jexposit · 2024-02-21T11:25:23Z

No problem, I didn't want to share your email publicly without your consent, so I used your GitHub username. Fixed now :D

jexposit · 2024-02-21T11:26:52Z

/build-image --boot.iso

github-actions · 2024-02-21T11:37:56Z

Images built based on commit 01f49fc:

boot.iso: success

Download the images from the bottom of the job status page.

Conan-Kudo · 2024-02-21T11:58:16Z

Is there a reason this isn't tagged for F40?

M4rtinK · 2024-02-21T12:00:06Z

When we are at it I suggest we mention also @halfline, as he helped me a lot with my PR & an important part of it was provided by him - run-in-new-session.py script, even though it might not be evident from the way the PR was structured:

Ray Strode <rstrode@redhat.com>

jexposit · 2024-02-21T12:27:46Z

Is there a reason this isn't tagged for F40?

In order to fully support Wayland, we need to remove libxklavier and drop xrandr and xrdb.

While I think that the xrandr change can be merged in Fedora -as it doesn't affect the live session and the Spins-, the change libxklavier removal would affect the spins.

#5463 relies on GNOME Kiosk to configure the keyboard layouts, which won't be available in other environments.

Until we find an API that works across DEs or we implement different backends, this PR can't be merged for Fedora.

@M4rtinK could correct me if I'm wrong. I've been working on Anaconda literally one month part time, he knows way better than me how the different images work.

Conan-Kudo · 2024-02-21T12:41:44Z

Yes, the keyboard layout thing is an issue. Most of the compositors support being live reconfigured through locale1, GNOME is the only exception at the moment.

Conan-Kudo · 2024-02-21T13:24:17Z

Could we put all the the GNOME Kiosk/Mutter stuff into its own class and make the display.py module a "simple" class like I did in #5401? I would like to be able to rebase #5401 for shipping with CentOS Hyperscale and a few other things, and I expect other distributions using Anaconda (such as ROSA et al) would like to be able to easily plug in alternative compositors (such as KWin or Cage).

M4rtinK · 2024-02-21T13:41:34Z

While I think that the xrandr change can be merged in Fedora -as it doesn't affect the live session and the Spins-, the change libxklavier removal would affect the spins.

Agreed, I think we can merge the xrandr change into Fedora, but I would like to do that to Rawhide, rather than piling more stuff on Fedora 40 by this point.

#5463 relies on GNOME Kiosk to configure the keyboard layouts, which won't be available in other environments.

Until we find an API that works across DEs or we implement different backends, this PR can't be merged for Fedora.

So with this change, we do cover the boot.iso/netinst images, as those always have GNOME Kiosk, but indeed the problem is with the spins. On the other hand I'm pretty sure we already can't change the keyboard in all the spins that switched to Wayland, but this would potentially also break all the other spins that still have Xorg & libXklavier still works.

I'm not saying we can totally avoid breaking at least some of the spins eventually, but I think this definitely needs to be a process that starts with an announcement & most likely a Fedora Change as well, to make it possible to the various Spin stakeholders to react if they have the capacity to do something about it.

Best options would be if at least the major spins adopted the localed keyboard API - IIRC KDE already does and possibly others ?

rvykydal

As far as I can tell, looks good to me. Thank you.

M4rtinK · 2024-04-26T09:19:13Z

/build-image --boot.iso

github-actions · 2024-04-26T09:33:47Z

Images built based on commit 528561f:

boot.iso: failure

Download the images from the bottom of the job status page.

M4rtinK · 2024-04-30T12:37:21Z

/kickstart-test --skip-testtypes knownfailure,manual,skip-on-rhel,skip-on-rhel-10,gh576,gh640,gh804,gh1090,gh1104,gh1106,gh1105,gh1108,gh1109,gh1107,gh1110

M4rtinK · 2024-05-03T08:39:50Z

/kickstart-test --skip-testtypes knownfailure,manual,skip-on-rhel,skip-on-rhel-10,gh576,gh640,gh804,gh1090,gh1104,gh1106,gh1105,gh1108,gh1109,gh1107,gh1110

jkonecny12 · 2024-05-23T11:39:06Z

Hi, there are two RHEL issues which should be mentioned in these commits before merging:

Adding blocker flag for this.

jexposit · 2024-05-23T13:21:47Z

@jkonecny12 I just added a "Resolves: RHEL-38399" tag to the right commit: 4788bb2

@M4rtinK would need to add a reference to RHEL-38407 in the RDP pull request.

jkonecny12

I have a few minor notes otherwise a great job done here! :)

Just a note. Please do not forget dropping the last commit before merge. I would keep the blocked label to make this visible.

jkonecny12 · 2024-05-23T11:50:10Z

pyanaconda/ui/gui/xkl_wrapper.py

        """

-        self._engine.lock_group(0)
+        layouts = self._keyboard_manager.GetCompositorLayouts()
+        if len(layouts) < 1:


This check could be

if not layouts:

jkonecny12 · 2024-05-23T11:52:20Z

pyanaconda/ui/gui/xkl_wrapper.py


-        self._rec.set_options(new_options)
+        layouts = self._keyboard_manager.GetCompositorLayouts()
+        if len(layouts) < 1:


The same here.

jkonecny12 · 2024-05-23T12:24:48Z

scripts/makeupdates

+def generate_dbus_code(srcdir):
+    os.system('gdbus-codegen '
+              '--interface-prefix org.fedoraproject.Anaconda.Modules. '
+              '--c-namespace An '
+              '--generate-c-code an-localization '
+              '--output-directory %s/widgets/src '
+              '%s/widgets/src/dbus/org.fedoraproject.Anaconda.Modules.Localization.xml'


I think this logic should be part of Makefile.am not makebumpver.

It is in the (widgets) makefile: https://github.com/rhinstaller/anaconda/pull/5485/files#diff-1f27decebb07d587ad45222e1df48fbb14aa33b42ff0f314f3f4abe4b3f02c55R138

This instance is just for convenience when generating updates images. IIRC we do something similar for other cases where we need to compile something before stuffing it into the updates image ?

jkonecny12 · 2024-05-23T12:27:20Z

widgets/src/LayoutIndicator.c

+                                                     const gchar *layout,
+                                                     AnacondaLayoutIndicator *self) {


Bad indentation.

M4rtinK · 2024-05-27T15:51:33Z

Rebased PR on latest versions of #5463 and #5470 & added correct Jira references. Also dropped python-pam from the temporary COPR repo, as it should be finally in the RHEL 10 repos.

M4rtinK · 2024-05-27T16:35:16Z

@jkonecny12 I just added a "Resolves: RHEL-38399" tag to the right commit: 4788bb2

@M4rtinK would need to add a reference to RHEL-38407 in the RDP pull request.

Thanks & will make sure the RDP PR also points to the right Jiras. :)

M4rtinK · 2024-05-28T15:52:17Z

/kickstart-test --testtype smoke

M4rtinK · 2024-05-29T11:15:00Z

/kickstart-test --skip-testtypes knownfailure,manual,skip-on-rhel,skip-on-rhel-10,gh576,gh640,gh804,gh1090,gh1104,gh1106,gh1105,gh1108,gh1109,gh1107,gh1110

Start GNOME Kiosk as a Wayland compositor and run Anaconda as a native Wayland client. This commit is a follow up on the work done by Neal Gompa [1], Martin Kolman and Ray Strode [2]. Credit goes to them for the code I copied and pasted. [1] rhinstaller#5401 [2] rhinstaller#5309 Co-authored-by: Neal Gompa <neal@gompa.dev> Co-authored-by: Martin Kolman <mkolman@redhat.com> Co-authored-by: Ray Strode <rstrode@redhat.com> Resolves: RHEL-38399

Resolves: RHEL-38399

M4rtinK · 2024-06-06T12:21:29Z

/kickstart-test --testtype smoke

jexposit added blocked Don't merge this pull request! rhel-10 labels Feb 21, 2024

jexposit requested review from M4rtinK and jkonecny12 February 21, 2024 10:47

jexposit temporarily deployed to gh-cockpituous February 21, 2024 10:47 — with GitHub Actions Inactive

github-actions bot added the f41 label Feb 21, 2024

jexposit force-pushed the xorg-server-removal branch from 7ccb461 to 3888b31 Compare February 21, 2024 10:56

jexposit temporarily deployed to gh-cockpituous February 21, 2024 10:57 — with GitHub Actions Inactive

Conan-Kudo suggested changes Feb 21, 2024

View reviewed changes

pyanaconda/core/constants.py Outdated Show resolved Hide resolved

jexposit force-pushed the xorg-server-removal branch from 3888b31 to 1ff8525 Compare February 21, 2024 11:05

jexposit temporarily deployed to gh-cockpituous February 21, 2024 11:05 — with GitHub Actions Inactive

jexposit force-pushed the xorg-server-removal branch from 1ff8525 to 01f49fc Compare February 21, 2024 11:14

jexposit temporarily deployed to gh-cockpituous February 21, 2024 11:14 — with GitHub Actions Inactive

jexposit force-pushed the xorg-server-removal branch from 01f49fc to c606672 Compare February 21, 2024 12:12

jexposit had a problem deploying to gh-cockpituous February 21, 2024 12:12 — with GitHub Actions Failure

jexposit force-pushed the xorg-server-removal branch from c606672 to 7d07509 Compare February 21, 2024 12:14

jexposit temporarily deployed to gh-cockpituous February 21, 2024 12:14 — with GitHub Actions Inactive

M4rtinK removed the f41 label Apr 10, 2024

M4rtinK force-pushed the xorg-server-removal branch from 599353f to 854f26c Compare April 15, 2024 13:21

rvykydal mentioned this pull request Apr 23, 2024

libxklavier removal #5463

Merged

rvykydal approved these changes Apr 23, 2024

View reviewed changes

M4rtinK force-pushed the xorg-server-removal branch from 854f26c to 528561f Compare April 26, 2024 09:18

M4rtinK force-pushed the xorg-server-removal branch from 528561f to c16a46a Compare April 30, 2024 12:37

M4rtinK mentioned this pull request May 16, 2024

Prepare kickstart tests to handle the switch from VNC to RDP rhinstaller/kickstart-tests#1175

Merged

jkonecny12 added the blocked Don't merge this pull request! label May 23, 2024

jexposit force-pushed the xorg-server-removal branch from c16a46a to 3d4051a Compare May 23, 2024 13:19

jkonecny12 approved these changes May 23, 2024

View reviewed changes

M4rtinK force-pushed the xorg-server-removal branch from 3d4051a to 0ead06c Compare May 27, 2024 15:49

M4rtinK force-pushed the xorg-server-removal branch 3 times, most recently from a782596 to c98f5af Compare May 28, 2024 15:41

jexposit and others added 2 commits June 6, 2024 14:20

Add unit tests for GkKeyboardManager and its API in localization module

27b097e

Resolves: RHEL-38399

M4rtinK force-pushed the xorg-server-removal branch from c98f5af to 27b097e Compare June 6, 2024 12:21

M4rtinK removed the blocked Don't merge this pull request! label Jun 6, 2024

M4rtinK merged commit a7fd670 into rhinstaller:rhel-10 Jun 6, 2024
12 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Xorg server removal #5485

Xorg server removal #5485

jexposit commented Feb 21, 2024

pep8speaks commented Feb 21, 2024 •

edited

Loading

Conan-Kudo commented Feb 21, 2024

Conan-Kudo commented Feb 21, 2024

Conan-Kudo commented Feb 21, 2024

jexposit commented Feb 21, 2024

jexposit commented Feb 21, 2024

github-actions bot commented Feb 21, 2024

Conan-Kudo commented Feb 21, 2024

M4rtinK commented Feb 21, 2024

jexposit commented Feb 21, 2024

Conan-Kudo commented Feb 21, 2024

Conan-Kudo commented Feb 21, 2024

M4rtinK commented Feb 21, 2024

rvykydal left a comment

M4rtinK commented Apr 26, 2024

github-actions bot commented Apr 26, 2024

M4rtinK commented Apr 30, 2024

M4rtinK commented May 3, 2024

jkonecny12 commented May 23, 2024 •

edited

Loading

jexposit commented May 23, 2024 •

edited

Loading

jkonecny12 left a comment

jkonecny12 May 23, 2024

M4rtinK May 27, 2024

jkonecny12 May 23, 2024

M4rtinK May 27, 2024

jkonecny12 May 23, 2024

M4rtinK May 27, 2024

jkonecny12 May 23, 2024

M4rtinK May 27, 2024

M4rtinK commented May 27, 2024

M4rtinK commented May 27, 2024

M4rtinK commented May 28, 2024

M4rtinK commented May 29, 2024

M4rtinK commented Jun 6, 2024

Xorg server removal #5485

Xorg server removal #5485

Conversation

jexposit commented Feb 21, 2024

pep8speaks commented Feb 21, 2024 • edited Loading

Comment last updated at 2024-06-06 12:21:12 UTC

Conan-Kudo commented Feb 21, 2024

Conan-Kudo commented Feb 21, 2024

Conan-Kudo commented Feb 21, 2024

jexposit commented Feb 21, 2024

jexposit commented Feb 21, 2024

github-actions bot commented Feb 21, 2024

Conan-Kudo commented Feb 21, 2024

M4rtinK commented Feb 21, 2024

jexposit commented Feb 21, 2024

Conan-Kudo commented Feb 21, 2024

Conan-Kudo commented Feb 21, 2024

M4rtinK commented Feb 21, 2024

rvykydal left a comment

Choose a reason for hiding this comment

M4rtinK commented Apr 26, 2024

github-actions bot commented Apr 26, 2024

M4rtinK commented Apr 30, 2024

M4rtinK commented May 3, 2024

jkonecny12 commented May 23, 2024 • edited Loading

jexposit commented May 23, 2024 • edited Loading

jkonecny12 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

M4rtinK commented May 27, 2024

M4rtinK commented May 27, 2024

M4rtinK commented May 28, 2024

M4rtinK commented May 29, 2024

M4rtinK commented Jun 6, 2024

pep8speaks commented Feb 21, 2024 •

edited

Loading

jkonecny12 commented May 23, 2024 •

edited

Loading

jexposit commented May 23, 2024 •

edited

Loading