| Message ID | 1417125452-18705-20-git-send-email-thomas.petazzoni@free-electrons.com |
|---|---|
| State | Accepted |
| Commit | cbacf1cf2af80960484aead4ae6b012301be6a6e |
| Headers | show |
Hi Thomas, On Thu, Nov 27, 2014 at 10:56:37PM +0100, Thomas Petazzoni wrote: > Also makes the installation init script unconditional. Same here. baruch > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > --- > package/gpsd/gpsd.mk | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk > index 7dc27e8..5092b38 100644 > --- a/package/gpsd/gpsd.mk > +++ b/package/gpsd/gpsd.mk > @@ -206,10 +206,11 @@ define GPSD_INSTALL_TARGET_CMDS > $(SCONS) \ > $(GPSD_SCONS_OPTS) \ > install) > - if [ ! -f $(TARGET_DIR)/etc/init.d/S50gpsd ]; then \ > - $(INSTALL) -m 0755 -D package/gpsd/S50gpsd $(TARGET_DIR)/etc/init.d/S50gpsd; \ > - $(SED) 's,^DEVICES=.*,DEVICES=$(BR2_PACKAGE_GPSD_DEVICES),' $(TARGET_DIR)/etc/init.d/S50gpsd; \ > - fi > +endef > + > +define GPSD_INSTALL_INIT_SYSV > + $(INSTALL) -m 0755 -D package/gpsd/S50gpsd $(TARGET_DIR)/etc/init.d/S50gpsd > + $(SED) 's,^DEVICES=.*,DEVICES=$(BR2_PACKAGE_GPSD_DEVICES),' $(TARGET_DIR)/etc/init.d/S50gpsd > endef > > define GPSD_INSTALL_STAGING_CMDS
diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 7dc27e8..5092b38 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -206,10 +206,11 @@ define GPSD_INSTALL_TARGET_CMDS $(SCONS) \ $(GPSD_SCONS_OPTS) \ install) - if [ ! -f $(TARGET_DIR)/etc/init.d/S50gpsd ]; then \ - $(INSTALL) -m 0755 -D package/gpsd/S50gpsd $(TARGET_DIR)/etc/init.d/S50gpsd; \ - $(SED) 's,^DEVICES=.*,DEVICES=$(BR2_PACKAGE_GPSD_DEVICES),' $(TARGET_DIR)/etc/init.d/S50gpsd; \ - fi +endef + +define GPSD_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D package/gpsd/S50gpsd $(TARGET_DIR)/etc/init.d/S50gpsd + $(SED) 's,^DEVICES=.*,DEVICES=$(BR2_PACKAGE_GPSD_DEVICES),' $(TARGET_DIR)/etc/init.d/S50gpsd endef define GPSD_INSTALL_STAGING_CMDS
Also makes the installation init script unconditional. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/gpsd/gpsd.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)