Skip to contentSkip to conversation

ifplugd: ensure directories exist before installing to them

PATCH New Danomi Manchego 2 participants 2 messages Oct 24, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ifplugd: ensure directories exist before installing to them

Add the -D to install commands to ensure that all the necessary installation directories exist.

---

I find that it is sometimes useful to delete the .stamp_target_installed and run a line like this to view all the files installed by a package:

   make ifplugd TARGET_DIR=$(pwd)/TMP

In the case of ifplugd, such a line fails due to no TMP/etc/init.d. I'm submitting this patch to fix this scenario, since theoretically the same could happen with a customized target skeleton.

---
 package/ifplugd/ifplugd.mk |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
package/ifplugd/ifplugd.mk +4 -5
index ee5bd25..837e016 100644
@@ -21,14 +21,13 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 endif
 
 define IFPLUGD_INSTALL_FIXUP
-	$(INSTALL) -d $(TARGET_DIR)/etc/ifplugd
 	@if [ ! -f $(TARGET_DIR)/etc/ifplugd/ifplugd.conf ]; then \
-		$(INSTALL) $(@D)/conf/ifplugd.conf $(TARGET_DIR)/etc/ifplugd/; \
+		$(INSTALL) -D $(@D)/conf/ifplugd.conf $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \
 		$(SED) 's^\(ARGS=.*\)w^\1^' $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \
 	fi
-	$(INSTALL) -m 0755 $(@D)/conf/ifplugd.action \
-		$(TARGET_DIR)/etc/ifplugd/
-	$(INSTALL) -m 0755 $(@D)/conf/ifplugd.init \
+	$(INSTALL) -D -m 0755 $(@D)/conf/ifplugd.action \
+		$(TARGET_DIR)/etc/ifplugd/ifplugd.action
+	$(INSTALL) -D -m 0755 $(@D)/conf/ifplugd.init \
 		$(TARGET_DIR)/etc/init.d/S45ifplugd
 	# don't use bash for init script
 	$(SED) 's^/bin/bash^/bin/sh^g' $(TARGET_DIR)/etc/init.d/S45ifplugd
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 ifplugd: ensure directories exist before installing to them

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Danomi" == Danomi Manchego <[email protected]> writes:

Add the -D to install commands to ensure that all the necessary installation directories exist.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard