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

Revert commit r1382 temporarily until bsc#1211104

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1387
This commit is contained in:
Franck Bui 2023-05-05 13:08:35 +00:00 committed by Git OBS Bridge
parent 8fe8943179
commit 48d1d3188b
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
systemd.changes
View File

@ -42,10 +42,6 @@ Wed May 3 06:20:28 UTC 2023 - Franck Bui <fbui@suse.com>
e8cf56459b localed-util: make use of strdupcspn() e8cf56459b localed-util: make use of strdupcspn()
821c684440 test: use kbd-mode-map we ship in TEST-73-LOCALE 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 <fbui@suse.com> Tue May 2 10:34:43 UTC 2023 - Franck Bui <fbui@suse.com>

12
systemd.spec
View File

@ -922,6 +922,18 @@ install -m 644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/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