<br><div class="gmail_quote">On Fri, Sep 30, 2011 at 12:52 PM, Martin Jansa <span dir="ltr"><<a href="mailto:martin.jansa@gmail.com">martin.jansa@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
<div><div></div><div class="h5">On Fri, Sep 30, 2011 at 10:17:25AM +0100, Richard Purdie wrote:<br>
> On Fri, 2011-09-30 at 09:27 +0200, Martin Jansa wrote:<br>
> > * /etc/X11/Xusername handling should be moved to x11-common so the same<br>
> > username and logic is used from initscript and when user starts it<br>
> > from terminal<br>
> ><br>
> > Signed-off-by: Martin Jansa <<a href="mailto:Martin.Jansa@gmail.com">Martin.Jansa@gmail.com</a>><br>
> > ---<br>
> > .../x11-common/xserver-nodm-init/xserver-nodm | 30 ++++++--------------<br>
> > 1 files changed, 9 insertions(+), 21 deletions(-)<br>
> ><br>
> > diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm<br>
> > index c707a4b..9cd7904 100755<br>
> > --- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm<br>
> > +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm<br>
> > @@ -8,10 +8,7 @@<br>
> > # Default-Stop: 0 1 6<br>
> > ### END INIT INFO<br>
> ><br>
> > -killproc() { # kill the named process(es)<br>
> > - pid=`/bin/pidof $1`<br>
> > - [ "$pid" != "" ] && kill $pid<br>
> > -}<br>
> > +. /etc/init.d/functions<br>
> ><br>
> > read CMDLINE < /proc/cmdline<br>
> > for x in $CMDLINE; do<br>
> > @@ -25,25 +22,16 @@ done<br>
> ><br>
> > case "$1" in<br>
> > start)<br>
> > + # We don't want this script to block the rest of the boot process<br>
> > + if [ "$2" != "background" ]; then<br>
> > + $0 $1 background &<br>
> > + else<br>
> > . /etc/profile<br>
> > - username=root<br>
> > +<br>
> > echo "Starting Xserver"<br>
> > - if [ -f /etc/X11/Xusername ]; then<br>
> > - username=`cat /etc/X11/Xusername`<br>
> > - # setting for rootless X<br>
> > - chmod o+w /var/log<br>
> > - chmod g+r /dev/tty[0-3]<br>
> > - chmod o+rw /dev/input/*<br>
> > - # hidraw device is probably needed<br>
> > - if [ -e /dev/hidraw0 ]; then<br>
> > - chmod o+rw /dev/hidraw*<br>
> > - fi<br>
> > - fi<br>
> > - # Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211]<br>
> > - su -l -c '/etc/X11/Xserver&' $username<br>
> > - # Wait for the desktop to say its finished loading<br>
> > - # before loading the rest of the system<br>
> > - # dbus-wait org.matchbox_project.desktop Loaded<br>
> > + . /etc/X11/xserver-common<br>
> > + xinit /etc/X11/Xsession -- `which $XSERVER` $ARGS >/var/log/Xsession.log 2>&1<br>
> > + fi<br>
> > ;;<br>
]> ><br>
> > stop)<br>
><br>
> This is not "merge some changes from meta-oe", this is "overwrite<br>
> whatever is in oe-core with meta-oe" :(.<br>
><br>
> The above wipes out rootless X support.<br>
<br>
</div></div>Sorry about that and please ignore this patch..<br>
<br>
I've started moving rootless X support from not only xserver-nodm-init<br>
to unified x11-common/xserver-common, but because I didn't finish it<br>
I've removed xserver-common from this patchset and sent it here for<br>
review (ie because ant asked me to).<br>
<div class="im"><br></div></blockquote><div><br>Yes, I'm to blame for that :)<br>Thanks again JaMa for your work.<br><br>The point is we are trying to reduce the delta between oe-core and meta-oe.<br>This has to be done asap, before drifting too much.<br>
I have atm three cases of recipes present in both layers whitout any reason (there are more, I know):<br><br>- udev<br>- xserver<br>- tzdata/tzcode<br><br>I hope the oe-core maintainers will give a look at meta-oe when updating their recipes.<br>
<br> </div><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;"><div class="im">
> I've noticed this theme in several of the patches where for example a<br>
> decent long DESCRIPTION and a separate short SUMMARY are replaced with a<br>
> single one line SUMMARY.<br>
<br>
</div>I'll recheck this, but I was really trying to keep whatever was better<br>
in orginal recipes, so if it's the case somewhere I'll fix it and send<br>
updated patch, sorry about that.<br>
<div class="im"><br>
> The fact you've done this means I'm going to have to go over every line<br>
> of changes in this and double check what is happening. Some of the<br>
> patches look ok but some like this are not.<br>
<br>
</div>BTW: meta-oe patchset wasn't sent because git was offline..<br>
<br></blockquote><div>Bad luck. Please insist!<br><br></div><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
Regards,<br>
<font color="#888888"><br>
--<br>
Martin 'JaMa' Jansa jabber: <a href="mailto:Martin.Jansa@gmail.com">Martin.Jansa@gmail.com</a><br>
</font><br>_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core" target="_blank">http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core</a><br>
<br></blockquote></div><br>Regards<br><br>Andrea<br>