| Submitter | jackie huang |
|---|---|
| Date | March 1, 2013, 9:19 a.m. |
| Message ID | <1362129599-19779-1-git-send-email-jackie.huang@windriver.com> |
| Download | mbox | patch |
| Permalink | /patch/45337/ |
| State | Accepted, archived |
| Commit | 6c9ac38e8b998e6739383ba91e0c4e0c0ed0094b |
| Headers | show |
Comments
On Fri, Mar 01, 2013 at 05:19:59PM +0800, jackie.huang@windriver.com wrote: > From: Jackie Huang <jackie.huang@windriver.com> > > [ CQID: WIND00405358 ] Drop this ^ > > The hardcoded lib path will cause apache2 fail to start on > the target with other baselib like lib64. > > Signed-off-by: Jackie Huang <jackie.huang@windriver.com> > --- > meta-webserver/recipes-php/modphp/modphp5.inc | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc b/meta-webserver/recipes-php/modphp/modphp5.inc > index 3302936..c359ff9 100644 > --- a/meta-webserver/recipes-php/modphp/modphp5.inc > +++ b/meta-webserver/recipes-php/modphp/modphp5.inc > @@ -67,6 +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 > 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\",' \ > -- > 1.7.4.1 > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
On Friday 01 March 2013 17:19:59 jackie.huang@windriver.com wrote: > From: Jackie Huang <jackie.huang@windriver.com> > > [ CQID: WIND00405358 ] > > The hardcoded lib path will cause apache2 fail to start on > the target with other baselib like lib64. > > Signed-off-by: Jackie Huang <jackie.huang@windriver.com> > --- > meta-webserver/recipes-php/modphp/modphp5.inc | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc > b/meta-webserver/recipes-php/modphp/modphp5.inc index 3302936..c359ff9 > 100644 > --- a/meta-webserver/recipes-php/modphp/modphp5.inc > +++ b/meta-webserver/recipes-php/modphp/modphp5.inc > @@ -67,6 +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 > 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\",' \ I've merged this, minus the CQID from the commit message. Thanks! Cheers, Paul
Patch
diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc b/meta-webserver/recipes-php/modphp/modphp5.inc index 3302936..c359ff9 100644 --- a/meta-webserver/recipes-php/modphp/modphp5.inc +++ b/meta-webserver/recipes-php/modphp/modphp5.inc @@ -67,6 +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 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\",' \