rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

- Don't include entries listed in kbd-model-map.xkb-generated (provided by kbd

Browse Source 
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
This commit is contained in:
Franck Bui 2023-10-13 11:28:05 +00:00 committed by Git OBS Bridge
parent b4278439c5
commit 98ac13b656
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
systemd.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Oct 13 09:38:37 UTC 2023 - Franck Bui <fbui@suse.com>
- 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 <fbui@suse.com> Fri Oct 13 09:28:23 UTC 2023 - Franck Bui <fbui@suse.com>

13
systemd.spec
View File

@ -76,7 +76,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bpftool BuildRequires: bpftool
BuildRequires: clang BuildRequires: clang
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: kbd
%if %{with apparmor} %if %{with apparmor}
BuildRequires: libapparmor-devel BuildRequires: libapparmor-devel
%endif %endif
@ -955,18 +954,6 @@ install -m 644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/systemd-suse.conf
# consume those configs (like glibc or pam), see bsc#1170146. # consume those configs (like glibc or pam), see bsc#1170146.
rm -fr %{buildroot}%{_datadir}/factory/* 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 # kbd-model-map.legacy is used to provide mapping for legacy keymaps, which may
# still be used by yast. # still be used by yast.
cat %{SOURCE14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map cat %{SOURCE14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map