Skip to content

Commit

Permalink
php: remove the failing ${D}/${TMPDIR} code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
MaxKellermann authored and kraj committed Nov 24, 2020
1 parent dc58ca7 commit 5cd29d5
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions meta-oe/recipes-devtools/php/php_7.4.9.bb
Original file line number Diff line number Diff line change
Expand Up @@ -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]*
Expand All @@ -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}
Expand Down

0 comments on commit 5cd29d5

Please sign in to comment.