Re: [Sugar-devel] Experimental work... updated.
Thanks, Michael, this has been the first viable method for getting Sugar 0.88 working on an XO-1.5 ... I'd been needing that for some time; to check new bugs we find in 0.84 against 0.88, and to develop changes against 0.88 after I've done them on 0.84. Double-apologies then for all the rough edges; since I never expected the work to be useful to anyone but me, I spent rather less time polishing it than is usual for me. The missing package was python-decorator. It's not in the build dependencies in the Makefile. See attached patch. Merged; thanks for the patch! The next stop was more interesting ... assuming that I would no longer need any of the existing Sugar packages, I had removed them prior to make install, using this command: rpm -e \ sugar-datastore-0.84.1-1.fc11.i586 \ sugar-toolkit-0.84.9-2.fc11.i586 \ sugar-artwork-0.84.1-3.fc11.i586 \ sugar-presence-service-0.84.0-2.fc11.noarch \ sugar-0.84.15-1.fc11.i586 \ sugar-base-0.84.1-1.fc11.i586 \ sugar-update-control-0.23-1.fc11.noarch \ olpc-library-2.0.3-1.fc11.noarch \ ds-backup-client-0.11.1.g71d2f16-1.olpc3.noarch \ olpc-switch-desktop-0.7-1.fc11.noarch I only removed the sugar-* packages (via rpm -e --nodeps). I haven't done any work to replace the others yet. The result was failure to render the home window; because the computer-xo icon could not be found. Log from /tmp/olpc-dm-client.log placed here: http://dev.laptop.org/~quozl/2010-04-29-olpc-dm-client.log I'm not sure why this has happened, but my guess is that there is a file used that isn't installed by make install, but left over from the RPMs. When I reinstalled the removed RPMs, it all began to work again. I took a quick look at this traceback and at my Makefile and I think that it might be a simple order of operations bug in the Makefile. Does the attached patch fix the problem for you? Regards, Michael From b3d094c5d63383fd32a267aebb62b6f98abbca51 Mon Sep 17 00:00:00 2001 From: Michael Stone mich...@laptop.org Date: Thu, 29 Apr 2010 01:56:47 -0400 Subject: [PATCH] Update the gtk icon cache after all icons are installed. --- Makefile |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 581f1dc..91d886f 100644 --- a/Makefile +++ b/Makefile @@ -240,7 +240,6 @@ install-slow: all (export GCONF_CONFIG_SOURCE=`$(GCONFTOOL2) --get-default-source`;\ $(GCONFTOOL2) --makefile-install-rule $(SCHEMADIR)/sugar.schemas); $(UPDATE_MIME_DATABASE) $(DATADIR)/mime; - gtk-update-icon-cache -f $(ICONDIR) for d in $(shell ls artwork/icons/scalable); do \ install -d $(ICONDIR)/scalable/$$d; \ for f in artwork/icons/scalable/$$d/*; do \ @@ -248,6 +247,7 @@ install-slow: all done; \ (cd $(ICONDIR)/scalable $(ICONMAP) -c $$d) \ done + gtk-update-icon-cache -f $(ICONDIR) install: install-fast install-slow -- 1.7.0 ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Experimental work... updated.
On 4/28/10, Daniel Drake d...@laptop.org wrote: On 28 April 2010 11:57, Michael Stone mich...@laptop.org wrote: You couldn't find logs of the failure because olpc-dm is redirecting stdout and stderr to /dev/null. I don't think this is true. I wrote from memory and, as you say, the details of what I wrote are inaccurate: http://dev.laptop.org/git/projects/olpc-utils/tree/src/olpc-dm.c#n348 in that stdout and stderr are redirected to log files rather than to /dev/null. Looking over my notes, I compiled with make -f Makefile.build CFLAGS=-DDEBUG This removed the freopen() calls. Regards, Michael ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Experimental work... updated.
On Tue, Apr 27, 2010 at 10:46:05PM -0400, Michael Stone wrote: I particularly like that I can test sugar*-0.88 directly on my XO by running something comparable to yum install git-core gcc glibc-devel make vim git clone git://dev.laptop.org/users/mstone/sugar; cd sugar make xo-builddeps env PREFIX=/usr ./configure make; make install All these steps worked on XO-1.5 os121, but the next step escapes me. At the moment, olpc-session starts, Sugar starts with the nickname prompt, but doesn't proceed beyond colour choice dialog. Looking at logs, presence service isn't sticking around once it is launched by D-Bus. I couldn't find any logs of the failure. Looking at an strace of a startx with .xinitrc containing olpc-session, the presence service isn't passing import decorator, so I'll look into that. Maybe it needs another package. Oh, and the colour choice XO icon wasn't there. Just the click to change message, back and forward buttons. -- James Cameron http://quozl.linux.org.au/ ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Experimental work... updated.
On Tue, Apr 27, 2010 at 10:46:05PM -0400, Michael Stone wrote: I particularly like that I can test sugar*-0.88 directly on my XO by running something comparable to yum install git-core gcc glibc-devel make vim git clone git://dev.laptop.org/users/mstone/sugar; cd sugar make xo-builddeps env PREFIX=/usr ./configure make; make install All these steps worked on XO-1.5 os121. Good. but the next step escapes me. I was testing on os201; I haven't updated the XO yet. This may be the cause of the difference. At the moment, olpc-session starts, Sugar starts with the nickname prompt, but doesn't proceed beyond colour choice dialog. The color choice dialog doesn't load very much of the sugar codebase. The doesn't proceed beyond behavior strongly suggests that an exception is being thrown. Looking at logs, presence service isn't sticking around once it is launched by D-Bus. I couldn't find any logs of the failure. You couldn't find logs of the failure because olpc-dm is redirecting stdout and stderr to /dev/null. Fortunately, olpc-utils rebuilds easily on the XO as soon as its builddep, ConsoleKit-devel, is installed. (Just run make -f Makefile.build; make -f Makefile.build install.) Then you can redirect the stdout/stderr output to the log file of your choice or, as I do, you can run /etc/X11/prefdm manually. (To enable this, I usually tell /etc/event.d/prefdm to run /bin/true and to not restart, thereby dropping me off at the virtual terminals on each reboot.) Also, alternately, you can install Xephyr and use it from Gnome or raw X+metacity to find out what's going on. Looking at an strace of a startx with .xinitrc containing olpc-session, the presence service isn't passing import decorator, so I'll look into that. Maybe it needs another package. Entirely possible. Oh, and the colour choice XO icon wasn't there. Just the click to change message, back and forward buttons. Thanks for the report; I'll see if I can produce the same behavior. Michael ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Experimental work... updated.
On 28 April 2010 11:57, Michael Stone mich...@laptop.org wrote: You couldn't find logs of the failure because olpc-dm is redirecting stdout and stderr to /dev/null. I don't think this is true. Fortunately, olpc-utils rebuilds easily on the XO as soon as its builddep, ConsoleKit-devel, is installed. (Just run make -f Makefile.build; make -f Makefile.build install.) Then you can redirect the stdout/stderr output to the log file of your choice but if I'm wrong, maybe we can improve this. Can you be more specific about the changes you're making before the rebuild? Thanks, Daniel ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Experimental work... updated.
Thanks, Michael, this has been the first viable method for getting Sugar 0.88 working on an XO-1.5 ... I'd been needing that for some time; to check new bugs we find in 0.84 against 0.88, and to develop changes against 0.88 after I've done them on 0.84. The missing package was python-decorator. It's not in the build dependencies in the Makefile. See attached patch. The next stop was more interesting ... assuming that I would no longer need any of the existing Sugar packages, I had removed them prior to make install, using this command: rpm -e \ sugar-datastore-0.84.1-1.fc11.i586 \ sugar-toolkit-0.84.9-2.fc11.i586 \ sugar-artwork-0.84.1-3.fc11.i586 \ sugar-presence-service-0.84.0-2.fc11.noarch \ sugar-0.84.15-1.fc11.i586 \ sugar-base-0.84.1-1.fc11.i586 \ sugar-update-control-0.23-1.fc11.noarch \ olpc-library-2.0.3-1.fc11.noarch \ ds-backup-client-0.11.1.g71d2f16-1.olpc3.noarch \ olpc-switch-desktop-0.7-1.fc11.noarch The result was failure to render the home window; because the computer-xo icon could not be found. Log from /tmp/olpc-dm-client.log placed here: http://dev.laptop.org/~quozl/2010-04-29-olpc-dm-client.log I'm not sure why this has happened, but my guess is that there is a file used that isn't installed by make install, but left over from the RPMs. When I reinstalled the removed RPMs, it all began to work again. -- James Cameron http://quozl.linux.org.au/ From c770ffd7112b788a90fe35aad3ca227f6db99914 Mon Sep 17 00:00:00 2001 From: James Cameron qu...@laptop.org Date: Thu, 29 Apr 2010 14:42:19 +1000 Subject: [PATCH] add missing dependency on python-decorator --- Makefile |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 576a8a8..581f1dc 100644 --- a/Makefile +++ b/Makefile @@ -268,7 +268,7 @@ DEBIAN_TOOLKIT_BUILDDEPS = libsm-dev libice-dev libasound2-dev libxml-parser-per debian-builddeps: aptitude install $(DEBIAN_MAIN_BUILDDEPS) $(DEBIAN_ARTWORK_BUILDDEPS) $(DEBIAN_BASE_BUILDDEPS) $(DEBIAN_PS_BUILDDEPS) $(DEBIAN_TOOLKIT_BUILDDEPS) -XO_MAIN_BUILDDEPS = pkgconfig perl-XML-Parser gettext python pygtk2-devel gtk2-devel GConf2-devel intltool libSM-devel alsa-lib-devel icon-slicer icon-naming-utils xorg-x11-apps pygtk2-codegen +XO_MAIN_BUILDDEPS = pkgconfig perl-XML-Parser gettext python pygtk2-devel gtk2-devel GConf2-devel intltool libSM-devel alsa-lib-devel icon-slicer icon-naming-utils xorg-x11-apps pygtk2-codegen python-decorator xo-builddeps: yum install $(XO_MAIN_BUILDDEPS) -- 1.7.0 ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] Experimental work... updated.
This is just a quick note to let interested parties know that I've updated my experimental repo at http://dev.laptop.org/git/users/mstone/sugar git://dev.laptop.org/users/mstone/sugar to sugar*-0.88. For those who are curious, this repo: * combines all six of the sugar, sugar-toolkit, sugar-base, sugar-artwork, sugar-datastore, and sugar-presence-service repos into a single repo [1], [1]: To see how, google for git subtree merge. The progit.org and kernel.org hits are both helpful. * replaces the complete autotools infrastructure of all six repos mentioned above with a single top-level Makefile of some 250 lines, and * removes most uses of logging from the sugar python source code in favor of error-reporting via cgitb's verbose tracebacks [1] and info reporting via print. [2]: cgitb is a little-known module in the Python standard library which provides verbose tracebacks in either plaintext or HTML. Regards, and apologies in advance for the remaining rough edges, Michael ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Experimental work... updated.
On Tue, Apr 27, 2010 at 11:44:39AM -0400, Michael Stone wrote: This is just a quick note to let interested parties know that I've updated my experimental repo at http://dev.laptop.org/git/users/mstone/sugar git://dev.laptop.org/users/mstone/sugar Looks good. Even has my #897 fix in it. Thanks! I like the idea of one repository, it makes working with it much easier. Have you noticed a significant performance improvement from removing logging? I did before I found the O_SYNC on a slow system. -- James Cameron http://quozl.linux.org.au/ ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Experimental work... updated.
On Tue, Apr 27, 2010 at 11:44:39AM -0400, Michael Stone wrote: This is just a quick note to let interested parties know that I've updated my experimental repo at http://dev.laptop.org/git/users/mstone/sugar git://dev.laptop.org/users/mstone/sugar Looks good. Even has my #897 fix in it. Thanks! My pleasure; thanks for the patch. I like the idea of one repository, it makes working with it much easier. I particularly like that I can test sugar*-0.88 directly on my XO by running something comparable to yum install git-core gcc glibc-devel make vim git clone git://dev.laptop.org/users/mstone/sugar; cd sugar make xo-builddeps env PREFIX=/usr ./configure make; make install I also like how easy it is to consider patches that touch multiple subsystems in their entirety. Have you noticed a significant performance improvement from removing logging? I did before I found the O_SYNC on a slow system. Neat! (I haven't timed it yet myself -- I made the change soley because, for me, it improves the signal-to-noise ratio in the codebase.) Michael ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Experimental work... updated.
On Tue, Apr 27, 2010 at 11:44:39AM -0400, Michael Stone wrote: This is just a quick note to let interested parties know that I've updated my experimental repo at http://dev.laptop.org/git/users/mstone/sugar git://dev.laptop.org/users/mstone/sugar to sugar*-0.88. For those who are curious, this repo: * combines all six of the sugar, sugar-toolkit, sugar-base, sugar-artwork, sugar-datastore, and sugar-presence-service repos into a single repo [1], I followed different way, see http://wiki.sugarlabs.org/go/Documentation_Team/Services/Scalable_development_model http://wiki.sugarlabs.org/go/Activity_Team/Polyol [1]: To see how, google for git subtree merge. The progit.org and kernel.org hits are both helpful. * replaces the complete autotools infrastructure of all six repos mentioned above with a single top-level Makefile of some 250 lines, and * removes most uses of logging from the sugar python source code in favor of error-reporting via cgitb's verbose tracebacks [1] and info reporting via print. [2]: cgitb is a little-known module in the Python standard library which provides verbose tracebacks in either plaintext or HTML. Regards, and apologies in advance for the remaining rough edges, Michael ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel -- Aleksey ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
