diff options
| author |   dengke.du@windriver.com <dengke.du@windriver.com> | 2017-03-28 04:13:36 -0400 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-03-31 13:26:03 +0200 |
| commit | b5bb61163751d93672bdcdfb24dda21398e42657 (patch) | |
| tree | 95febd306c0c65d582debe06c8567c2560217e89 /meta-oe/recipes-devtools/php/php.inc | |
| parent | 6c9c7317e2935a940a3e972f132053ec92a67909 (diff) | |
| download | meta-openembedded-contrib-b5bb61163751d93672bdcdfb24dda21398e42657.tar.gz | |
php: fix install failure
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>
Diffstat (limited to 'meta-oe/recipes-devtools/php/php.inc')
| -rw-r--r-- | meta-oe/recipes-devtools/php/php.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc index f882e32319..d3ec9ded38 100644 --- a/meta-oe/recipes-devtools/php/php.inc +++ b/meta-oe/recipes-devtools/php/php.inc @@ -135,9 +135,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 @@ -145,7 +145,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 |