From 5ad5d55924bcc7086f834a28db9c227371728470 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 30 Nov 2014 15:18:55 +0100 Subject: [PATCH] ifplugd: install configuration files unconditionally 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. [Peter: use install -m as noted by Yann] Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/ifplugd/ifplugd.mk | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/package/ifplugd/ifplugd.mk b/package/ifplugd/ifplugd.mk index 3d0736a95..03ed8cdf3 100644 --- a/package/ifplugd/ifplugd.mk +++ b/package/ifplugd/ifplugd.mk @@ -21,14 +21,10 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y) endif define IFPLUGD_INSTALL_FIXUP - if [ ! -f $(TARGET_DIR)/etc/ifplugd/ifplugd.conf ]; then \ - $(INSTALL) -D $(@D)/conf/ifplugd.conf $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \ - $(SED) 's^\(ARGS=.*\)w^\1^' $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \ - fi - if [ ! -f $(TARGET_DIR)/etc/ifplugd/ifplugd.action ]; then \ - $(INSTALL) -D -m 0755 $(@D)/conf/ifplugd.action \ - $(TARGET_DIR)/etc/ifplugd/ifplugd.action ; \ - fi + $(INSTALL) -D -m 0644 $(@D)/conf/ifplugd.conf $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \ + $(SED) 's^\(ARGS=.*\)w^\1^' $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \ + $(INSTALL) -D -m 0755 $(@D)/conf/ifplugd.action \ + $(TARGET_DIR)/etc/ifplugd/ifplugd.action ; \ endef IFPLUGD_POST_INSTALL_TARGET_HOOKS += IFPLUGD_INSTALL_FIXUP