| Message ID | 1417357142-14307-7-git-send-email-thomas.petazzoni@free-electrons.com |
|---|---|
| State | Accepted |
| Headers | show |
Thomas, All, On 2014-11-30 15:17 +0100, Thomas Petazzoni spake thusly: > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > --- > package/busybox/busybox.mk | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk > index f0fa851..eb2f3f1 100644 > --- a/package/busybox/busybox.mk > +++ b/package/busybox/busybox.mk > @@ -218,8 +218,11 @@ define BUSYBOX_INSTALL_TARGET_CMDS > $(INSTALL) -m 0755 -D package/busybox/udhcpc.script \ > $(TARGET_DIR)/usr/share/udhcpc/default.script; \ > fi > - $(BUSYBOX_INSTALL_MDEV_SCRIPT) > $(BUSYBOX_INSTALL_MDEV_CONF) > +endef > + > +define BUSYBOX_INSTALL_INIT_SYSV > + $(BUSYBOX_INSTALL_MDEV_SCRIPT) The installation of the script is stil conditional: define BUSYBOX_INSTALL_MDEV_SCRIPT [ -f $(TARGET_DIR)/etc/init.d/S10mdev ] || \ $(INSTALL) -D -m 0755 package/busybox/S10mdev \ $(TARGET_DIR)/etc/init.d/S10mdev endef So maybe this could be fixed at the same time, like you did in the previous patches? Also, what would be the reason for installing the mdev configuration out-side the _INIT_SYSV hook? It can be a separate macro, sure, for the day we have systemd support for mdev, but then we can just duplicate the call to that macro in the _INIT_SYSTEMD hook. And BTW, the installation of the mdev configuration is also still conditional. Regards, Yann E. MORIN. > $(BUSYBOX_INSTALL_LOGGING_SCRIPT) > $(BUSYBOX_INSTALL_WATCHDOG_SCRIPT) > endef > -- > 2.1.0 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
Thomas, All, On 2014-11-30 15:55 +0100, Yann E. MORIN spake thusly: > On 2014-11-30 15:17 +0100, Thomas Petazzoni spake thusly: > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > > --- > > package/busybox/busybox.mk | 5 ++++- > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk > > index f0fa851..eb2f3f1 100644 > > --- a/package/busybox/busybox.mk > > +++ b/package/busybox/busybox.mk > > @@ -218,8 +218,11 @@ define BUSYBOX_INSTALL_TARGET_CMDS > > $(INSTALL) -m 0755 -D package/busybox/udhcpc.script \ > > $(TARGET_DIR)/usr/share/udhcpc/default.script; \ > > fi > > - $(BUSYBOX_INSTALL_MDEV_SCRIPT) > > $(BUSYBOX_INSTALL_MDEV_CONF) > > +endef > > + > > +define BUSYBOX_INSTALL_INIT_SYSV > > + $(BUSYBOX_INSTALL_MDEV_SCRIPT) > > The installation of the script is stil conditional: [--SNIP--] OK, I saw you added a fix for that latter in the series. So: Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Regards, Yann E. MORIN.
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Committed, thanks.
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index f0fa851..eb2f3f1 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -218,8 +218,11 @@ define BUSYBOX_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D package/busybox/udhcpc.script \ $(TARGET_DIR)/usr/share/udhcpc/default.script; \ fi - $(BUSYBOX_INSTALL_MDEV_SCRIPT) $(BUSYBOX_INSTALL_MDEV_CONF) +endef + +define BUSYBOX_INSTALL_INIT_SYSV + $(BUSYBOX_INSTALL_MDEV_SCRIPT) $(BUSYBOX_INSTALL_LOGGING_SCRIPT) $(BUSYBOX_INSTALL_WATCHDOG_SCRIPT) endef
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/busybox/busybox.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)