From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] package/php: remove sample config in new location
Date: Tue, 31 Dec 2019 18:27:56 +0100 [thread overview]
Message-ID: <20191231172756.GC3519@scaer> (raw)
In-Reply-To: <20191128130316.6004-1-p.debruijn@unilogic.nl>
Pascal, All,
On 2019-11-28 14:03 +0100, Pascal de Bruijn spake thusly:
> From: Pascal de Bruijn <pmjdebruijn@pcode.nl>
>
> 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>
> ---
> package/php/php.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/php/php.mk b/package/php/php.mk
> index 007b8a6..c83f04a 100644
> --- a/package/php/php.mk
> +++ b/package/php/php.mk
> @@ -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.
> # remove unused sample status page /usr/php/php/fpm/status.html
> rm -rf $(TARGET_DIR)/usr/php
> endef
> --
> 2.7.4
>
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
prev parent reply other threads:[~2019-12-31 17:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-28 13:03 [Buildroot] [PATCH] package/php: remove sample config in new location Pascal de Bruijn
2019-12-31 17:27 ` Yann E. MORIN [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191231172756.GC3519@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox