[PATCH 0/2] add native wrappers for gconftool-2 and gtk-update-icon-cache

STALE5053d

3 messages, 1 author, 2012-12-17 · open the first message on its own page

[PATCH 0/2] add native wrappers for gconftool-2 and gtk-update-icon-cache

From: Laurentiu Palcu <hidden>
Date: 2012-12-17 12:47:29

Hi,

This patchset will fix do_rootfs errors/warnings when gtk+-native and gconf-native
packages are fetched from an sstate cache located on a remote build machine. In
this case, gconf backend directory and gdk-pixbuf loaders.cache file will still
have a path pointing to the STAGING_DIR_NATIVE of the remote machine.

Thanks,
Laurentiu

Laurentiu Palcu (2):
  gconf: add gconftool-2 native wrapper
  gtk+-native: add gtk-update-icon-cache wrapper

 meta/classes/gconf.bbclass              |    1 -
 meta/recipes-gnome/gnome/gconf_3.2.3.bb |    7 ++++++-
 meta/recipes-gnome/gtk+/gtk+_2.24.13.bb |    5 +++++
 3 files changed, 11 insertions(+), 2 deletions(-)

-- 
1.7.9.5

[PATCH 1/2] gconf: add gconftool-2 native wrapper

From: Laurentiu Palcu <hidden>
Date: 2012-12-17 12:47:33

This is needed when sstate cache is fetched from another build server.
In this case, the postinstall will fail because the backend libraries
path will be from the build server.

Signed-off-by: Laurentiu Palcu <redacted>
---
 meta/classes/gconf.bbclass              |    1 -
 meta/recipes-gnome/gnome/gconf_3.2.3.bb |    7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/classes/gconf.bbclass b/meta/classes/gconf.bbclass
index 38097bc..cc01bca 100644
--- a/meta/classes/gconf.bbclass
+++ b/meta/classes/gconf.bbclass

@@ -15,7 +15,6 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL = "1"
 
 gconf_postinst() {
 if [ "x$D" != "x" ]; then
-	export GCONF_BACKEND_DIR=${STAGING_LIBDIR_NATIVE}/GConf/2
 	export GCONF_CONFIG_SOURCE="xml::$D${sysconfdir}/gconf/gconf.xml.defaults"
 else
 	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`

diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
index f80c910..ef21624 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb

@@ -9,7 +9,7 @@ POLKIT_libc-uclibc = ""
 DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT} gobject-introspection-stub"
 DEPENDS_class-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native"
 
-PR = "r12"
+PR = "r13"
 
 inherit gnomebase gtk-doc

@@ -37,6 +37,11 @@ do_install_append() {
 	rm -f ${D}${libdir}/gio/*/*.*a
 }
 
+do_install_append_class-native() {
+	create_wrapper ${D}/${bindir}/gconftool-2 \
+		GCONF_BACKEND_DIR=${STAGING_LIBDIR_NATIVE}/GConf/2
+}
+
 # disable dbus-x11 when x11 isn't in DISTRO_FEATURES
 RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)}"
 RDEPENDS_${PN}_class-native = ""

-- 
1.7.9.5

[PATCH 2/2] gtk+-native: add gtk-update-icon-cache wrapper

From: Laurentiu Palcu <hidden>
Date: 2012-12-17 12:47:33

This is needed in order to point where the pixbuf loaders.cache is
located and avoid warnings like the one below that appear when the
sstate is fetched from a remote machine:

(gtk-update-icon-cache:8913): GdkPixbuf-WARNING **: Cannot open pixbuf
loader module file '/REMOTE/MACHINE/PATH/loaders.cache': No such file or directory

Signed-off-by: Laurentiu Palcu <redacted>
---
 meta/recipes-gnome/gtk+/gtk+_2.24.13.bb |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.13.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.13.bb
index bc88284..3b3d3c0 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.13.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.13.bb

@@ -42,6 +42,11 @@ BBCLASSEXTEND = "native"
 RRECOMMENDS_${PN}_class-native = ""
 DEPENDS_class-native = "glib-2.0-native atk-native pango-native cairo-native gdk-pixbuf-native"
 
+do_install_append_class-native () {
+	create_wrapper ${D}/${bindir}/gtk-update-icon-cache \
+		GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
+}
+
 python populate_packages_prepend () {
     prologue = d.getVar("postinst_prologue", True)

-- 
1.7.9.5

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help