summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-04-03 18:45:24 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-05 14:48:59 +0100
commit0792540170b6150a0c5fe8586bb8012affc3f90e (patch)
tree6fb8338b86e44d3c8edf7b23d6322fcb9e76e396
parentd99e819a6cbde6d1116c434ddba4c5f8eca7e6d8 (diff)
downloadopenembedded-core-0792540170b6150a0c5fe8586bb8012affc3f90e.tar.gz
glib-2.0/glib.inc: apply MLPREFIX renaming to all package classes
Now that we have postinst intercept execution working for SDK generation, adding MLPREFIX again makes sense in all cases, as the intercepts do require that it is there. This reverts commit 4ffb728df4bdf21daef31d89cfa5771eaf0d90f8. Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 7e062eeb5d..b7c32e64bc 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -104,6 +104,11 @@ do_install_append () {
if [ -e ${D}${libdir}/charset.alias ]; then
rm -f ${D}${libdir}/charset.alias
fi
+
+ # Make sure gio-querymodules is unique among multilibs
+ if test "x${MLPREFIX}" != "x"; then
+ mv ${D}${libexecdir}/gio-querymodules ${D}${libexecdir}/${MLPREFIX}gio-querymodules
+ fi
}
do_install_append_class-target () {
@@ -114,11 +119,6 @@ do_install_append_class-target () {
rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test
fi
fi
-
- # Make sure gio-querymodules is unique among multilibs
- if test "x${MLPREFIX}" != "x"; then
- mv ${D}${libexecdir}/gio-querymodules ${D}${libexecdir}/${MLPREFIX}gio-querymodules
- fi
}
CODEGEN_PYTHON_RDEPENDS = "python3 python3-distutils python3-xml"