diff mbox

[PATCHv3,72/74] inadyn: install configuration file unconditionally

Message ID 1417357142-14307-73-git-send-email-thomas.petazzoni@free-electrons.com
State Accepted
Headers show

Commit Message

Thomas Petazzoni Nov. 30, 2014, 2:19 p.m. UTC
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/inadyn/inadyn.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Yann E. MORIN Nov. 30, 2014, 6:16 p.m. UTC | #1
Thomas, All,

On 2014-11-30 15:19 +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/inadyn/inadyn.mk | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/package/inadyn/inadyn.mk b/package/inadyn/inadyn.mk
> index 73d95db..b002f94 100644
> --- a/package/inadyn/inadyn.mk
> +++ b/package/inadyn/inadyn.mk
> @@ -20,10 +20,8 @@ INADYN_CONF_OPTS += --disable-ssl
>  endif
>  
>  define INADYN_INSTALL_SAMPLE_CONFIG
> -	@if [ ! -f $(TARGET_DIR)/etc/inadyn.conf ]; then \
> -		$(INSTALL) -D -m 0600 package/inadyn/inadyn.conf \
> -			$(TARGET_DIR)/etc/inadyn.conf; \
> -	fi
> +	$(INSTALL) -D -m 0600 package/inadyn/inadyn.conf \
> +		$(TARGET_DIR)/etc/inadyn.conf
>  endef
>  INADYN_POST_INSTALL_TARGET_HOOKS += INADYN_INSTALL_SAMPLE_CONFIG
>  
> -- 
> 2.1.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Peter Korsgaard Dec. 1, 2014, 11:41 p.m. UTC | #2
>>>>> "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 mbox

Patch

diff --git a/package/inadyn/inadyn.mk b/package/inadyn/inadyn.mk
index 73d95db..b002f94 100644
--- a/package/inadyn/inadyn.mk
+++ b/package/inadyn/inadyn.mk
@@ -20,10 +20,8 @@  INADYN_CONF_OPTS += --disable-ssl
 endif
 
 define INADYN_INSTALL_SAMPLE_CONFIG
-	@if [ ! -f $(TARGET_DIR)/etc/inadyn.conf ]; then \
-		$(INSTALL) -D -m 0600 package/inadyn/inadyn.conf \
-			$(TARGET_DIR)/etc/inadyn.conf; \
-	fi
+	$(INSTALL) -D -m 0600 package/inadyn/inadyn.conf \
+		$(TARGET_DIR)/etc/inadyn.conf
 endef
 INADYN_POST_INSTALL_TARGET_HOOKS += INADYN_INSTALL_SAMPLE_CONFIG