Patchwork [0/2] Bug fixes

login
register
mail settings
Submitter Zhai, Edwin
Date Dec. 29, 2011, 8:09 a.m.
Message ID <cover.1325145929.git.edwin.zhai@intel.com>
Download mbox
Permalink /patch/17773/
State New
Headers show

Pull-request

git://git.pokylinux.org/poky-contrib gzhai/build-appliance2

Comments

Zhai, Edwin - Dec. 29, 2011, 8:09 a.m.
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(-)
Saul Wold - Jan. 3, 2012, 11:56 p.m.
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
>
Zhai, Edwin - Jan. 4, 2012, 12:51 a.m.
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
>>
Richard Purdie - Jan. 4, 2012, 11:22 a.m.
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
Zhai, Edwin - Jan. 5, 2012, 4:32 a.m.
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