| Message ID | 1421753394-32029-1-git-send-email-richard.genoud@gmail.com |
|---|---|
| State | Rejected |
| Headers | show |
Dear Richard Genoud, On Tue, 20 Jan 2015 12:29:53 +0100, Richard Genoud wrote: > That way, we can use a different start script in a custom skeleton. > > Signed-off-by: Richard Genoud <richard.genoud@gmail.com> > --- > package/dropbear/dropbear.mk | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) Sorry, but we precisely recently removed such conditions, because they are not needed. Don't use a custom skeleton, instead use a post-build script or a rootfs overlay. With both of those methods, your custom init script will take precedence over the one installed by Buildroot. Thanks, Thomas
2015-01-20 17:22 GMT+01:00 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>: > Dear Richard Genoud, > > On Tue, 20 Jan 2015 12:29:53 +0100, Richard Genoud wrote: >> That way, we can use a different start script in a custom skeleton. >> >> Signed-off-by: Richard Genoud <richard.genoud@gmail.com> >> --- >> package/dropbear/dropbear.mk | 5 +++-- >> 1 file changed, 3 insertions(+), 2 deletions(-) > > Sorry, but we precisely recently removed such conditions, because they > are not needed. > > Don't use a custom skeleton, instead use a post-build script or a > rootfs overlay. With both of those methods, your custom init script > will take precedence over the one installed by Buildroot. Ok, I'll look into the rootfs overlay. Thanks !
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 696095dc4f40..ab2456dae0bd 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -54,8 +54,9 @@ endef ifeq ($(BR2_USE_MMU),y) define DROPBEAR_INSTALL_INIT_SYSV - $(INSTALL) -D -m 755 package/dropbear/S50dropbear \ - $(TARGET_DIR)/etc/init.d/S50dropbear + [ -f $(TARGET_DIR)/etc/init.d/S50dropbear ] || \ + $(INSTALL) -D -m 755 package/dropbear/S50dropbear \ + $(TARGET_DIR)/etc/init.d/S50dropbear endef else DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_STANDALONE
That way, we can use a different start script in a custom skeleton. Signed-off-by: Richard Genoud <richard.genoud@gmail.com> --- package/dropbear/dropbear.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)