[OE-core] [PATCH 1/1] adwaita-icon-theme: workaround for do_populate_sysroot failure

kai.kang at windriver.com kai.kang at windriver.com
Tue Aug 20 09:05:59 UTC 2019


From: Kai Kang <kai.kang at windriver.com>

It fails to run task do_populate_sysroot of adwaita-icon-theme rarely:

| DEBUG: Executing shell function sysroot_stage_all
| cpio: ./icons/Adwaita/16x16/legacy/_inst.21134_: Cannot stat: No such
  file or directory

In script ${S}/install-sh, temporary files _inst.* are created and will be
removed by shell builtin command trap when the script exits:

    # Make a couple of temp file names in the proper directory.
    dsttmp=${dstdirslash}_inst.$$_
    rmtmp=${dstdirslash}_rm.$$_

    # Trap to clean up those temp files at exit.
    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0

The temporary files should be deleted already after task do_install. But
somehow they are still exist until the gap between commands find and
cpio in populate_sysroot function sysroot_stage_dir().

Remove the temporary files explicitly to avoid such issues.

Signed-off-by: Kai Kang <kai.kang at windriver.com>
---
 meta/recipes-gnome/gnome/adwaita-icon-theme_3.32.0.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.32.0.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.32.0.bb
index 02676f4401..2f999222dc 100644
--- a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.32.0.bb
+++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.32.0.bb
@@ -19,6 +19,11 @@ SRC_URI[sha256sum] = "698db6e407bb987baec736c6a30216dfc0317e3ca2403c7adf3a5aa46c
 
 DEPENDS += "librsvg-native"
 
+do_install_append () {
+    # remove temp files explicitly
+    find ${D} \( -name _inst.* -o -name _rm.* \) -delete
+}
+
 PACKAGES = "${PN}-cursors ${PN}-symbolic-hires ${PN}-symbolic ${PN}-hires ${PN}"
 
 RREPLACES_${PN} = "gnome-icon-theme"
-- 
2.20.0



More information about the Openembedded-core mailing list