[oe-commits] Roy Li : php: fix native php when it is from sstate
git at git.openembedded.org
git at git.openembedded.org
Tue Jun 23 10:43:23 UTC 2015
Module: meta-openembedded.git
Branch: master
Commit: 622c960ea6efb9b38b70e4d8c669a2f90b6b1b60
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=622c960ea6efb9b38b70e4d8c669a2f90b6b1b60
Author: Roy Li <rongqing.li at windriver.com>
Date: Tue Jun 16 08:51:51 2015 +0800
php: fix native php when it is from sstate
the native php is used to install the target pear, and native php
has hard-code path, so make wrapper to override the hard-code path
the configuration format of pear.conf for native php is like:
"type:path length:path", path will be replaced when populate sysroot
setscene, but the path length is not changed, and make php unable to
work, add a task to SSTATEPOSTINSTFUNCS to fix the path length
Signed-off-by: Roy Li <rongqing.li at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta-oe/recipes-devtools/php/php_5.5.24.bb | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/meta-oe/recipes-devtools/php/php_5.5.24.bb b/meta-oe/recipes-devtools/php/php_5.5.24.bb
index 3e656af..4d23341 100644
--- a/meta-oe/recipes-devtools/php/php_5.5.24.bb
+++ b/meta-oe/recipes-devtools/php/php_5.5.24.bb
@@ -245,3 +245,21 @@ MODPHP_OLDPACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'modphp',
RPROVIDES_${PN}-modphp = "${MODPHP_OLDPACKAGE}"
RREPLACES_${PN}-modphp = "${MODPHP_OLDPACKAGE}"
RCONFLICTS_${PN}-modphp = "${MODPHP_OLDPACKAGE}"
+
+do_install_append_class-native() {
+ create_wrapper ${D}${bindir}/php \
+ PHP_PEAR_SYSCONF_DIR=${sysconfdir}/
+}
+
+SSTATEPOSTINSTFUNCS_append_class-native = " php_sstate_postinst "
+
+php_sstate_postinst() {
+ if [ "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]
+ then
+ head -n1 ${sysconfdir}/pear.conf > ${sysconfdir}/pear.tmp.conf
+ for p in `tail -n1 ${sysconfdir}/pear.conf | sed -s 's/;/ /g'`; do
+ echo $p | awk -F: 'BEGIN {OFS = ":"; ORS = ";"}{if(NF==3){print $1, length($3)-2*match($3, /^"/), $3} else {print $0}}';
+ done >> ${sysconfdir}/pear.tmp.conf
+ mv -f ${sysconfdir}/pear.tmp.conf ${sysconfdir}/pear.conf
+ fi
+}
More information about the Openembedded-commits
mailing list