diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-04-26 11:04:02 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-29 14:45:10 +0100 |
commit | 4a3d4b8d7a6f5bb177ddd9844313e153cd860cbe (patch) | |
tree | 707c036ece5b4f847093167ee837073cb05d0194 /meta | |
parent | 1a438afd69250bb9ce1555a9b84f1dd3cfb41719 (diff) | |
download | poky-4a3d4b8d7a6f5bb177ddd9844313e153cd860cbe.tar.gz |
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>
Diffstat (limited to 'meta')
-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}" | |||
10 | 10 | ||
11 | fontcache_common() { | 11 | fontcache_common() { |
12 | if [ "x$D" != "x" ] ; then | 12 | if [ "x$D" != "x" ] ; then |
13 | $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} bindir=${bindir} \ | 13 | $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} mlprefix=${MLPREFIX} bindir=${bindir} \ |
14 | libdir=${libdir} base_libdir=${base_libdir} | 14 | libdir=${libdir} base_libdir=${base_libdir} |
15 | else | 15 | else |
16 | fc-cache | 16 | 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 | |||
4 | 4 | ||
5 | gtk_icon_cache_postinst() { | 5 | gtk_icon_cache_postinst() { |
6 | if [ "x$D" != "x" ]; then | 6 | if [ "x$D" != "x" ]; then |
7 | $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} libdir=${libdir} \ | 7 | $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} mlprefix=${MLPREFIX} libdir=${libdir} \ |
8 | base_libdir=${base_libdir} | 8 | base_libdir=${base_libdir} |
9 | else | 9 | else |
10 | 10 | ||
@@ -21,7 +21,7 @@ fi | |||
21 | 21 | ||
22 | gtk_icon_cache_postrm() { | 22 | gtk_icon_cache_postrm() { |
23 | if [ "x$D" != "x" ]; then | 23 | if [ "x$D" != "x" ]; then |
24 | $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} libdir=${libdir} \ | 24 | $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} mlprefix=${MLPREFIX} libdir=${libdir} \ |
25 | base_libdir=${base_libdir} | 25 | base_libdir=${base_libdir} |
26 | else | 26 | else |
27 | for icondir in /usr/share/icons/* ; do | 27 | 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}" | |||
10 | 10 | ||
11 | pixbufcache_common() { | 11 | pixbufcache_common() { |
12 | if [ "x$D" != "x" ]; then | 12 | if [ "x$D" != "x" ]; then |
13 | $INTERCEPT_DIR/postinst_intercept update_pixbuf_cache ${PKG} libdir=${libdir} \ | 13 | $INTERCEPT_DIR/postinst_intercept update_pixbuf_cache ${PKG} mlprefix=${MLPREFIX} libdir=${libdir} \ |
14 | bindir=${bindir} base_libdir=${base_libdir} | 14 | bindir=${bindir} base_libdir=${base_libdir} |
15 | else | 15 | else |
16 | 16 | ||