| Message ID | 20200229182621.14431-1-unixmania@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | package/openrc: remove keymaps units if kbd package is not selected | expand |
All; On Sat, Feb 29, 2020 at 10:26 AM <unixmania@gmail.com> wrote: > > From: Carlos Santos <unixmania@gmail.com> > > 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 <unixmania@gmail.com> > --- > package/openrc/openrc.mk | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk > index 289bde4d03..dd56d72a1a 100644 > --- a/package/openrc/openrc.mk > +++ b/package/openrc/openrc.mk > @@ -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. > +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 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot Tested-by: Adam Duskett <aduskett@gmail.com>
Carlos, All, On 2020-02-29 15:26 -0300, unixmania@gmail.com spake thusly: > From: Carlos Santos <unixmania@gmail.com> > > 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 <unixmania@gmail.com> 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. > --- > package/openrc/openrc.mk | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk > index 289bde4d03..dd56d72a1a 100644 > --- a/package/openrc/openrc.mk > +++ b/package/openrc/openrc.mk > @@ -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 > -- > 2.18.2 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes: > Carlos, All, > On 2020-02-29 15:26 -0300, unixmania@gmail.com spake thusly: >> From: Carlos Santos <unixmania@gmail.com> >> >> 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 <unixmania@gmail.com> > 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.
diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk index 289bde4d03..dd56d72a1a 100644 --- a/package/openrc/openrc.mk +++ b/package/openrc/openrc.mk @@ -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