mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-14 05:49:57 +00:00
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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
(cherry picked from commit f6338892d9)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
committed by
Armin Kuster
parent
45224eeec9
commit
cf29a55578
@@ -154,7 +154,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]*
|
||||
@@ -178,14 +177,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}
|
||||
|
||||
Reference in New Issue
Block a user