package/openrc: remove keymaps units if kbd package is not selected
PATCH 1/1 package/openrc: remove keymaps units if kbd package is not selected
From: Carlos Santos <[email protected]>
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).
--- package/openrc/openrc.mk | 10 ++++++++++ 1 file changed, 10 insertions(+)
package/openrc/openrc.mk +10 -0
@@ -39,6 +39,16 @@ 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/{conf.d,init.d,runlevels/boot}/{keymaps,save-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
Signature · 1 line
2.18.2
PATCH 1/1 package/openrc: remove keymaps units if kbd package is not selected
All;
Quoted 17 lines · On Sat, Feb 29, 2020 at 10:26 AM <[email protected]> wrote:
From: Carlos Santos <[email protected]>
keymaps and save-keymaps require
kbd_modeand dumpkeys, respectively, so remove them if the kbd package is not selected (e.g. devices with serial console, only).Signed-off-by Carlos Santos <[email protected]>--- package/openrc/openrc.mk | 10 ++++++++++ 1 file changed, 10 insertions(+)package/openrc/openrc.mk +0
-0
package/openrc/openrc.mk define OPENRC_INSTALL_TARGET_CMDS · line 45
Quoted 7 lines
package/openrc/openrc.mk +4
-0@@ -39,6 +39,16 @@ 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).
Small nitpick: I think generally the comment would go above the ifeq.
Quoted 12 lines
package/openrc/openrc.mk +6
-1+define OPENRC_NO_KBD + $(RM) $(TARGET_DIR)/etc/{conf.d,init.d,runlevels/boot}/{keymaps,save-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.18.2
Quoted 4 lines
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Yann E. MORIN
AppliedPATCH 1/1 package/openrc: remove keymaps units if kbd package is not selected
In reply to unixmania at gmail.comCarlos, All,
On 2020-02-29 15:26 -0300, unixmania at gmail.com spake thusly:
Quoted 7 lines
From: Carlos Santos <[email protected]>
keymaps and save-keymaps require
kbd_modeand dumpkeys, respectively, so remove them if the kbd package is not selected (e.g. devices with serial console, only).Signed-off-by Carlos Santos <[email protected]>
Applied to master with a small fix:
- expand to three commands to match the existing hook
As Adam noted, I also prefer the comment to be outside the conditional block, but that is not a set-in-stone rule. Given that the existing hook had the comment in the conditional block, I kept the new one there too.
Thanks!
Regards,
Yann E. MORIN.
Quoted 32 lines
--- package/openrc/openrc.mk | 10 ++++++++++ 1 file changed, 10 insertions(+)package/openrc/openrc.mk +10
-0@@ -39,6 +39,16 @@ 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/{conf.d,init.d,runlevels/boot}/{keymaps,save-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 openrcSignature · 6 lines
2.18.2 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 package/openrc: remove keymaps units if kbd package is not selected
Quoted 12 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
Carlos, All,
On 2020-02-29 15:26 -0300, unixmania at gmail.com spake thusly:Quoted 7 lines
From: Carlos Santos <[email protected]>
keymaps and save-keymaps require
kbd_modeand dumpkeys, respectively, so remove them if the kbd package is not selected (e.g. devices with serial console, only).Signed-off-by Carlos Santos <[email protected]>
Quoted 7 lines
Applied to master with a small fix:
- expand to three commands to match the existing hook
As Adam noted, I also prefer the comment to be outside the conditional block, but that is not a set-in-stone rule. Given that the existing hook had the comment in the conditional block, I kept the new one there too.
Committed to 2019.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard