From 4a3d4b8d7a6f5bb177ddd9844313e153cd860cbe Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Fri, 26 Apr 2013 11:04:02 +0300 Subject: [PATCH] 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/fontcache.bbclass | 2 +- meta/classes/gtk-icon-cache.bbclass | 4 ++-- meta/classes/pixbufcache.bbclass | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass index 9136c5a886..325bcae58f 100644 --- 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 7f24d49ec8..789fa38a16 100644 --- 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 4e0f57729c..37bf812b07 100644 --- 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