Patchwork [meta-webserver] modphp: use libdir instead of baselib to load module

login
register
mail settings
Submitter jackie huang
Date April 1, 2013, 2:33 a.m.
Message ID <1364783617-29850-1-git-send-email-jackie.huang@windriver.com>
Download mbox | patch
Permalink /patch/47181/
State Accepted, archived
Commit 8bfd395b06fdf68919b271089dde198213bbe54c
Headers show

Comments

jackie huang - April 1, 2013, 2:33 a.m.
From: Jackie Huang <jackie.huang@windriver.com>

When we change the apache2 files layout to debian style,
the ServerRoot in httpd.conf was changed to "/" from "/usr",
then the relative path to libphp5 module in 70_mod_php5.conf
will be invalid so it fails to load the module, use libdir
(absolute path) instead so it will always find the module.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 meta-webserver/recipes-php/modphp/modphp5.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Paul Eggleton - April 3, 2013, 5:12 p.m.
On Monday 01 April 2013 10:33:37 jackie.huang@windriver.com wrote:
> From: Jackie Huang <jackie.huang@windriver.com>
> 
> When we change the apache2 files layout to debian style,
> the ServerRoot in httpd.conf was changed to "/" from "/usr",
> then the relative path to libphp5 module in 70_mod_php5.conf
> will be invalid so it fails to load the module, use libdir
> (absolute path) instead so it will always find the module.
> 
> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> ---
>  meta-webserver/recipes-php/modphp/modphp5.inc |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc
> b/meta-webserver/recipes-php/modphp/modphp5.inc index c359ff9..33dbe89
> 100644
> --- a/meta-webserver/recipes-php/modphp/modphp5.inc
> +++ b/meta-webserver/recipes-php/modphp/modphp5.inc
> @@ -67,7 +67,7 @@ do_install  () {
>  	install -d ${D}${sysconfdir}/apache2/modules.d
>  	install -d ${D}${sysconfdir}/php/apache2-php5
>  	install -m 755  libs/libphp5.so ${D}${libdir}/apache2/modules
> -	sed -i s,lib/,${baselib}/, ${WORKDIR}/70_mod_php5.conf
> +	sed -i s,lib/,${libdir}/, ${WORKDIR}/70_mod_php5.conf
>  	install -m 644  ${WORKDIR}/70_mod_php5.conf
> ${D}${sysconfdir}/apache2/modules.d cat ${S}/php.ini-production | \
>  		sed -e 's,extension_dir = \"\./\",extension_dir =
> \"/usr/lib/extensions\",' \

Merged, thanks!

Cheers,
Paul

Patch

diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc b/meta-webserver/recipes-php/modphp/modphp5.inc
index c359ff9..33dbe89 100644
--- a/meta-webserver/recipes-php/modphp/modphp5.inc
+++ b/meta-webserver/recipes-php/modphp/modphp5.inc
@@ -67,7 +67,7 @@  do_install  () {
 	install -d ${D}${sysconfdir}/apache2/modules.d
 	install -d ${D}${sysconfdir}/php/apache2-php5
 	install -m 755  libs/libphp5.so ${D}${libdir}/apache2/modules
-	sed -i s,lib/,${baselib}/, ${WORKDIR}/70_mod_php5.conf
+	sed -i s,lib/,${libdir}/, ${WORKDIR}/70_mod_php5.conf
 	install -m 644  ${WORKDIR}/70_mod_php5.conf ${D}${sysconfdir}/apache2/modules.d
 	cat ${S}/php.ini-production | \
 		sed -e 's,extension_dir = \"\./\",extension_dir = \"/usr/lib/extensions\",' \