summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gdk-pixbuf
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 12:00:31 +0100
commit00f0d2bfa0a05232a2926f21ef8fe533f436185d (patch)
treebfb0e2faee86d56f381771e31aaa8eb103482b81 /meta/recipes-gnome/gdk-pixbuf
parent452237b3f58d8839fbd80d7b557cf72f846a7002 (diff)
downloadpoky-00f0d2bfa0a05232a2926f21ef8fe533f436185d.tar.gz
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. (From OE-Core rev: 4e89fe719b3e237d84b7ceba2a8c83a768baa714) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gdk-pixbuf')
-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"
106SYSROOT_PREPROCESS_FUNCS_append_class-native = " gdkpixbuf_sstate_preinst" 106SYSROOT_PREPROCESS_FUNCS_append_class-native = " gdkpixbuf_sstate_preinst"
107 107
108gdkpixbuf_sstate_preinst() { 108gdkpixbuf_sstate_preinst() {
109 if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]; then 109 if [ "${BB_CURRENTTASK}" = "populate_sysroot" ]; then
110 rm -rf ${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/* 110 rm -rf ${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/*
111 fi 111 fi
112} 112}