From 98ac13b656daaefb7b799ef2dea0785bb1bb24b87d728b2c4de593ac4232f29b Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 13 Oct 2023 11:28:05 +0000 Subject: [PATCH] - Don't include entries listed in kbd-model-map.xkb-generated (provided by kbd package) in kbd-model-map anymore. Yast, the only user of these entries, directly parses kbd-model-map.xkb-generated now (bsc#1211104). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1461 --- systemd.changes | 7 +++++++ systemd.spec | 13 ------------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/systemd.changes b/systemd.changes index 8b708544..a2f69f8e 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Oct 13 09:38:37 UTC 2023 - Franck Bui + +- Don't include entries listed in kbd-model-map.xkb-generated (provided by kbd + package) in kbd-model-map anymore. Yast, the only user of these entries, + directly parses kbd-model-map.xkb-generated now (bsc#1211104). + ------------------------------------------------------------------- Fri Oct 13 09:28:23 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index c1690bcb..2fc49453 100644 --- a/systemd.spec +++ b/systemd.spec @@ -76,7 +76,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bpftool BuildRequires: clang BuildRequires: docbook-xsl-stylesheets -BuildRequires: kbd %if %{with apparmor} BuildRequires: libapparmor-devel %endif @@ -955,18 +954,6 @@ install -m 644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/systemd-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