[oe] [PATCH 1/8] [meta-oe] devtools/php: remove the failing ${D}/${TMPDIR} code
Max Kellermann
max+openembedded at blarg.de
Tue Sep 18 08:26:00 UTC 2018
From: Max Kellermann <max.kellermann at gmail.com>
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 at gmail.com>
---
meta-oe/recipes-devtools/php/php.inc | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
index 65dfd2d89..120f678d7 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
--
2.18.0
More information about the Openembedded-devel
mailing list