| Message ID | 1417357142-14307-61-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: > As discussed, users should use a rootfs overlay or a post-build script > instead of a custom skeleton to override files installed by Buildroot, > so there is no point in having conditions when installing init scripts > or configuration files. > > 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/stunnel/stunnel.mk | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk > index ac2963e..3d0596d 100644 > --- a/package/stunnel/stunnel.mk > +++ b/package/stunnel/stunnel.mk > @@ -19,9 +19,8 @@ STUNNEL_CONF_OPTS += --disable-systemd > endif > > define STUNNEL_INSTALL_CONF > - [ -f $(TARGET_DIR)/etc/stunnel/stunnel.conf ] || \ > - $(INSTALL) -m 0644 -D $(@D)/tools/stunnel.conf \ > - $(TARGET_DIR)/etc/stunnel/stunnel.conf > + $(INSTALL) -m 0644 -D $(@D)/tools/stunnel.conf \ > + $(TARGET_DIR)/etc/stunnel/stunnel.conf > rm -f $(TARGET_DIR)/etc/stunnel/stunnel.conf-sample > endef > > -- > 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: > As discussed, users should use a rootfs overlay or a post-build script > instead of a custom skeleton to override files installed by Buildroot, > so there is no point in having conditions when installing init scripts > or configuration files. > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Committed, thanks.
diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk index ac2963e..3d0596d 100644 --- a/package/stunnel/stunnel.mk +++ b/package/stunnel/stunnel.mk @@ -19,9 +19,8 @@ STUNNEL_CONF_OPTS += --disable-systemd endif define STUNNEL_INSTALL_CONF - [ -f $(TARGET_DIR)/etc/stunnel/stunnel.conf ] || \ - $(INSTALL) -m 0644 -D $(@D)/tools/stunnel.conf \ - $(TARGET_DIR)/etc/stunnel/stunnel.conf + $(INSTALL) -m 0644 -D $(@D)/tools/stunnel.conf \ + $(TARGET_DIR)/etc/stunnel/stunnel.conf rm -f $(TARGET_DIR)/etc/stunnel/stunnel.conf-sample endef
As discussed, users should use a rootfs overlay or a post-build script instead of a custom skeleton to override files installed by Buildroot, so there is no point in having conditions when installing init scripts or configuration files. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/stunnel/stunnel.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)