| Message ID | 20191219190135.7013-1-aduskett@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/openrc: install sysv-rcs file | expand |
On Thu, 19 Dec 2019 11:01:35 -0800 aduskett@gmail.com wrote: > From: Adam Duskett <aduskett@greenlots.com> > > package/openrc has the file sysv-rcs which starts sysvinit services > not written for openrc. However, currently it is not installed to > the target. > > Install this file to $(TARGET_DIR)/etc/init.d during the > target_install step. > > Signed-off-by: Adam Duskett <aduskett@greenlots.com> Michal had what seems like a more elaborate solution: http://patchwork.ozlabs.org/patch/1098590/ Michal, could you comment ? Thanks! Thomas
Thomas, Adam, All, On 2019-12-19 21:44 +0100, Thomas Petazzoni spake thusly: > On Thu, 19 Dec 2019 11:01:35 -0800 > aduskett@gmail.com wrote: > > > From: Adam Duskett <aduskett@greenlots.com> > > > > package/openrc has the file sysv-rcs which starts sysvinit services > > not written for openrc. However, currently it is not installed to > > the target. > > > > Install this file to $(TARGET_DIR)/etc/init.d during the > > target_install step. > > > > Signed-off-by: Adam Duskett <aduskett@greenlots.com> > > Michal had what seems like a more elaborate solution: > > http://patchwork.ozlabs.org/patch/1098590/ > > Michal, could you comment ? We already have 162044407b (package/skeleton-init-openrc: add support for starting sysv scripts) which was edited by me, but I missed the fact that the script was not installed. Adam, care to investigate what is different between our script, and the one from the package itself? I am all in favour of dropping our script, if upstream has a functional one. Regards, Yann E. MORIN.
Adam, All, On 2019-12-19 21:50 +0100, Yann E. MORIN spake thusly: > On 2019-12-19 21:44 +0100, Thomas Petazzoni spake thusly: > > On Thu, 19 Dec 2019 11:01:35 -0800 > > aduskett@gmail.com wrote: > > > > > From: Adam Duskett <aduskett@greenlots.com> > > > > > > package/openrc has the file sysv-rcs which starts sysvinit services > > > not written for openrc. However, currently it is not installed to > > > the target. > > > > > > Install this file to $(TARGET_DIR)/etc/init.d during the > > > target_install step. > > > > > > Signed-off-by: Adam Duskett <aduskett@greenlots.com> > > Michal had what seems like a more elaborate solution: > > http://patchwork.ozlabs.org/patch/1098590/ > We already have 162044407b (package/skeleton-init-openrc: add support > for starting sysv scripts) which was edited by me, but I missed the fact > that the script was not installed. > > Adam, care to investigate what is different between our script, and the > one from the package itself? > > I am all in favour of dropping our script, if upstream has a functional > one. In fact, upstream does not have such a script. It is just that we forgot to install our own script. Applied to master, changed the destination to a full path, and not just the directory, and pushed. Thanks. Regards, Yann E. MORIN.
>>>>> "aduskett" == aduskett <aduskett@gmail.com> writes: > From: Adam Duskett <aduskett@greenlots.com> > package/openrc has the file sysv-rcs which starts sysvinit services > not written for openrc. However, currently it is not installed to > the target. > Install this file to $(TARGET_DIR)/etc/init.d during the > target_install step. > Signed-off-by: Adam Duskett <aduskett@greenlots.com> Committed to 2019.11.x, thanks.
diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk index 387962d4d5..c7c8b0461a 100644 --- a/package/openrc/openrc.mk +++ b/package/openrc/openrc.mk @@ -35,6 +35,8 @@ endef define OPENRC_INSTALL_TARGET_CMDS $(MAKE) $(OPENRC_MAKE_OPTS) DESTDIR=$(TARGET_DIR) -C $(@D) install + $(INSTALL) -D -m 0755 $(OPENRC_PKGDIR)/sysv-rcs \ + $(TARGET_DIR)/etc/init.d/ endef ifeq ($(BR2_PACKAGE_NETIFRC),y)