Skip to contentSkip to conversation

Fix gsettings-data-convert seg fault

PATCH In review [email protected] 2 participants 3 messages Dec 27, 2011

lore
Share & tools
lore
#0 lore raw

cover Fix gsettings-data-convert seg fault

From: Zhai Edwin <[email protected]>

All,
This is the fix for [YOCTO #1779]. Seg fault comes from missing of "gschemas.compiled" made by glib-compile-schemas.

Pls. help to pull.
Thanks,
Edwin

The following changes since commit 0ef108a0152bb4893741ac95857525fc50b8d3a6:

self-hosted-image: Add builder user and mini X (2011-12-22 19:28:56 +0800)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib gzhai/build-appliance2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/build-appliance2

Zhai Edwin (1):
gnome-keyring: fix gsettings_data_convert seg fault

 meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
#1 lore raw

PATCH 1/1 gnome-keyring: fix gsettings_data_convert seg fault

From: Zhai Edwin <[email protected]>

gsttings_data_convert cause seg fault as gnome-keyring's schema is not installed properly. As a fix, running glib-compile-schemas from glib-utils to made "gschemas.compiled".

[YOCTO #1779] got fixed.

---
 meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb +10 -2
index cc97225..a92ac4d 100644
@@ -11,12 +11,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 
 SECTION = "x11/gnome"
 
-PR = "r3"
+PR = "r4"
 
 inherit autotools gnome pkgconfig
 
 DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-RDEPENDS_${PN} = "libgnome-keyring"
+RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils"
 
 EXTRA_OECONF = "--disable-gtk-doc ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)}"
 
@@ -30,6 +30,14 @@ do_install_append () {
 	install -m 0644 ${WORKDIR}/org.gnome.keyring.service ${D}${datadir}/dbus-1/services
 }
 
+pkg_postinst_gnome-keyring () {
+if [ "x$D" != "x" ]; then
+    exit 1
+fi
+
+test -x ${bindir}/glib-compile-schemas && glib-compile-schemas  ${datadir}/glib-2.0/schemas
+}
+
 FILES_${PN} += "${datadir}/dbus-1/services ${datadir}/gcr ${base_libdir}/security/*.so"
 FILES_${PN}-dbg += "${libdir}/gnome-keyring/standalone/.debug/ ${base_libdir}/security/*.la"
 FILES_${PN}-dbg += "${libdir}/gnome-keyring/devel/.debug/ ${base_libdir}/security/.debug"
Signature · 1 line
1.7.1
#2 lore raw

Re: [PATCH 1/1] gnome-keyring: fix gsettings_data_convert seg fault

Quoted 33 lines · On 12/27/2011 05:06 AM, [email protected] wrote:

From: Zhai Edwin<[email protected]>

gsttings_data_convert cause seg fault as gnome-keyring's schema is not installed properly. As a fix, running glib-compile-schemas from glib-utils to made "gschemas.compiled".

[YOCTO #1779] got fixed.

---
  meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb |   12 ++++++++++--
  1 files changed, 10 insertions(+), 2 deletions(-)
meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb +2 -2
index cc97225..a92ac4d 100644
@@ -11,12 +11,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 
  SECTION = "x11/gnome"
 
-PR = "r3"
+PR = "r4"
 
  inherit autotools gnome pkgconfig
 
  DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-RDEPENDS_${PN} = "libgnome-keyring"
+RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils"
 
  EXTRA_OECONF = "--disable-gtk-doc ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)}"
 

meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb do_install_append () { · line 33

Quoted 4 lines
meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb +1 -0
@@ -30,6 +30,14 @@ do_install_append () {
  	install -m 0644 ${WORKDIR}/org.gnome.keyring.service ${D}${datadir}/dbus-1/services
  }
 
+pkg_postinst_gnome-keyring () {

I think you can use pkg_postinst_${PN}

meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb do_install_append () { · line 40

Quoted 7 lines
meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb +7 -0
+if [ "x$D" != "x" ]; then
+    exit 1
+fi
+
+test -x ${bindir}/glib-compile-schemas&&  glib-compile-schemas  ${datadir}/glib-2.0/schemas
+}
+

I think you are missing tabs here, I believe the standard for script functions is to have tabs not spaces also.

Sau!

Quoted 3 lines
meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb +0 -0
  FILES_${PN} += "${datadir}/dbus-1/services ${datadir}/gcr ${base_libdir}/security/*.so"
  FILES_${PN}-dbg += "${libdir}/gnome-keyring/standalone/.debug/ ${base_libdir}/security/*.la"
  FILES_${PN}-dbg += "${libdir}/gnome-keyring/devel/.debug/ ${base_libdir}/security/.debug"