Marcin Juszkiewicz : php: add apache configuration for php-fpm
Quoted 5 lines · On Tue, Dec 04, 2012 at 09:49:52AM +0000, [email protected] wrote:
Module: meta-openembedded.git Branch: master Commit: 8424c379fba43c5073b1ca12ba6cb0546c822f3a URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=8424c379fba43c5073b1ca12ba6cb0546c822f3a
Quoted 7 lines
Author: Marcin Juszkiewicz <[email protected]> Date: Wed Nov 28 22:17:09 2012 +0000php: add apache configuration for php-fpm
Signed-off-by Marcin Juszkiewicz <[email protected]>Signed-off-by Koen Kooi <[email protected]>
Not sure if it's caused by this patch or some other php change (except that upgrade), but now it has more unpackaged files:
WARNING: QA Issue: php: Files/directories were installed but not shipped
/var
/var/run
/var/log
/etc/php-fpm.conf.default
/OE
/OE/jansa-test
/OE/jansa-test/shr-core
/OE/jansa-test/shr-core/tmp-eglibc /OE/jansa-test/shr-core/tmp-eglibc/sysroots
There was just that sysroots dir with older php version and php_5.3.19.bb (only upgrade without other php patches)
Cheers,
Quoted 79 lines
---
meta-oe/recipes-devtools/php/php.inc | 8 ++++++-- .../recipes-devtools/php/php/php-fpm-apache.conf | 6 ++++++ meta-oe/recipes-devtools/php/php_5.3.19.bb | 1 + 3 files changed, 13 insertions(+), 2 deletions(-)meta-oe/recipes-devtools/php/php.inc +6
-2@@ -7,7 +7,7 @@ DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \ libc-client openssl sqlite3" DEPENDS_virtclass-native = "zlib-native libxml2-native" -INC_PR = "r2" +INC_PR = "r3" SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2"@@ -65,6 +65,8 @@ do_install_append_pn-php() { rm -rf ${D}/.[a-z]* sed -i 's:${STAGING_DIR_NATIVE}::g' ${D}/${sysconfdir}/pear.conf install -m 0644 ${WORKDIR}/php-fpm.conf ${D}/${sysconfdir}/php-fpm.conf + install -d ${D}/${sysconfdir}/apache2/conf.d + install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf install -d ${D}${sysconfdir}/init.d sed -i 's:=/usr/sbin:=${sbindir}:g' ${S}/sapi/fpm/init.d.php-fpm sed -i 's:=/etc:=${sysconfdir}:g' ${S}/sapi/fpm/init.d.php-fpm@@ -72,7 +74,7 @@ do_install_append_pn-php() { install -m 0755 ${S}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm } -PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-pear ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}" +PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}" RDEPENDS_${PN}-pear = "${PN}" RDEPENDS_${PN}-cli = "${PN}"@@ -86,7 +88,9 @@ FILES_${PN}-doc += "${libdir}/php/doc" FILES_${PN}-cli = "${bindir}/php" FILES_${PN}-cgi = "${bindir}/php-cgi" FILES_${PN}-fpm = "${sbindir}/php-fpm ${sysconfdir}/php-fpm.conf ${datadir}/fpm ${sysconfdir}/init.d/php-fpm" +FILES_${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" CONFFILES_${PN}-fpm = "${sysconfdir}/php-fpm.conf" +CONFFILES_${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" INITSCRIPT_NAME_${PN}-fpm = "php-fpm" INITSCRIPT_PARAMS_${PN}-fpm = "defaults 60" FILES_${PN}-pear = "${bindir}/pear* ${bindir}/pecl ${libdir}/php/PEAR \meta-oe/recipes-devtools/php/php/php-fpm-apache.conf new file +6
-0@@ -0,0 +1,6 @@ +# Taken from http://wiki.apache.org/httpd/PHP-FPM + +LoadModule proxy_module lib/apache2/modules/mod_proxy.so +LoadModule proxy_fcgi_module lib/apache2/modules/mod_proxy_fcgi.so + +ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/usr/share/apache2/htdocs/meta-oe/recipes-devtools/php/php_5.3.19.bb +1
-0@@ -15,6 +15,7 @@ SRC_URI_append_pn-php += "file://iconv.patch \ file://php_exec_native.patch \ file://fix-fpm-cross-compile.patch \ file://php-fpm.conf \ + file://php-fpm-apache.conf \ " SRC_URI[md5sum] = "e1d2a3ec7849d4b3032bd1abf1916aa4"_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Quoted 6 lines · Martin Jansa <martin.jansa <at> gmail.com> writes:
Quoted 4 lines · On Tue, Dec 04, 2012 at 09:49:52AM +0000, git <at> git.openembedded.org wrote:
Module: meta-openembedded.git
Branch: master
Commit:8424c379fba43c5073b1ca12ba6cb0546c822f3a
URL:
Quoted 23 lines
Quoted 8 lines
Author: Marcin Juszkiewicz <marcin.juszkiewicz <at> linaro.org> Date: Wed Nov 28 22:17:09 2012 +0000php: add apache configuration for php-fpm
Signed-off-by Marcin Juszkiewicz <marcin.juszkiewicz <at> linaro.org>Signed-off-by Koen Kooi <koen <at> dominion.thruhere.net>Not sure if it's caused by this patch or some other php change (except that upgrade), but now it has more unpackaged files:
WARNING: QA Issue: php: Files/directories were installed but not shipped
/var
/var/run
/var/log
/etc/php-fpm.conf.default
/OE
/OE/jansa-test
/OE/jansa-test/shr-core
/OE/jansa-test/shr-core/tmp-eglibc /OE/jansa-test/shr-core/tmp-eglibc/sysroots
Quoted 2 lines
There was just that sysroots dir with older php version and php_5.3.19.bb (only upgrade without other php patches)
Even more unpackaged directories when building without DISTRO set:
php-5.3.19: php: Files/directories were installed but not shipped
/home
/var
/etc/php-fpm.conf.default
/home/jenkins
/home/jenkins/oe
/home/jenkins/oe/shr-core-branches /home/jenkins/oe/shr-core-branches/shr-core /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots /var/run
/var/log
/var/volatile
/var/volatile/run
/var/volatile/log