Bug 1950406

The problem happens when keymaps are generated from xkb layouts:
/usr/bin/ckbcomp: Can not find file "rules/xorg" in any known directory

This file is expected to be present in xkeyboard-config BuildRequire:

$ rpm -ql xkeyboard-config | grep rules/xorg
/usr/share/X11/xkb/rules/xorg

But this is not true with the package used during the build:
$ rpm -qlp xkeyboard-config-2.32-1.el9.noarch.rpm | grep rules/xorg
$

It seems that it has been deliberately dropped from the package (adding maintainer to CC):
- drop the xorg ruleset, no longer in use. Everything is hardcoded to evdev
  these days.

Thanks for the CC and apologies for the breakage. I guess 15 years wasn't enough for people to drop the legacy symlinks :)

xkeyboard-config is now fixed in rawhide + F34 (after updates are through) and that'll trickle into Centos Stream once I figure out the process.
For F35 and beyond we should fix console-setup, see Bug 1951453, and identify any other potential users.

Vitezslav, do we need rebuilds for kbd or console-setup after the xkeyboard-config change?

(In reply to Peter Hutterer from comment #2)
> Thanks for the CC and apologies for the breakage. I guess 15 years wasn't
> enough for people to drop the legacy symlinks :)
> 
> xkeyboard-config is now fixed in rawhide + F34 (after updates are through)
> and that'll trickle into Centos Stream once I figure out the process.
> For F35 and beyond we should fix console-setup, see Bug 1951453, and
> identify any other potential users.

Thank you Peter for investigating the issue and opening #1951453.
I agree that it needs to be fixed in console-setup in the end.

> 
> Vitezslav, do we need rebuilds for kbd or console-setup after the
> xkeyboard-config change?

No need to rebuild console-setup, but we will need to rebuild kbd with
new xkeyboard-config once you update it in CentOS Stream.

Vitezlsav: I've had another look at kbd.spec and, ignoring the console-setup and xkeyboard-config changes we can fix kbd with this diff:

diff --git a/kbd.spec b/kbd.spec
index 3abd4e5..f94dfd2 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -146,13 +146,13 @@ while read line; do
   XKBLAYOUT=`echo "$line" | cut -d " " -f 1`
   echo "$XKBLAYOUT" >> layouts-list.lst
   XKBVARIANT=`echo "$line" | cut -d " " -f 2`
-  ckbcomp "$XKBLAYOUT" "$XKBVARIANT" | gzip > $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/"$XKBLAYOUT"-"$XKBVARIANT".map.gz
+  ckbcomp -rules base "$XKBLAYOUT" "$XKBVARIANT" | gzip > $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/"$XKBLAYOUT"-"$XKBVARIANT".map.gz
 done < layouts-variants.lst
 
 # Convert X keyboard layouts (plain, no variant)
 cat layouts-list.lst | sort -u >> layouts-list-uniq.lst
 while read line; do
-  ckbcomp "$line" | gzip > $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/"$line".map.gz
+  ckbcomp -rules base "$line" | gzip > $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/"$line".map.gz
 done < layouts-list-uniq.lst
 
 # wipe converted layouts which cannot input ASCII (#1031848)
---

This makes the package independent of the other package changes and corrects its behaviour. The ckbcomp code for rules handling is just `$rules = 'base' if (! $rules);` (that's the fixed version, previously it was 'xorg') so simply supplying the rules ourselves means we can fix this here without depending on other package updates. Do you agree? AFAICT there is no other xorg dependency in this package.

I can push that change out if you don't beat me to it.

(In reply to Peter Hutterer from comment #4)

> This makes the package independent of the other package changes and corrects
> its behaviour. The ckbcomp code for rules handling is just `$rules = 'base'
> if (! $rules);` (that's the fixed version, previously it was 'xorg') so
> simply supplying the rules ourselves means we can fix this here without
> depending on other package updates. Do you agree? AFAICT there is no other
> xorg dependency in this package.

Yes, I agree, it looks good. Right, there's no other xorg dependency. Thanks!

> I can push that change out if you don't beat me to it.

Actually, on second thought - I'm going to leave the Fedora (and RHEL) package updates to you, you know better how to test all this :)

PR done, stuck on failing pipeline:
https://gitlab.com/redhat/centos-stream/rpms/kbd/-/merge_requests/1