godotengine/buildroot
1
0
Fork 0
mirror of https://github.com/godotengine/buildroot.git synced 2026-01-05 14:09:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

package/systemd: handle vconsole w/ keymap support

Browse Source 
systemd v254 provide a new option "default-keymap" to handle vconsole
with keymap support [1]. With this change systemd now use the "us"
keymap by default and requires keytable files and keyboard utilities
from kbd package.

The keymap support can still be disabled using -Ddefault-keymap=""
at build time.

Handle the vconsole w/ keymap support and allow to use another
keymap than "us" by default.

Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/4768561206 (TestInitSystemSystemdRwNetworkd)
https://gitlab.com/buildroot.org/buildroot/-/jobs/4768561203 (TestInitSystemSystemdRwIfupdownDbusbrokerDbus)
https://gitlab.com/buildroot.org/buildroot/-/jobs/4768561202 (TestInitSystemSystemdRwIfupdownDbusbroker)
https://gitlab.com/buildroot.org/buildroot/-/jobs/4768561201 (TestInitSystemSystemdRwIfupdown)
https://gitlab.com/buildroot.org/buildroot/-/jobs/4768561199 (TestInitSystemSystemdRwFull)
https://gitlab.com/buildroot.org/buildroot/-/jobs/4768561197 (TestInitSystemSystemdRoNetworkd)
https://gitlab.com/buildroot.org/buildroot/-/jobs/4768561194 (TestInitSystemSystemdRoIfupdownDbusbrokerDbus)
https://gitlab.com/buildroot.org/buildroot/-/jobs/4768561190 (TestInitSystemSystemdRoIfupdownDbusbroker)
https://gitlab.com/buildroot.org/buildroot/-/jobs/4768561189 (TestInitSystemSystemdRoIfupdown)
https://gitlab.com/buildroot.org/buildroot/-/jobs/4768561186 (TestInitSystemSystemdRoFull)

[1] https://github.com/systemd/systemd/releases/tag/v254
[2] 1cd4211068

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: James Hilliard <james.hilliard1@gmail.com>
[yann.morin.1998@free.fr: don't introduce inter;ediate boolean option]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Romain Naour
2023-08-02 14:02:01 +02:00
committed by Yann E. MORIN
parent 59ddc3a987
commit 3ceb8c97bc
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
package/systemd/Config.in
View File

@@ -563,10 +563,19 @@ config BR2_PACKAGE_SYSTEMD_UTMP
config BR2_PACKAGE_SYSTEMD_VCONSOLE config BR2_PACKAGE_SYSTEMD_VCONSOLE
bool "enable vconsole tool" bool "enable vconsole tool"
default y default y
select BR2_PACKAGE_KBD if BR2_PACKAGE_SYSTEMD_VCONSOLE_DEFAULT_KEYMAP != ""
help help
systemd-vconsole-setup is an early boot service that systemd-vconsole-setup is an early boot service that
configures the virtual console font and console keymap. configures the virtual console font and console keymap.
https://www.freedesktop.org/software/systemd/man/systemd-vconsole-setup.service.html https://www.freedesktop.org/software/systemd/man/systemd-vconsole-setup.service.html
config BR2_PACKAGE_SYSTEMD_VCONSOLE_DEFAULT_KEYMAP
string "default keymap"
default "us"
depends on BR2_PACKAGE_SYSTEMD_VCONSOLE
help
Default keymap for the system. Leave empty to not set a
default keymap.
endif endif

4
package/systemd/systemd.mk
View File

@@ -348,7 +348,9 @@ SYSTEMD_CONF_OPTS += -Dutmp=false
endif endif
ifeq ($(BR2_PACKAGE_SYSTEMD_VCONSOLE),y) ifeq ($(BR2_PACKAGE_SYSTEMD_VCONSOLE),y)
SYSTEMD_CONF_OPTS += -Dvconsole=true SYSTEMD_CONF_OPTS += \
-Dvconsole=true \
-Ddefault-keymap=$(call qstrip,$(BR2_PACKAGE_SYSTEMD_VCONSOLE_DEFAULT_KEYMAP))
else else
SYSTEMD_CONF_OPTS += -Dvconsole=false SYSTEMD_CONF_OPTS += -Dvconsole=false
endif endif