glib-2.0 changes for nativesdk and packaging

This series contains two patches. The first fixes up the renaming of gio-querymodules so that it is only applied to class-target (so that 'nativesdk-gio-query-modules' is not generated). The second change makes the removal of 'charset.alias' occur for all targets including musl since it is not packaged by default and not desired in cases that it is generated.

Nathan Rossi (2):
glib-2.0/glib.inc: Only apply MLPREFIX renaming to class-target glib-2.0/glib.inc: If 'charset.alias' exists drop it

 meta/recipes-core/glib-2.0/glib.inc | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

2.11.0

When renaming the 'gio-querymodules' binary to prefix with the current MLPREFIX, only do this for target packages where the MLPREFIX makes sense. This skips renaming for nativesdk targets which have MLPREFIX set to 'nativesdk-'.

---
 meta/recipes-core/glib-2.0/glib.inc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

index cb6aca702f..d0e0c256ba 100644
@@ -97,11 +97,13 @@ do_install_append () {
 			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
+do_install_append_class-target () {
+	# 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_libc-musl () {

2.11.0

Delete the 'charset.alias' file during the do_install task if it exists. This file is not shipped in any packages and on the targets that it is generated (musl and mingw32) it is undesired.

---
 meta/recipes-core/glib-2.0/glib.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

index d0e0c256ba..3367ac9153 100644
@@ -97,6 +97,10 @@ do_install_append () {
 			rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test
 		fi
 	fi
+
+	if [ -e ${D}${libdir}/charset.alias ]; then
+		rm -f ${D}${libdir}/charset.alias
+	fi
 }
 
 do_install_append_class-target () {

@@ -106,10 +110,6 @@ do_install_append_class-target () {
 	fi
 }
 
-do_install_append_libc-musl () {
-	rm -f ${D}${libdir}/charset.alias
-}
-
 RDEPENDS_${PN}-ptest += "\
             gnome-desktop-testing \
             tzdata \

2.11.0

Ping, any comments or feedback for this series?

Thanks,
Nathan

Sorry, looks good, I'll stage them shortly.

Ross