From 48d1d3188b0250ac8a48c2fdb3696e47fa8a02f5eb18e6b8e90d83676e190667 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 5 May 2023 13:08:35 +0000 Subject: [PATCH] Revert commit r1382 temporarily until bsc#1211104 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1387 --- systemd.changes | 4 ---- systemd.spec | 12 ++++++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/systemd.changes b/systemd.changes index 942dbe2b..7818ebfa 100644 --- a/systemd.changes +++ b/systemd.changes @@ -42,10 +42,6 @@ Wed May 3 06:20:28 UTC 2023 - Franck Bui e8cf56459b localed-util: make use of strdupcspn() 821c684440 test: use kbd-mode-map we ship in TEST-73-LOCALE -- Mapping for converted keymaps is not needed anymore since their conversion to - their x11 layout counterpart is now done automatically by localed (commit - f08017efd5). - ------------------------------------------------------------------- Tue May 2 10:34:43 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index b0267ef6..e744c648 100644 --- a/systemd.spec +++ b/systemd.spec @@ -922,6 +922,18 @@ install -m 644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/suse.conf # consume those configs (like glibc or pam), see bsc#1170146. rm -fr %{buildroot}%{_datadir}/factory/* +# Add entries for xkeyboard-config converted keymaps; mappings, which already +# exist in original systemd mapping table are being ignored though, i.e. not +# overwritten; needed as long as YaST uses console keymaps internally and calls +# localectl to convert from vconsole to X11 keymaps. Ideally YaST should switch +# to X11 layout names (the mapping table wouldn't be needed since each X11 +# keymap has a generated xkbd keymap) and let localectl initialize +# /etc/vconsole.conf and /etc/X11/xorg.conf.d/00-keyboard.conf (FATE#319454). +if [ -f /usr/share/systemd/kbd-model-map.xkb-generated ]; then + cat /usr/share/systemd/kbd-model-map.xkb-generated \ + >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map +fi + # kbd-model-map.legacy is used to provide mapping for legacy keymaps, which may # still be used by yast. cat %{SOURCE14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map