From: Richard Purdie Date: Sat, 26 Sep 2015 17:12:17 +0000 (+0100) Subject: gdk-pixbuf: Only apply native cleaning in normal task, not setscene X-Git-Tag: 2015-10~239 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=4e89fe719b3e237d84b7ceba2a8c83a768baa714;p=openembedded-core.git gdk-pixbuf: Only apply native cleaning in normal task, not setscene The previous fix works well for normal tasks since the ordering is always correct and gdk-pixbuf-native comes first. Setscene ordering is reversed so we can't rely on this there. Remove the fix in that case since it breaks more than it solves. Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb index 2f0ca49b35..68f3850fb7 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb @@ -106,7 +106,7 @@ SSTATEPREINSTFUNCS_append_class-native = " gdkpixbuf_sstate_preinst" SYSROOT_PREPROCESS_FUNCS_append_class-native = " gdkpixbuf_sstate_preinst" gdkpixbuf_sstate_preinst() { - if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]; then + if [ "${BB_CURRENTTASK}" = "populate_sysroot" ]; then rm -rf ${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/* fi }