diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-26 18:12:17 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-28 12:00:31 +0100 |
| commit | 00f0d2bfa0a05232a2926f21ef8fe533f436185d (patch) | |
| tree | bfb0e2faee86d56f381771e31aaa8eb103482b81 /meta/recipes-gnome | |
| parent | 452237b3f58d8839fbd80d7b557cf72f846a7002 (diff) | |
| download | openembedded-core-contrib-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')
| -rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb | 2 |
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 } |