* [Buildroot] [PATCH 1/1] PHP-FPM support
@ 2014-07-14 19:15 Jordi Llonch
2014-07-14 22:28 ` Gustavo Zacarias
0 siblings, 1 reply; 7+ messages in thread
From: Jordi Llonch @ 2014-07-14 19:15 UTC (permalink / raw)
To: buildroot
Signed-off-by: Jordi Llonch <jordi.llonch@rochsystems.com>
---
package/php/Config.in | 16 ++++++++++++++++
package/php/php.mk | 1 +
2 files changed, 17 insertions(+)
diff --git a/package/php/Config.in b/package/php/Config.in
index 46444a5..5b66368 100644
--- a/package/php/Config.in
+++ b/package/php/Config.in
@@ -17,6 +17,9 @@ config BR2_PACKAGE_PHP_CLI
config BR2_PACKAGE_PHP_CGI
bool
+config BR2_PACKAGE_PHP_FPM
+ bool
+
choice
prompt "Interface"
default BR2_PACKAGE_PHP_SAPI_CGI
@@ -37,6 +40,12 @@ config BR2_PACKAGE_PHP_SAPI_CLI
help
Command Line Interface
+config BR2_PACKAGE_PHP_SAPI_FPM
+ bool "FPM"
+ select BR2_PACKAGE_PHP_FPM
+ help
+ PHP-FPM (FastCGI Process Manager)
+
config BR2_PACKAGE_PHP_SAPI_CLI_CGI
bool "CGI and CLI"
# CGI uses fork()
@@ -46,6 +55,13 @@ config BR2_PACKAGE_PHP_SAPI_CLI_CGI
help
Command line and Common gateway interfaces
+config BR2_PACKAGE_PHP_SAPI_CLI_FPM
+ bool "FPM and CLI"
+ select BR2_PACKAGE_PHP_CLI
+ select BR2_PACKAGE_PHP_FPM
+ help
+ Command line and PHP-FPM (FastCGI Process Manager)
+
endchoice
endif
diff --git a/package/php/php.mk b/package/php/php.mk
index 4d3aa7d..42c1e89 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -47,6 +47,7 @@ endif
PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_CLI),,--disable-cli)
PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_CGI),,--disable-cgi)
+PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_FPM),--enable-fpm --disable-cgi,--disable--fpm)
### Extensions
PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 1/1] PHP-FPM support
2014-07-14 19:15 [Buildroot] [PATCH 1/1] PHP-FPM support Jordi Llonch
@ 2014-07-14 22:28 ` Gustavo Zacarias
2014-07-14 22:58 ` Jordi Llonch
0 siblings, 1 reply; 7+ messages in thread
From: Gustavo Zacarias @ 2014-07-14 22:28 UTC (permalink / raw)
To: buildroot
On 07/14/2014 04:15 PM, Jordi Llonch wrote:
Hi, let's look at this.
> +config BR2_PACKAGE_PHP_SAPI_FPM
> + bool "FPM"
> + select BR2_PACKAGE_PHP_FPM
> + help
> + PHP-FPM (FastCGI Process Manager)
> +
Pretty sure it depends on MMU just like CGI does.
> +config BR2_PACKAGE_PHP_SAPI_CLI_FPM
> + bool "FPM and CLI"
> + select BR2_PACKAGE_PHP_CLI
> + select BR2_PACKAGE_PHP_FPM
> + help
> + Command line and PHP-FPM (FastCGI Process Manager)
> +
Another option for FPM alone would be good too, not everyone needs CLI
and php binaries are somewhat big.
> +PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_FPM),--enable-fpm --disable-cgi,--disable--fpm)
This should focus on just enable/disabling it's own option, cgi disables
itself via:
PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_CGI),,--disable-cgi)
So no need to re-state that.
Regards.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 1/1] PHP-FPM support
2014-07-14 22:28 ` Gustavo Zacarias
@ 2014-07-14 22:58 ` Jordi Llonch
2014-07-15 12:43 ` Gustavo Zacarias
0 siblings, 1 reply; 7+ messages in thread
From: Jordi Llonch @ 2014-07-14 22:58 UTC (permalink / raw)
To: buildroot
Thanks Gustavo,
This is my first contribution to the project and I appreciate your guidance.
Will those changes suit better?
Signed-off-by: Jordi Llonch <jordi.llonch@rochsystems.com>
---
package/php/Config.in | 18 ++++++++++++++++++
package/php/php.mk | 1 +
2 files changed, 19 insertions(+)
diff --git a/package/php/Config.in b/package/php/Config.in
index 46444a5..4ee14c3 100644
--- a/package/php/Config.in
+++ b/package/php/Config.in
@@ -17,6 +17,9 @@ config BR2_PACKAGE_PHP_CLI
config BR2_PACKAGE_PHP_CGI
bool
+config BR2_PACKAGE_PHP_FPM
+ bool
+
choice
prompt "Interface"
default BR2_PACKAGE_PHP_SAPI_CGI
@@ -37,6 +40,13 @@ config BR2_PACKAGE_PHP_SAPI_CLI
help
Command Line Interface
+config BR2_PACKAGE_PHP_SAPI_FPM
+ bool "FPM"
+ depends on BR2_USE_MMU
+ select BR2_PACKAGE_PHP_FPM
+ help
+ PHP-FPM (FastCGI Process Manager)
+
config BR2_PACKAGE_PHP_SAPI_CLI_CGI
bool "CGI and CLI"
# CGI uses fork()
@@ -46,6 +56,14 @@ config BR2_PACKAGE_PHP_SAPI_CLI_CGI
help
Command line and Common gateway interfaces
+config BR2_PACKAGE_PHP_SAPI_CLI_FPM
+ bool "FPM and CLI"
+ depends on BR2_USE_MMU
+ select BR2_PACKAGE_PHP_CLI
+ select BR2_PACKAGE_PHP_FPM
+ help
+ Command line and PHP-FPM (FastCGI Process Manager)
+
endchoice
endif
diff --git a/package/php/php.mk b/package/php/php.mk
index 4d3aa7d..5a91f9c 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -47,6 +47,7 @@ endif
PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_CLI),,--disable-cli)
PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_CGI),,--disable-cgi)
+PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_FPM),--enable-fpm,--disable--fpm)
### Extensions
PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \
--
1.9.1
El 15/07/2014, a las 08:28, Gustavo Zacarias <gustavo@zacarias.com.ar> escribi?:
> On 07/14/2014 04:15 PM, Jordi Llonch wrote:
>
> Hi, let's look at this.
>
>> +config BR2_PACKAGE_PHP_SAPI_FPM
>> + bool "FPM"
>> + select BR2_PACKAGE_PHP_FPM
>> + help
>> + PHP-FPM (FastCGI Process Manager)
>> +
>
> Pretty sure it depends on MMU just like CGI does.
>
>> +config BR2_PACKAGE_PHP_SAPI_CLI_FPM
>> + bool "FPM and CLI"
>> + select BR2_PACKAGE_PHP_CLI
>> + select BR2_PACKAGE_PHP_FPM
>> + help
>> + Command line and PHP-FPM (FastCGI Process Manager)
>> +
>
> Another option for FPM alone would be good too, not everyone needs CLI
> and php binaries are somewhat big.
>
>> +PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_FPM),--enable-fpm --disable-cgi,--disable--fpm)
>
> This should focus on just enable/disabling it's own option, cgi disables
> itself via:
>
> PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_CGI),,--disable-cgi)
>
> So no need to re-state that.
> Regards.
>
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 1/1] PHP-FPM support
2014-07-14 22:58 ` Jordi Llonch
@ 2014-07-15 12:43 ` Gustavo Zacarias
0 siblings, 0 replies; 7+ messages in thread
From: Gustavo Zacarias @ 2014-07-15 12:43 UTC (permalink / raw)
To: buildroot
On 07/14/2014 07:58 PM, Jordi Llonch wrote:
> Thanks Gustavo,
> This is my first contribution to the project and I appreciate your guidance.
>
> Will those changes suit better?
Yes, contributions are always welcome, i never added fpm because i don't
use it for my embedded cases.
There's a small typo...
> +PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_FPM),--enable-fpm,--disable--fpm)
...an extra - in --disable-fpm :)
Otherwise looks good, care to resend with that tiny fix?
Thanks.
Regards.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 1/1] PHP-FPM support
@ 2014-07-15 18:07 Jordi Llonch
2014-07-15 18:31 ` Gustavo Zacarias
2014-07-15 19:12 ` Thomas Petazzoni
0 siblings, 2 replies; 7+ messages in thread
From: Jordi Llonch @ 2014-07-15 18:07 UTC (permalink / raw)
To: buildroot
Signed-off-by: Jordi Llonch <jordi.llonch@rochsystems.com>
---
package/php/Config.in | 18 ++++++++++++++++++
package/php/php.mk | 1 +
2 files changed, 19 insertions(+)
diff --git a/package/php/Config.in b/package/php/Config.in
index 46444a5..4ee14c3 100644
--- a/package/php/Config.in
+++ b/package/php/Config.in
@@ -17,6 +17,9 @@ config BR2_PACKAGE_PHP_CLI
config BR2_PACKAGE_PHP_CGI
bool
+config BR2_PACKAGE_PHP_FPM
+ bool
+
choice
prompt "Interface"
default BR2_PACKAGE_PHP_SAPI_CGI
@@ -37,6 +40,13 @@ config BR2_PACKAGE_PHP_SAPI_CLI
help
Command Line Interface
+config BR2_PACKAGE_PHP_SAPI_FPM
+ bool "FPM"
+ depends on BR2_USE_MMU
+ select BR2_PACKAGE_PHP_FPM
+ help
+ PHP-FPM (FastCGI Process Manager)
+
config BR2_PACKAGE_PHP_SAPI_CLI_CGI
bool "CGI and CLI"
# CGI uses fork()
@@ -46,6 +56,14 @@ config BR2_PACKAGE_PHP_SAPI_CLI_CGI
help
Command line and Common gateway interfaces
+config BR2_PACKAGE_PHP_SAPI_CLI_FPM
+ bool "FPM and CLI"
+ depends on BR2_USE_MMU
+ select BR2_PACKAGE_PHP_CLI
+ select BR2_PACKAGE_PHP_FPM
+ help
+ Command line and PHP-FPM (FastCGI Process Manager)
+
endchoice
endif
diff --git a/package/php/php.mk b/package/php/php.mk
index 4d3aa7d..5a91f9c 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -47,6 +47,7 @@ endif
PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_CLI),,--disable-cli)
PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_CGI),,--disable-cgi)
+PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_FPM),--enable-fpm,--disable-fpm)
### Extensions
PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 1/1] PHP-FPM support
2014-07-15 18:07 Jordi Llonch
@ 2014-07-15 18:31 ` Gustavo Zacarias
2014-07-15 19:12 ` Thomas Petazzoni
1 sibling, 0 replies; 7+ messages in thread
From: Gustavo Zacarias @ 2014-07-15 18:31 UTC (permalink / raw)
To: buildroot
On 07/15/2014 03:07 PM, Jordi Llonch wrote:
> Signed-off-by: Jordi Llonch <jordi.llonch@rochsystems.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Next time use a friendlier subject for the patch like "php: add FPM
support" :)
Thanks.
Regards.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 1/1] PHP-FPM support
2014-07-15 18:07 Jordi Llonch
2014-07-15 18:31 ` Gustavo Zacarias
@ 2014-07-15 19:12 ` Thomas Petazzoni
1 sibling, 0 replies; 7+ messages in thread
From: Thomas Petazzoni @ 2014-07-15 19:12 UTC (permalink / raw)
To: buildroot
Dear Jordi Llonch,
On Tue, 15 Jul 2014 18:07:42 +0000, Jordi Llonch wrote:
> Signed-off-by: Jordi Llonch <jordi.llonch@rochsystems.com>
> ---
> package/php/Config.in | 18 ++++++++++++++++++
> package/php/php.mk | 1 +
> 2 files changed, 19 insertions(+)
Thanks, applied, after adjusting the commit title as suggested by
Gustavo.
Thanks for your contribution!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-07-15 19:12 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-14 19:15 [Buildroot] [PATCH 1/1] PHP-FPM support Jordi Llonch
2014-07-14 22:28 ` Gustavo Zacarias
2014-07-14 22:58 ` Jordi Llonch
2014-07-15 12:43 ` Gustavo Zacarias
-- strict thread matches above, loose matches on Subject: below --
2014-07-15 18:07 Jordi Llonch
2014-07-15 18:31 ` Gustavo Zacarias
2014-07-15 19:12 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox