[oe] [meta-oe][PATCH] php: stop removing directories that do not exist

Stephano Cetola stephanoc at gmail.com
Tue Jul 15 22:39:17 UTC 2014


Stephano Cetola <stephanoc <at> gmail.com> writes:

> 
> The directory ${D}/${TMPDIR} does not exist. This patch removes code
> that was calling rm and rmdir on that location.
> 
> Signed-off-by: Stephano Cetola <stephanoc <at> gmail.com>
> ---
>  meta-oe/recipes-devtools/php/php.inc |    6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-
devtools/php/php.inc
> index b1bf79c..011eea7 100644
> --- a/meta-oe/recipes-devtools/php/php.inc
> +++ b/meta-oe/recipes-devtools/php/php.inc
>  <at>  <at>  -74,7 +74,6  <at>  <at>  do_install_append_pn-php() {
>      if [ -d ${D}/${STAGING_DIR_NATIVE}/${sysconfdir} ];then
>           mv ${D}/${STAGING_DIR_NATIVE}/${sysconfdir}/* 
${D}/${sysconfdir}/
>      fi
> -    rm -rf ${D}/${TMPDIR}
>      rm -rf ${D}/.registry
>      rm -rf ${D}/.channels
>      rm -rf ${D}/.[a-z]*
>  <at>  <at>  -89,11 +88,6  <at>  <at>  do_install_append_pn-php() {
>      sed -i 's:=/etc:=${sysconfdir}:g' ${B}/sapi/fpm/init.d.php-fpm
>      sed -i 's:=/var:=${localstatedir}:g' ${B}/sapi/fpm/init.d.php-fpm
>      install -m 0755 ${B}/sapi/fpm/init.d.php-fpm 
${D}${sysconfdir}/init.d/php-fpm
> -    TMP=`dirname ${D}/${TMPDIR}`
> -    while test ${TMP} != ${D}; do
> -        rmdir ${TMP}
> -        TMP=`dirname ${TMP}`;
> -    done
>  }
> 
>  PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 
${PN}-pear ${PN}-dev
> ${PN}-staticdev ${PN}-doc ${PN}"

Please disregard this patch. It is only a partial fix.

I think I am beginning to understand the comment at the beginning of 
do_install_append_pn-php. I will dig into this further.

Kind Regards,
Stephano






More information about the Openembedded-devel mailing list