Skip to contentSkip to conversation

glib-2.0 changes for nativesdk and packaging

PATCH New Nathan Rossi 1 participant 3 messages Feb 22, 2017

lore
Share & tools
lore

Nathan Rossi

author
#0 lore raw

v2 cover 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.
---
Changes in v2:
* Rebased on top of current master

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, 7 insertions(+), 7 deletions(-)
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH v2 1/2 glib-2.0/glib.inc: Only apply MLPREFIX renaming to class-target

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-'.

Signed-off-by Nathan Rossi <[email protected]>
---
 meta/recipes-core/glib-2.0/glib.inc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
meta/recipes-core/glib-2.0/glib.inc +5 -5
index a5db455248..bbac7ebd32 100644
@@ -91,11 +91,6 @@ do_install_append () {
 	if [ -f ${D}${bindir}/glib-mkenums ]; then
 		sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums
 	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 () {

@@ -106,6 +101,11 @@ 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
 }
 
 do_install_append_libc-musl () {
Signature · 1 line
2.11.0
author
#2 lore raw

PATCH v2 2/2 glib-2.0/glib.inc: If 'charset.alias' exists drop it

In reply to Nathan Rossi

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.

Signed-off-by Nathan Rossi <[email protected]>
---
 meta/recipes-core/glib-2.0/glib.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
meta/recipes-core/glib-2.0/glib.inc +4 -4
index bbac7ebd32..6600d33dcd 100644
@@ -91,6 +91,10 @@ do_install_append () {
 	if [ -f ${D}${bindir}/glib-mkenums ]; then
 		sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums
 	fi
+
+	if [ -e ${D}${libdir}/charset.alias ]; then
+		rm -f ${D}${libdir}/charset.alias
+	fi
 }
 
 do_install_append_class-target () {

@@ -108,10 +112,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 \
Signature · 1 line
2.11.0