From: Pascal de Bruijn <pmjdebruijn@pcode.nl>
Date: Thu, 28 Nov 2019 13:03:16 +0000 (+0100)
Subject: package/php: remove sample config in new location
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5d7b8fef0f36aeaa4a503d49e549494637189698;p=buildroot.git

package/php: remove sample config in new location

the upstream php-fpm sample configuration is placed in

  /etc/php-fpm.d/www.conf.default

in recent version of php, so adjust the build cleanup
accordingly

Signed-off-by: Pascal de Bruijn <p.debruijn@unilogic.nl>
[yann.morin.1998@free.fr: only remove the file, not the directory]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---

diff --git a/package/php/php.mk b/package/php/php.mk
index be35ed4456..682132fb59 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -343,7 +343,7 @@ endef
 define PHP_INSTALL_FPM_CONF
 	$(INSTALL) -D -m 0644 package/php/php-fpm.conf \
 		$(TARGET_DIR)/etc/php-fpm.conf
-	rm -f $(TARGET_DIR)/etc/php-fpm.conf.default
+	rm -f $(TARGET_DIR)/etc/php-fpm.d/www.conf.default
 	# remove unused sample status page /usr/php/php/fpm/status.html
 	rm -rf $(TARGET_DIR)/usr/php
 endef