[PATCH 0/2] Bug fixes

[PATCH 0/2] Bug fixes

[edwin.zhai]

From: Zhai Edwin <edwin.zhai@intel.com>

All,
Patch of gnome-keyring to fix gsettings-data-convert seg fault, modified according to Saul's comments.
Another patch of matchbox-wm to remove the dependence between window manager and X session.

The following changes since commit 6a1b5c28f22bb07a0b7102eb88441d05768ec52e:

  self-hosted-image: Add builder user and mini X (2011-12-29 10:42:07 +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 (2):
  gnome-keyring: fix gsettings_data_convert seg fault
  matchbox-wm: Remove x-session-manager handling

 meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb   |   12 ++++++++++--
 .../matchbox-wm/matchbox-wm_1.2.bb                 |    9 ++-------
 .../matchbox-wm/matchbox-wm_git.bb                 |    9 ++-------
 3 files changed, 14 insertions(+), 16 deletions(-)

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

[edwin.zhai]

From: Zhai Edwin <edwin.zhai@intel.com>

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.

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
 meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb b/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb
index cc97225..c40044f 100644
--- a/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb
+++ b/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb
@@ -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_${PN} () {
+	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"
-- 
1.7.1

[PATCH 2/2] matchbox-wm: Remove x-session-manager handling

[edwin.zhai]

From: Zhai Edwin <edwin.zhai@intel.com>

Windows manager should be independent on session manager, especially when we
have multiple session manager like mini-x and matchbox session.

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
 .../matchbox-wm/matchbox-wm_1.2.bb                 |    9 ++-------
 .../matchbox-wm/matchbox-wm_git.bb                 |    9 ++-------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
index 84b966a..2628326 100644
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
@@ -2,7 +2,7 @@ SECTION = "x11/wm"
 DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPLv2.0+"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \
            file://configure_fix.patch \
@@ -11,7 +11,7 @@ SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/match
 
 S = "${WORKDIR}/matchbox-window-manager-${PV}"
 
-inherit autotools pkgconfig update-alternatives
+inherit autotools pkgconfig
 
 FILES_${PN} = "${bindir}/* \
 	       ${datadir}/matchbox \
@@ -20,11 +20,6 @@ FILES_${PN} = "${bindir}/* \
 	       ${datadir}/themes/Default/matchbox \
 	       ${datadir}/themes/MBOpus/matchbox"
 
-ALTERNATIVE_NAME = "x-session-manager"
-ALTERNATIVE_LINK = "${bindir}/x-session-manager"
-ALTERNATIVE_PATH = "${bindir}/matchbox-session"
-ALTERNATIVE_PRIORITY = "10"
-
 EXTRA_OECONF = " --enable-startup-notification \
                  --disable-xrm \
                  --enable-expat \
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb
index 5550dc2..ef9cf76 100644
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb
@@ -12,7 +12,7 @@ DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification ex
 
 SRCREV = "f4394eaed475de6e627d373c5b35ee2cf87072e3"
 PV = "1.2+git${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;protocol=git \
            file://configure_fix.patch;maxrev=1818 \
@@ -20,12 +20,7 @@ SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;protocol=git \
 
 S = "${WORKDIR}/git"
 
-inherit autotools pkgconfig update-alternatives
-
-ALTERNATIVE_NAME = "x-session-manager"
-ALTERNATIVE_LINK = "${bindir}/x-session-manager"
-ALTERNATIVE_PATH = "${bindir}/matchbox-session"
-ALTERNATIVE_PRIORITY = "10"
+inherit autotools pkgconfig
 
 FILES_${PN} = "${bindir}/* \
                ${datadir}/matchbox \
-- 
1.7.1

Re: [PATCH 0/2] Bug fixes

[Saul Wold]

On 12/29/2011 12:09 AM, edwin.zhai@intel.com wrote:
> From: Zhai Edwin<edwin.zhai@intel.com>
>
> All,
> Patch of gnome-keyring to fix gsettings-data-convert seg fault, modified according to Saul's comments.
> Another patch of matchbox-wm to remove the dependence between window manager and X session.
>
> The following changes since commit 6a1b5c28f22bb07a0b7102eb88441d05768ec52e:
>
>    self-hosted-image: Add builder user and mini X (2011-12-29 10:42:07 +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 (2):
>    gnome-keyring: fix gsettings_data_convert seg fault

Merged this one to OE-Core

>    matchbox-wm: Remove x-session-manager handling
>
We need a little more explaintion about why you are removing the U-A 
code from the matchbox-wm?

Thanks
	Sau!


>   meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb   |   12 ++++++++++--
>   .../matchbox-wm/matchbox-wm_1.2.bb                 |    9 ++-------
>   .../matchbox-wm/matchbox-wm_git.bb                 |    9 ++-------
>   3 files changed, 14 insertions(+), 16 deletions(-)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Re: [PATCH 0/2] Bug fixes

[Zhai, Edwin]

On 01/04/2012 07:56 AM, Saul Wold wrote:
> On 12/29/2011 12:09 AM, edwin.zhai@intel.com wrote:
>> From: Zhai Edwin<edwin.zhai@intel.com>
>>
>> All,
>> Patch of gnome-keyring to fix gsettings-data-convert seg fault,
>> modified according to Saul's comments.
>> Another patch of matchbox-wm to remove the dependence between window
>> manager and X session.
>>
>> The following changes since commit
>> 6a1b5c28f22bb07a0b7102eb88441d05768ec52e:
>>
>> self-hosted-image: Add builder user and mini X (2011-12-29 10:42:07
>> +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 (2):
>> gnome-keyring: fix gsettings_data_convert seg fault
>
> Merged this one to OE-Core
>
>> matchbox-wm: Remove x-session-manager handling
>>
> We need a little more explaintion about why you are removing the U-A
> code from the matchbox-wm?

matchbox-wm should not handles x-session, or else it conflict with 
mini-x-session. i.e. mini-x-session set x-session to mini-X, then 
matchbox-wm overrides it as matchbox-session. Without matchbox-session 
installed, mini-X fail start.

I have tested this patch and found no regression...


>
> Thanks
> Sau!
>
>
>> meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb | 12 ++++++++++--
>> .../matchbox-wm/matchbox-wm_1.2.bb | 9 ++-------
>> .../matchbox-wm/matchbox-wm_git.bb | 9 ++-------
>> 3 files changed, 14 insertions(+), 16 deletions(-)
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>>

Re: [PATCH 0/2] Bug fixes

[Richard Purdie]

On Wed, 2012-01-04 at 08:51 +0800, Zhai, Edwin wrote:
> On 01/04/2012 07:56 AM, Saul Wold wrote:
> > On 12/29/2011 12:09 AM, edwin.zhai@intel.com wrote:
> >> From: Zhai Edwin<edwin.zhai@intel.com>
> >>
> >> All,
> >> Patch of gnome-keyring to fix gsettings-data-convert seg fault,
> >> modified according to Saul's comments.
> >> Another patch of matchbox-wm to remove the dependence between window
> >> manager and X session.
> >>
> >> The following changes since commit
> >> 6a1b5c28f22bb07a0b7102eb88441d05768ec52e:
> >>
> >> self-hosted-image: Add builder user and mini X (2011-12-29 10:42:07
> >> +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 (2):
> >> gnome-keyring: fix gsettings_data_convert seg fault
> >
> > Merged this one to OE-Core
> >
> >> matchbox-wm: Remove x-session-manager handling
> >>
> > We need a little more explaintion about why you are removing the U-A
> > code from the matchbox-wm?
> 
> matchbox-wm should not handles x-session, or else it conflict with 
> mini-x-session. i.e. mini-x-session set x-session to mini-X, then 
> matchbox-wm overrides it as matchbox-session. Without matchbox-session 
> installed, mini-X fail start.
> 
> I have tested this patch and found no regression...

What I don't understand is that this is using update-alternatives so
surely you can just install an alternative that overrides this?

Looking at the code, shouldn't we move this alternative to the
matchbox-session recipe?

Cheers,

Richard

Re: [PATCH 0/2] Bug fixes

[Zhai, Edwin]

On Wed, Jan 04, 2012 at 11:22:28AM +0000, Richard Purdie wrote:
> On Wed, 2012-01-04 at 08:51 +0800, Zhai, Edwin wrote:
> > On 01/04/2012 07:56 AM, Saul Wold wrote:
> > > On 12/29/2011 12:09 AM, edwin.zhai@intel.com wrote:
> > >> From: Zhai Edwin<edwin.zhai@intel.com>
> > >>
> > >> All,
> > >> Patch of gnome-keyring to fix gsettings-data-convert seg fault,
> > >> modified according to Saul's comments.
> > >> Another patch of matchbox-wm to remove the dependence between window
> > >> manager and X session.
> > >>
> > >> The following changes since commit
> > >> 6a1b5c28f22bb07a0b7102eb88441d05768ec52e:
> > >>
> > >> self-hosted-image: Add builder user and mini X (2011-12-29 10:42:07
> > >> +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 (2):
> > >> gnome-keyring: fix gsettings_data_convert seg fault
> > >
> > > Merged this one to OE-Core
> > >
> > >> matchbox-wm: Remove x-session-manager handling
> > >>
> > > We need a little more explaintion about why you are removing the U-A
> > > code from the matchbox-wm?
> > 
> > matchbox-wm should not handles x-session, or else it conflict with 
> > mini-x-session. i.e. mini-x-session set x-session to mini-X, then 
> > matchbox-wm overrides it as matchbox-session. Without matchbox-session 
> > installed, mini-X fail start.
> > 
> > I have tested this patch and found no regression...
> 
> What I don't understand is that this is using update-alternatives so
> surely you can just install an alternative that overrides this?
> 
> Looking at the code, shouldn't we move this alternative to the
> matchbox-session recipe?

There are indential code in matchbox-session already. This patch is just 
removing duplicated code. I'll send out new patch to promote mini-x's 
alternative priority over matchbox-session.

Thanks,
Edwin

> 
> Cheers,
> 
> Richard
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
best rgds,
edwin

[PATCH 0/2] Bug fixes

[Laurentiu Palcu]

This patchset contains two bug fixes for:
	- Yocto #2467
	- Yocto #1465

Laurentiu Palcu (2):
  sanity.bbclass: warn the user if BBPATH contains wrong entries
  connman: make useradd parameters consistent with rootless X

 meta/classes/sanity.bbclass                   |   11 +++++++++++
 meta/recipes-connectivity/connman/connman.inc |    4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

-- 
1.7.9.5