From 34afa37f5f4765f73c63d440351a5cb63008a5cc Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 3 Apr 2018 18:45:24 +0300 Subject: 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. (From OE-Core rev: 0792540170b6150a0c5fe8586bb8012affc3f90e) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-core/glib-2.0/glib.inc | 10 +++++----- 1 file 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" -- cgit v1.2.3-54-g00ecf