diff options
author | Max Kellermann <max.kellermann@gmail.com> | 2018-02-07 11:15:45 +0100 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2020-12-14 21:25:32 -0800 |
commit | f6338892d9c57c51ed48b04f587b468f7718a8ba (patch) | |
tree | 127ddc0aa0959ae3eaa26efe2c6860d01ee79dd9 | |
parent | f7984364181f9bb4e20d15af9431bad54ebe861d (diff) | |
download | meta-openembedded-f6338892d9c57c51ed48b04f587b468f7718a8ba.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>
-rw-r--r-- | meta-oe/recipes-devtools/php/php_7.4.9.bb | 9 |
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 abd8b16723..1da5607835 100644 --- a/meta-oe/recipes-devtools/php/php_7.4.9.bb +++ b/meta-oe/recipes-devtools/php/php_7.4.9.bb | |||
@@ -155,7 +155,6 @@ do_install_prepend_class-target() { | |||
155 | # fixme | 155 | # fixme |
156 | do_install_append_class-target() { | 156 | do_install_append_class-target() { |
157 | install -d ${D}${sysconfdir}/ | 157 | install -d ${D}${sysconfdir}/ |
158 | rm -rf ${D}/${TMPDIR} | ||
159 | rm -rf ${D}/.registry | 158 | rm -rf ${D}/.registry |
160 | rm -rf ${D}/.channels | 159 | rm -rf ${D}/.channels |
161 | rm -rf ${D}/.[a-z]* | 160 | rm -rf ${D}/.[a-z]* |
@@ -179,14 +178,6 @@ do_install_append_class-target() { | |||
179 | ${D}${systemd_unitdir}/system/php-fpm.service | 178 | ${D}${systemd_unitdir}/system/php-fpm.service |
180 | fi | 179 | fi |
181 | 180 | ||
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 | |||
190 | if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then | 181 | if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then |
191 | install -d ${D}${sysconfdir}/apache2/modules.d | 182 | install -d ${D}${sysconfdir}/apache2/modules.d |
192 | install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} | 183 | install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} |