From 0acd05423d0631827ce50ef21f0754246c406f0c Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Sat, 29 Feb 2020 15:26:21 -0300 Subject: [PATCH] package/openrc: remove keymaps units if kbd package is not selected keymaps and save-keymaps require kbd_mode and dumpkeys, respectively, so remove them if the kbd package is not selected (e.g. devices with serial console, only). Signed-off-by: Carlos Santos Tested-by: Adam Duskett [yann.morin.1998@free.fr: - expand to three commands to match the existing hook ] Signed-off-by: Yann E. MORIN --- package/openrc/openrc.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk index 289bde4d03..1f8516f5ee 100644 --- a/package/openrc/openrc.mk +++ b/package/openrc/openrc.mk @@ -39,6 +39,18 @@ define OPENRC_INSTALL_TARGET_CMDS $(TARGET_DIR)/etc/init.d/sysv-rcs endef +ifeq ($(BR2_PACKAGE_KBD),) +# keymaps and save-keymaps require kbd_mode and dumpkeys, respectively, so +# remove them if the kbd package is not selected (e.g. devices with serial +# console, only). +define OPENRC_NO_KBD + $(RM) $(TARGET_DIR)/etc/runlevels/boot/{keymaps,save-keymaps} + $(RM) $(TARGET_DIR)/etc/init.d/{keymaps,save-keymaps} + $(RM) $(TARGET_DIR)/etc/conf.d/keymaps +endef +OPENRC_POST_INSTALL_TARGET_HOOKS += OPENRC_NO_KBD +endif + ifeq ($(BR2_PACKAGE_NETIFRC),y) # netifrc replaces network, staticroute and loopback services which are # installed by openrc -- 2.30.2