[Buildroot] [PATCH 1/2] dropbear: install start script only if it doesn't already exists

[Buildroot] [PATCH 1/2] dropbear: install start script only if it doesn't already exists

[Richard Genoud]

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(-)

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
-- 
2.0.0

[Buildroot] [PATCH 2/2] connman: install start script only if it doesn't already exists

[Richard Genoud]

That way, we can use a different start script in a custom skeleton.

Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
---
 package/connman/connman.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/connman/connman.mk b/package/connman/connman.mk
index 4d9b03ef1508..108ad848e92c 100644
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -28,7 +28,8 @@ CONNMAN_DEPENDENCIES += \
 	$(if $(BR2_PACKAGE_CONNMAN_WISPR),gnutls)
 
 define CONNMAN_INSTALL_INIT_SYSV
-	$(INSTALL) -m 0755 -D package/connman/S45connman $(TARGET_DIR)/etc/init.d/S45connman
+	[ -f $(TARGET_DIR)/etc/init.d/S45connman ] || \
+		$(INSTALL) -m 0755 -D package/connman/S45connman $(TARGET_DIR)/etc/init.d/S45connman
 endef
 
 
-- 
2.0.0

[Buildroot] [PATCH 1/2] dropbear: install start script only if it doesn't already exists

[Thomas Petazzoni]

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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/2] dropbear: install start script only if it doesn't already exists

[Richard Genoud]

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 !