diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-04-26 11:04:02 +0300 |
|---|---|---|
| committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-05-20 16:06:13 +0100 |
| commit | 0db4db02486926ef5d0b1cee92f963cf0f1e64fc (patch) | |
| tree | c87ad9d02b01879a23edef7ee88e956024c5b1dd | |
| parent | 324bb71d769955690d575b85f5a6670314fdd1f1 (diff) | |
| download | openembedded-core-0db4db02486926ef5d0b1cee92f963cf0f1e64fc.tar.gz openembedded-core-0db4db02486926ef5d0b1cee92f963cf0f1e64fc.tar.bz2 openembedded-core-0db4db02486926ef5d0b1cee92f963cf0f1e64fc.zip | |
Pass the mlprefix to postinst_intercept script
This is needed in order to have separate multilib intercept hooks.
(From OE-Core master 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>
| -rw-r--r-- | meta/classes/fontcache.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/gtk-icon-cache.bbclass | 4 | ||||
| -rw-r--r-- | 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 |