1 files changed, 7 insertions, 14 deletions

diff --git a/meta/classes/pixbufcache.bbclass b/meta/classes/pixbufcache.bbclass
index 633a8757ed..aa9815cc6f 100644
--- a/meta/classes/pixbufcache.bbclass
+++ b/meta/classes/pixbufcache.bbclass
@@ -48,24 +48,17 @@ python populate_packages_append() {
 }
 
 gdkpixbuf_complete() {
-        GDK_PIXBUF_FATAL_LOADER=1 ${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache || exit 1
+GDK_PIXBUF_FATAL_LOADER=1 ${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache || exit 1
 }
 
-#
-# Add an sstate postinst hook to update the cache for native packages.
-# An error exit during populate_sysroot_setscene allows bitbake to
-# try to recover by re-building the package.
-#
 DEPENDS_append_class-native = " gdk-pixbuf-native"
-SSTATEPOSTINSTFUNCS_append_class-native = " pixbufcache_sstate_postinst"
+SYSROOT_PREPROCESS_FUNCS_append_class-native = " pixbufcache_sstate_postinst"
 
 # See base.bbclass for the other half of this
 pixbufcache_sstate_postinst() {
-        if [ "${BB_CURRENTTASK}" = "populate_sysroot" ]; then
-                ${gdkpixbuf_complete}
-        elif [ "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]; then
-                if [ -x ${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders ]; then
-                        echo "${gdkpixbuf_complete}" >> ${STAGING_DIR}/sstatecompletions
-                fi
-        fi
+        mkdir -p ${SYSROOT_DESTDIR}${bindir}
+        dest=${SYSROOT_DESTDIR}${bindir}/postinst-useradd-${PN}
+        echo '#!/bin/sh' > $dest
+        echo "${gdkpixbuf_complete}" >> $dest
+        chmod 0755 $dest
 }