php: remove the failing ${D}/${TMPDIR} code
PATCH 1/1 php: remove the failing ${D}/${TMPDIR} code
From: Max Kellermann <[email protected]>
Appending ${TMPDIR} to ${D} doesn't make any sense, because both are absolute paths. And additionally, the code fails:
rmdir: failed to remove '/usr/src/oe/tmp-musl/work/core2-64-oe-linux-musl/php/7.1.9-r0/image//usr': Directory not empty
Signed-off-by Max Kellermann <[email protected]>
Signed-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-devtools/php/php_7.4.9.bb | 9 --------- 1 file changed, 9 deletions(-)
meta-oe/recipes-devtools/php/php_7.4.9.bb +0 -9
@@ -155,7 +155,6 @@ do_install_prepend_class-target() { # fixme do_install_append_class-target() { install -d ${D}${sysconfdir}/ - rm -rf ${D}/${TMPDIR} rm -rf ${D}/.registry rm -rf ${D}/.channels rm -rf ${D}/.[a-z]*
@@ -179,14 +178,6 @@ do_install_append_class-target() { ${D}${systemd_unitdir}/system/php-fpm.service fi - TMP=`dirname ${D}/${TMPDIR}` - while test ${TMP} != ${D}; do - if [ -d ${TMP} ]; then - rmdir ${TMP} - fi - TMP=`dirname ${TMP}`; - done - if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/apache2/modules.d install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION}
Signature · 1 line
2.29.2