Message ID | 1417357142-14307-21-git-send-email-thomas.petazzoni@free-electrons.com |
---|---|
State | Accepted |
Headers | show |
Thomas, All, On 2014-11-30 15:18 +0100, Thomas Petazzoni spake thusly: > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Regards, Yann E. MORIN. > --- > package/olsr/olsr.mk | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/package/olsr/olsr.mk b/package/olsr/olsr.mk > index 1051d18..539386d 100644 > --- a/package/olsr/olsr.mk > +++ b/package/olsr/olsr.mk > @@ -31,9 +31,12 @@ define OLSR_INSTALL_TARGET_CMDS > LDCONFIG=/bin/true DESTDIR=$(TARGET_DIR) \ > prefix="/usr" install ; \ > done > - $(INSTALL) -D -m 0755 package/olsr/S50olsr $(TARGET_DIR)/etc/init.d/S50olsr > test -r $(TARGET_DIR)/etc/olsrd.conf || \ > $(INSTALL) -D -m 0644 $(@D)/files/olsrd.conf.default.lq $(TARGET_DIR)/etc/olsrd.conf > endef > > +define OLSR_INSTALL_INIT_SYSV > + $(INSTALL) -D -m 0755 package/olsr/S50olsr $(TARGET_DIR)/etc/init.d/S50olsr > +endef > + > $(eval $(generic-package)) > -- > 2.1.0 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
>>>>> "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/olsr/olsr.mk b/package/olsr/olsr.mk index 1051d18..539386d 100644 --- a/package/olsr/olsr.mk +++ b/package/olsr/olsr.mk @@ -31,9 +31,12 @@ define OLSR_INSTALL_TARGET_CMDS LDCONFIG=/bin/true DESTDIR=$(TARGET_DIR) \ prefix="/usr" install ; \ done - $(INSTALL) -D -m 0755 package/olsr/S50olsr $(TARGET_DIR)/etc/init.d/S50olsr test -r $(TARGET_DIR)/etc/olsrd.conf || \ $(INSTALL) -D -m 0644 $(@D)/files/olsrd.conf.default.lq $(TARGET_DIR)/etc/olsrd.conf endef +define OLSR_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/olsr/S50olsr $(TARGET_DIR)/etc/init.d/S50olsr +endef + $(eval $(generic-package))
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/olsr/olsr.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)