Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the locale1-x11-sync script to the anaconda-live subpackage (#2346855) #6202

Open
wants to merge 1 commit into
base: fedora-42
Choose a base branch
from

Conversation

M4rtinK
Copy link
Contributor

@M4rtinK M4rtinK commented Feb 24, 2025

This script installed to the libexec folder and the systemd unit triggering it are needed for controlling X11 system keyboard layouts using the systemd-localed DBus API.

Without the script and the systemd unit keyboard switching will not work on X11 Fedora Live spins.

Both might end up in a separate package eventually but for now it should be enough to ship them as part of the anaconda-live package.

(cherry picked from commit a8c0035)

Resolves: rhbz#2346855

Fedora 42 port of #6149.

…6855)

This script installed to the libexec folder and the systemd unit triggering it
are needed for controlling X11 system keyboard layouts using the systemd-localed DBus API.

Without the script and the systemd unit keyboard switching will not work on X11 Fedora Live spins.

Both might end up in a separate package eventually but for now it should
be enough to ship them as part of the anaconda-live package.

(cherry picked from commit a8c0035)

Resolves: rhbz#2346855
@M4rtinK M4rtinK added the f42 Fedora 42 label Feb 24, 2025
@M4rtinK
Copy link
Contributor Author

M4rtinK commented Feb 24, 2025

/kickstart-test --testtype smoke

Copy link
Member

@jkonecny12 jkonecny12 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. Thanks a lot!

Comment on lines +185 to +189
# FIXME: This is currently needed by the locale1-x11-sync script.
# It makes little sense for Anaconda to pull in two Python DBus libraries,
# so we should either split the script to a separate or change it to also
# use dasbus like the rest of Anaconda.
Requires: python3-dbus-next
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe split it as a subpackage in this specfile, that way it's easy to move to an independent package later.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is a good point.

If we go this way, we would have to do a side tag build between kiwi/fedora-kickstarts and anaconda or we would have to remove it first from Anaconda which would break stuff. Is there a better way?

On the other hand if this will be a new subpackage then we can exclude this sub-package in kiwi/fedora-kickstarts with the same change-set as adding a new one. However, I wonder how to reasonably include as dependency of anaconda-live, did the weak deps works as expected? I know lorax ignores weak deps but live is build with Anaconda so it might be fine?

Any recommendation how to handle the switch @Conan-Kudo?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do it as a subpackage, weak deps are honored in both kiwi and lorax.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This new subpackage would have Supplements: (xorg-x11-server-Xorg and livesys-scripts) and would be automatically pulled in accordingly.

Copy link
Member

@jkonecny12 jkonecny12 Feb 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm pretty sure that Lorax ignores weak deps, but not for Live because there is Anaconda who installs those packages.

Anyway, we can move it is separate sub-package later. That should be easy operation and currently we have our hands full. Let's go with this version and we can fine-tune it later.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But we don't use non-live lorax for X11 environments, so it's not an issue.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
f42 Fedora 42
Development

Successfully merging this pull request may close these issues.

3 participants