Skip to content

Commit 5cd29d5

Browse files
MaxKellermannkraj
authored andcommitted
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 <[email protected]> Signed-off-by: Khem Raj <[email protected]>
1 parent dc58ca7 commit 5cd29d5

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

meta-oe/recipes-devtools/php/php_7.4.9.bb

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ do_install_prepend_class-target() {
155155
# fixme
156156
do_install_append_class-target() {
157157
install -d ${D}${sysconfdir}/
158-
rm -rf ${D}/${TMPDIR}
159158
rm -rf ${D}/.registry
160159
rm -rf ${D}/.channels
161160
rm -rf ${D}/.[a-z]*
@@ -179,14 +178,6 @@ do_install_append_class-target() {
179178
${D}${systemd_unitdir}/system/php-fpm.service
180179
fi
181180

182-
TMP=`dirname ${D}/${TMPDIR}`
183-
while test ${TMP} != ${D}; do
184-
if [ -d ${TMP} ]; then
185-
rmdir ${TMP}
186-
fi
187-
TMP=`dirname ${TMP}`;
188-
done
189-
190181
if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then
191182
install -d ${D}${sysconfdir}/apache2/modules.d
192183
install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION}

0 commit comments

Comments
 (0)