After switch to RSS(recipe specific sysroot), the php package failed when
installing.
This is because the build system can't find the file: pear.conf, that file
stay in "${D}/${STAGING_DIR_NATIVE}" directory before the switch, now stay
in "${RECIPE_SYSROOT_NATIVE}" directory, so we need to place it in correct
place.
Signed-off-by: Dengke Du <[email protected]>
---
meta-oe/recipes-devtools/php/php.inc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta-oe/recipes-devtools/php/php.inc
b/meta-oe/recipes-devtools/php/php.inc
index c4fb1d9..b4ce2e3 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -136,9 +136,9 @@ do_install_prepend_class-target() {
# fixme
do_install_append_class-target() {
- install -d ${D}/${sysconfdir}/
- if [ -d ${D}/${STAGING_DIR_NATIVE}/${sysconfdir} ];then
- mv ${D}/${STAGING_DIR_NATIVE}/${sysconfdir}/* ${D}/${sysconfdir}/
+ install -d ${D}${sysconfdir}/
+ if [ -d ${RECIPE_SYSROOT_NATIVE}${sysconfdir} ];then
+ install -m 0644 ${RECIPE_SYSROOT_NATIVE}${sysconfdir}/pear.conf
${D}${sysconfdir}/
fi
rm -rf ${D}/${TMPDIR}
rm -rf ${D}/.registry
@@ -146,7 +146,7 @@ do_install_append_class-target() {
rm -rf ${D}/.[a-z]*
rm -rf ${D}/var
rm -f ${D}/${sysconfdir}/php-fpm.conf.default
- sed -i 's:${STAGING_DIR_NATIVE}::g' ${D}/${sysconfdir}/pear.conf
+ 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
--
2.8.1
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
