[oe] [meta-oe][PATCH] php: stop removing directories that do not exist
Matt Schuckmann
Matt.Schuckmann at planar.com
Tue Dec 16 18:59:22 UTC 2014
>
> 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}"
Stephano,
Did you ever come to a resolution on this?
I'm running into the problem building on Ubuntu 14.01 that the PHP recipe fails because the rmdir ${TMP} line fails.
Reading the recipe it looks like the whole while loop section is unneeded and destined to fail because of the rm -rf ${D}/${TMPDIR} above.
At the very least the rmdir should be preceded by a test for the existence of the directory.
Thanks,
Matt S.
More information about the Openembedded-devel
mailing list