From 3ceb8c97bcb6753740fa27a58b8e0dc00dbbbd19 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 2 Aug 2023 14:02:01 +0200 Subject: [PATCH] package/systemd: handle vconsole w/ keymap support 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] https://github.com/systemd/systemd-stable/commit/1cd421106893c5126e33e211cf6634e9167d1762 Signed-off-by: Romain Naour Cc: James Hilliard [yann.morin.1998@free.fr: don't introduce inter;ediate boolean option] Signed-off-by: Yann E. MORIN --- package/systemd/Config.in | 9 +++++++++ package/systemd/systemd.mk | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index bea717a456..89ce62d1d2 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -563,10 +563,19 @@ config BR2_PACKAGE_SYSTEMD_UTMP config BR2_PACKAGE_SYSTEMD_VCONSOLE bool "enable vconsole tool" default y + select BR2_PACKAGE_KBD if BR2_PACKAGE_SYSTEMD_VCONSOLE_DEFAULT_KEYMAP != "" help systemd-vconsole-setup is an early boot service that configures the virtual console font and console keymap. 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 diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 0aa1da3fb8..3ce0634594 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -348,7 +348,9 @@ SYSTEMD_CONF_OPTS += -Dutmp=false endif 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 SYSTEMD_CONF_OPTS += -Dvconsole=false endif