summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-04-26 11:04:02 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-22 17:14:00 +0100
commit8b357d843a496ba9c0d2e78d548caa7d76166bbc (patch)
tree55a6edaa90c1402408e6775378714fef76a8b0bf /meta
parentfae83fa753f13e42322ced5d926f90de8ba0077c (diff)
downloadpoky-8b357d843a496ba9c0d2e78d548caa7d76166bbc.tar.gz
Pass the mlprefix to postinst_intercept script
This is needed in order to have separate multilib intercept hooks. (From OE-Core master rev: 44eae13c164ca6e15a6013eafeab3eb44f24c8e0) (From OE-Core rev: 0db4db02486926ef5d0b1cee92f963cf0f1e64fc) 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.bbclass2
-rw-r--r--meta/classes/gtk-icon-cache.bbclass4
-rw-r--r--meta/classes/pixbufcache.bbclass2
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
11fontcache_common() { 11fontcache_common() {
12if [ "x$D" != "x" ] ; then 12if [ "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}
15else 15else
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
5gtk_icon_cache_postinst() { 5gtk_icon_cache_postinst() {
6if [ "x$D" != "x" ]; then 6if [ "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}
9else 9else
10 10
@@ -21,7 +21,7 @@ fi
21 21
22gtk_icon_cache_postrm() { 22gtk_icon_cache_postrm() {
23if [ "x$D" != "x" ]; then 23if [ "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}
26else 26else
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
11pixbufcache_common() { 11pixbufcache_common() {
12if [ "x$D" != "x" ]; then 12if [ "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}
15else 15else
16 16