summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-26 18:12:17 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-28 11:58:33 +0100
commit4e89fe719b3e237d84b7ceba2a8c83a768baa714 (patch)
tree379cc072be8db22cf268c4501c79a8fbf47c963e
parente56bda210e216251c04d872211081a89ac06dde6 (diff)
downloadopenembedded-core-4e89fe719b3e237d84b7ceba2a8c83a768baa714.tar.gz
openembedded-core-4e89fe719b3e237d84b7ceba2a8c83a768baa714.tar.bz2
openembedded-core-4e89fe719b3e237d84b7ceba2a8c83a768baa714.zip
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 <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb2
1 files changed, 1 insertions, 1 deletions
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
}