Pass the mlprefix to postinst_intercept script

This is needed in order to have separate multilib intercept hooks.

(From OE-Core rev: 44eae13c164ca6e15a6013eafeab3eb44f24c8e0)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
index 9136c5a..325bcae 100644 (file)
--- a/meta/classes/fontcache.bbclass
+++ b/meta/classes/fontcache.bbclass
@@ -10,7 +10,7 @@ FONT_PACKAGES ??= "${PN}"
 
 fontcache_common() {
 if [ "x$D" != "x" ] ; then
-       $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} bindir=${bindir} \
+       $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} mlprefix=${MLPREFIX} bindir=${bindir} \
                libdir=${libdir} base_libdir=${base_libdir}
 else
        fc-cache

diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index 7f24d49..789fa38 100644 (file)
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -4,7 +4,7 @@ DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk
 
 gtk_icon_cache_postinst() {
 if [ "x$D" != "x" ]; then
-       $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} libdir=${libdir} \
+       $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} mlprefix=${MLPREFIX} libdir=${libdir} \
                base_libdir=${base_libdir}
 else
 
@@ -21,7 +21,7 @@ fi
 
 gtk_icon_cache_postrm() {
 if [ "x$D" != "x" ]; then
-       $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} libdir=${libdir} \
+       $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} mlprefix=${MLPREFIX} libdir=${libdir} \
                base_libdir=${base_libdir}
 else
        for icondir in /usr/share/icons/* ; do

diff --git a/meta/classes/pixbufcache.bbclass b/meta/classes/pixbufcache.bbclass
index 4e0f577..37bf812 100644 (file)
--- a/meta/classes/pixbufcache.bbclass
+++ b/meta/classes/pixbufcache.bbclass
@@ -10,7 +10,7 @@ PIXBUF_PACKAGES ??= "${PN}"
 
 pixbufcache_common() {
 if [ "x$D" != "x" ]; then
-       $INTERCEPT_DIR/postinst_intercept update_pixbuf_cache ${PKG} libdir=${libdir} \
+       $INTERCEPT_DIR/postinst_intercept update_pixbuf_cache ${PKG} mlprefix=${MLPREFIX} libdir=${libdir} \
                bindir=${bindir} base_libdir=${base_libdir}
 else