summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max.kellermann@gmail.com>2018-02-07 11:15:45 +0100
committerArmin Kuster <akuster808@gmail.com>2021-01-10 19:42:48 -0800
commitcf29a55578192461dd86084c78e32fe8fba73eee (patch)
treefb0b2d21043d57d061e43aec07622915f988370d
parent45224eeec9366d7dcc83317c70169f2bdab92972 (diff)
downloadmeta-openembedded-cf29a55578192461dd86084c78e32fe8fba73eee.tar.gz
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 f6338892d9c57c51ed48b04f587b468f7718a8ba) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-devtools/php/php_7.4.9.bb9
1 files changed, 0 insertions, 9 deletions
diff --git a/meta-oe/recipes-devtools/php/php_7.4.9.bb b/meta-oe/recipes-devtools/php/php_7.4.9.bb
index cd874d3c8b..fc01ea1953 100644
--- a/meta-oe/recipes-devtools/php/php_7.4.9.bb
+++ b/meta-oe/recipes-devtools/php/php_7.4.9.bb
@@ -154,7 +154,6 @@ do_install_prepend_class-target() {
154# fixme 154# fixme
155do_install_append_class-target() { 155do_install_append_class-target() {
156 install -d ${D}${sysconfdir}/ 156 install -d ${D}${sysconfdir}/
157 rm -rf ${D}/${TMPDIR}
158 rm -rf ${D}/.registry 157 rm -rf ${D}/.registry
159 rm -rf ${D}/.channels 158 rm -rf ${D}/.channels
160 rm -rf ${D}/.[a-z]* 159 rm -rf ${D}/.[a-z]*
@@ -178,14 +177,6 @@ do_install_append_class-target() {
178 ${D}${systemd_unitdir}/system/php-fpm.service 177 ${D}${systemd_unitdir}/system/php-fpm.service
179 fi 178 fi
180 179
181 TMP=`dirname ${D}/${TMPDIR}`
182 while test ${TMP} != ${D}; do
183 if [ -d ${TMP} ]; then
184 rmdir ${TMP}
185 fi
186 TMP=`dirname ${TMP}`;
187 done
188
189 if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then 180 if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then
190 install -d ${D}${sysconfdir}/apache2/modules.d 181 install -d ${D}${sysconfdir}/apache2/modules.d
191 install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} 182 install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION}