package/php: remove sample config in new location
PATCH 1/1 package/php: remove sample config in new location
From: Pascal de Bruijn <[email protected]>
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
--- package/php/php.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/php/php.mk +1 -1
@@ -346,7 +346,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 -rf $(TARGET_DIR)/etc/php-fpm.d # remove unused sample status page /usr/php/php/fpm/status.html rm -rf $(TARGET_DIR)/usr/php endef
Signature · 1 line
2.7.4
Yann E. MORIN
AppliedPATCH 1/1 package/php: remove sample config in new location
Pascal, All,
On 2019-11-28 14:03 +0100, Pascal de Bruijn spake thusly:
Quoted 19 lines
From: Pascal de Bruijn <[email protected]>
the upstream php-fpm sample configuration is placed in
/etc/php-fpm.d/www.conf.defaultin recent version of php, so adjust the build cleanup accordingly
Signed-off-by Pascal de Bruijn <[email protected]>--- package/php/php.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/php/php.mk +0
-0
package/php/php.mk endef · line 349
Quoted 5 lines
package/php/php.mk +1
-1@@ -346,7 +346,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 -rf $(TARGET_DIR)/etc/php-fpm.d
I've changed that to only remove the file, not the whole directory, in case an other (built earlier) package installs files there.
Applied to master with that fix, thanks.
Regards,
Yann E. MORIN.
Quoted 11 lines
package/php/php.mk +0
-0# remove unused sample status page /usr/php/php/fpm/status.html rm -rf $(TARGET_DIR)/usr/php endefSignature · 7 lines
2.7.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'