diff options
author | Max Kellermann <max.kellermann@gmail.com> | 2018-02-07 11:15:45 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-11-23 20:44:40 -0800 |
commit | 5cd29d53b349b566e2f05c46c5da56b382b95465 (patch) | |
tree | a6ed47ca3e8113a3d37ec3c631ef49150b51f27d | |
parent | dc58ca7c752ab1368fcf3d4552895c42bdc7e71b (diff) | |
download | meta-openembedded-contrib-5cd29d53b349b566e2f05c46c5da56b382b95465.tar.gz |
php: remove the failing ${D}/${TMPDIR} code
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 <max.kellermann@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-devtools/php/php_7.4.9.bb | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/meta-oe/recipes-devtools/php/php_7.4.9.bb b/meta-oe/recipes-devtools/php/php_7.4.9.bb index abd8b16723..1da5607835 100644 --- a/meta-oe/recipes-devtools/php/php_7.4.9.bb +++ b/meta-oe/recipes-devtools/php/php_7.4.9.bb @@ -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} |