diff options
| author |   Max Kellermann <max.kellermann@gmail.com> | 2018-09-18 10:26:00 +0200 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2018-09-18 20:17:03 -0700 |
| commit | c2cffd78b1be015df86baf8d3325a2fcc4ce0d83 (patch) | |
| tree | 72160d22466b8f9623eed61dd15955de86abc7b9 | |
| parent | d6b66205655f789f8a908fb667c5f411a794c716 (diff) | |
| download | meta-openembedded-contrib-c2cffd78b1be015df86baf8d3325a2fcc4ce0d83.tar.gz | |
devtools/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.inc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc index 65dfd2d896..120f678d79 100644 --- a/meta-oe/recipes-devtools/php/php.inc +++ b/meta-oe/recipes-devtools/php/php.inc @@ -139,7 +139,6 @@ do_install_append_class-target() { 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 rm -rf ${D}/.channels rm -rf ${D}/.[a-z]* @@ -164,14 +163,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}${libdir}/apache2/modules install -d ${D}${sysconfdir}/apache2/modules.d |