Message ID | e50f2bf59b64accf580fc2df96e1fbc9eb6cfb98.1338323483.git.ross.burton@intel.com |
---|---|
State | Accepted |
Commit | 949861c1f09e3a92430c1494b62b9698c7d2a862 |
Headers | show |
diff --git a/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch b/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch index aa7a910..707b3ca 100644 --- a/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch +++ b/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch @@ -1,24 +1,20 @@ -Some platform (like atom-pc) enables rootless X, -thus we need to add the xuser in the list. +Because Poky doesn't support at_console we need to special-case the session +user. Upstream-Status: Inappropriate [configuration] -Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> +Signed-off-by: Ross Burton <ross.burton@intel.com> diff --git a/src/connman-dbus.conf b/src/connman-dbus.conf -index 98a773e..cbe2ba3 100644 +index 98a773e..466809c 100644 --- a/src/connman-dbus.conf +++ b/src/connman-dbus.conf -@@ -8,6 +8,13 @@ +@@ -8,6 +8,9 @@ <allow send_interface="net.connman.Counter"/> <allow send_interface="net.connman.Notification"/> </policy> + <policy user="xuser"> -+ <allow own="net.connman"/> + <allow send_destination="net.connman"/> -+ <allow send_interface="net.connman.Agent"/> -+ <allow send_interface="net.connman.Counter"/> -+ <allow send_interface="net.connman.Notification"/> + </policy> <policy at_console="true"> <allow send_destination="net.connman"/>
On Tue, May 29, 2012 at 1:43 PM, Ross Burton <ross.burton@intel.com> wrote: > > > -Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> > +Signed-off-by: Ross Burton <ross.burton@intel.com> why remove the old sign-off ?
On 30 May 2012 03:59, Khem Raj <raj.khem@gmail.com> wrote: > On Tue, May 29, 2012 at 1:43 PM, Ross Burton <ross.burton@intel.com> wrote: >> >> >> -Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> >> +Signed-off-by: Ross Burton <ross.burton@intel.com> > > why remove the old sign-off ? The patches are semantically different - Dongxiao's solution was to copy the root rules, my solution is to copy the at_console rules. He didn't sign off my solution, so I removed his sign-off. Ross
On Wednesday, May 30, 2012, Burton, Ross wrote: > On 30 May 2012 03:59, Khem Raj <raj.khem@gmail.com <javascript:;>> wrote: > > On Tue, May 29, 2012 at 1:43 PM, Ross Burton <ross.burton@intel.com<javascript:;>> > wrote: > >> > >> > >> -Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com <javascript:;>> > >> +Signed-off-by: Ross Burton <ross.burton@intel.com <javascript:;>> > > > > why remove the old sign-off ? > > The patches are semantically different - Dongxiao's solution was to > copy the root rules, my solution is to copy the at_console rules. He > didn't sign off my solution, so I removed his sign-off. > > You could have created a new patch and deleted the old then for clarity > Ross > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org <javascript:;> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >
On 30 May 2012 14:00, Khem Raj <raj.khem@gmail.com> wrote:
> You could have created a new patch and deleted the old then for clarity
The filename is sensible, the comment was entirely rewritten, as was
the actual delta of the patch. I don't see how this could be any more
clear really.
Ross
On Wednesday, May 30, 2012, Burton, Ross wrote: > On 30 May 2012 14:00, Khem Raj <raj.khem@gmail.com <javascript:;>> wrote: > > You could have created a new patch and deleted the old then for clarity > > The filename is sensible, the comment was entirely rewritten, as was > the actual delta of the patch. I don't see how this could be any more > clear really. > > Not an issue. usually editing same patch gives the impression of update not rewrite But you explained it > Ross > > _______________________________________________ > Openembedded-core mailing lists > Openembedded-core@lists.openembedded.org <javascript:;> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >
On Tue, May 29, 2012 at 1:43 PM, Ross Burton <ross.burton@intel.com> wrote: > --- > .../connman/add_xuser_dbus_permission.patch | 14 +++++--------- > 1 files changed, 5 insertions(+), 9 deletions(-) > > diff --git a/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch b/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch > index aa7a910..707b3ca 100644 > --- a/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch > +++ b/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch > @@ -1,24 +1,20 @@ > -Some platform (like atom-pc) enables rootless X, > -thus we need to add the xuser in the list. > +Because Poky doesn't support at_console we need to special-case the session > +user. > > Upstream-Status: Inappropriate [configuration] > > -Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> > +Signed-off-by: Ross Burton <ross.burton@intel.com> > > diff --git a/src/connman-dbus.conf b/src/connman-dbus.conf > -index 98a773e..cbe2ba3 100644 > +index 98a773e..466809c 100644 > --- a/src/connman-dbus.conf > +++ b/src/connman-dbus.conf > -@@ -8,6 +8,13 @@ > +@@ -8,6 +8,9 @@ > <allow send_interface="net.connman.Counter"/> > <allow send_interface="net.connman.Notification"/> > </policy> > + <policy user="xuser"> > -+ <allow own="net.connman"/> > + <allow send_destination="net.connman"/> > -+ <allow send_interface="net.connman.Agent"/> > -+ <allow send_interface="net.connman.Counter"/> > -+ <allow send_interface="net.connman.Notification"/> > + </policy> > <policy at_console="true"> > <allow send_destination="net.connman"/> > -- > 1.7.7.6 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core Merged into OE-Core Thanks -b