mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-29 12:29:32 +00:00
Code Issues Projects Releases Wiki Activity

php: fix install failure

Browse Source 
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 <dengke.du@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
dengke.du@windriver.com
2017-03-28 04:13:36 -04:00
committed by Martin Jansa
parent 6c9c7317e2
commit b5bb611637
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-devtools/php/php.inc
+4 -4
View File
@@ -135,9 +135,9 @@ do_install_prepend_class-target() {
# fixme # fixme
do_install_append_class-target() { do_install_append_class-target() {
install -d ${D}/${sysconfdir}/ install -d ${D}${sysconfdir}/
if [ -d ${D}/${STAGING_DIR_NATIVE}/${sysconfdir} ];then if [ -d ${RECIPE_SYSROOT_NATIVE}${sysconfdir} ];then
mv ${D}/${STAGING_DIR_NATIVE}/${sysconfdir}/* ${D}/${sysconfdir}/ install -m 0644 ${RECIPE_SYSROOT_NATIVE}${sysconfdir}/pear.conf ${D}${sysconfdir}/
fi fi
rm -rf ${D}/${TMPDIR} rm -rf ${D}/${TMPDIR}
rm -rf ${D}/.registry rm -rf ${D}/.registry
@@ -145,7 +145,7 @@ do_install_append_class-target() {
rm -rf ${D}/.[a-z]* rm -rf ${D}/.[a-z]*
rm -rf ${D}/var rm -rf ${D}/var
rm -f ${D}/${sysconfdir}/php-fpm.conf.default 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 -m 0644 ${WORKDIR}/php-fpm.conf ${D}/${sysconfdir}/php-fpm.conf
install -d ${D}/${sysconfdir}/apache2/conf.d install -d ${D}/${sysconfdir}/apache2/conf.d
install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf